Request 5480 (accepted)

Overview

Request 5480 (accepted)

No description set

Created by enzokiel almost 3 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package Staging / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,9 +1,106 @@
 -------------------------------------------------------------------
+Mon Dec 27 17:14:17 UTC 2021 - enzokiel@kabelmail.de
+
+- Update to version 2.8.0
+  - Behavior
+    * The part of video preceding the presentation time of the first
+      frame is now excluded from created segment, making all videos
+      appear as if they "start at zero". When saving video, the frame
+      matching the B marker is now excluded from the exported range.
+      Therefore, if the B marker is set to the last frame of the
+      video, it needs to be reset to the full duration for the last
+      frame to be included into the output. Loading Matroska files
+      with HEVC video tracks takes longer as slice headers are
+      decoded to detect the frame type.
+  - New Video Filters
+    * Analyzer
+    * Blur (on selected area)
+    * Cartoon
+    * Color balance (adjust shadow, midtone and highlight)
+    * Chroma hold (monochrome effect with kept colors)
+    * Chroma key (replace "green screen" with an image)
+    * Deband (reduce banding artifacts)
+    * DelogoHQ (clean up arbitrary shaped logo)
+    * Dynamic threshold
+    * Fade from first image
+    * Fade in (combination of multiple effects)
+    * Fade out (combination of multiple effects)
+    * Fade through (combination of multiple effects)
+    * Fit to size (resize and pad to the specified size)
+    * Flip (vertically/horizontally flip the image)
+    * Grid (video wall effect)
+    * Image stabilizer (reduce camera shakiness)
+    * Luma stabilizer (reduce flickering)
+    * Mirror
+    * Posterize
+    * Quadrilateral transformation (four point transform)
+    * Wavelet denoiser
+    * Wavelet sharpener
+    * Zoom (partializable crop filter)
+  - New Features
+    * HDR video can be converted to SDR with tone mapping using a
+      variety of methods.
+    * FFV1 encoder is back (it was available in Avidemux 2.5.x).
+    * TrueHD audio tracks can be decoded and are supported for
+      Matroska containers.
+    * Decoding support for WMA9 Lossless codec.
+    * Filter previews have got a unified method to quickly compare
+      filtered and unfiltered inputs via the "Peek Original" button.
+    * Blend and motion interpolation options added to "Resample FPS"
+      filter.
+    * Mark cut points (segment boundaries) on the navigation slider.
+      New buttons and shortcuts are provided to jump to these cut
+      points.
+    * In the Video Filter Manager, active filters can be temporarily
+      disabled.
+    * Preference added to load sequentially named pictures in reverse
+      order, allowing to reverse video by exporting selection as JPEG
+      images and loading the first one.
+    * During playback navigation is possible via keys or by dragging
+      the navigation slider.
+  - Other Enhancements
+    * "Resample FPS" and "Change FPS" filters can handle up to 1000
+      fps.
+    * "Crop" filter's preview has got a translucent green masking.
+    * "Crop" filter's Auto Crop function can achieve perfect crops
+      (if the selected frame is not too dark).
+    * The maximum output resolution of the "Resize" filter has been
+      increased to 8192x8192
+    * The "Resize" filter has got a nearest neighbour scaling option.
+    * Improved HiDPI scaling in previews.
+    * x264 video encoder plugin now allows to specify color properties.
+    * Maximized window state, widget visibility and toolbar position
+      are preserved after application restart.
+    * Timestamps in format 00:00:00.000 like copied to clipboard by
+      pressing CTRL+SHIFT+C can be pasted into the "Go to Time"
+      dialog using CTRL+V.
+    * PulseAudioSimple audio device has been replaced with full
+      PulseAudio, making an in-application volume control available
+      (Linux only).
+    * ALSA audio device plugin has been modified to use soft volume,
+      providing application-specific volume control which works with
+      every ALSA device.
+    * In the Video Filter Manager, navigation by keyboard has been
+      enhanced.
+    * The VU meter ("Audio Metre") has been redesigned.
+  - Bugfixes
+    * Occasional UI unrepsonsiveness during playback should be fixed.
+    * Prevent navigation key events piling up.
+    * Thumb slider, displaced by mouse wheel, is now automatically
+      reset if the end of video is reached, stopping Avidemux log
+      file from filling disk space.
+    * Purple tint in old "Fade to" and "Fade to black" filters on
+      macOS fixed.
+    * Green tint in "MPlayer eq2" filter is fixed.
+  - Miscellaneous
+    * Bundled FFmpeg libraries have been updated to 4.4.1 release.
+
+-------------------------------------------------------------------
 Tue Mar 09 15:06:42 UTC 2021 - enzokiel@kabelmail.de
 
 - Update to version 2.7.8
   - New Features
-Many new video filters added by courtesy of szlldm
+    * Many new video filters added by courtesy of szlldm
     * A dedicated MOV muxer is now available, replacing silent
       fallback to MOV muxing mode within the MP4 muxer.
     * A subset of color info relevant for HDR support is retained

avidemux3.spec Changed

@@ -22,11 +22,11 @@
 Summary:        Graphical video editing and transcoding tool
 License:        GPL-2.0-only
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Version:        2.7.8
+Version:        2.8.0
 Release:        0
 URL:            http://avidemux.sourceforge.net/
 ExclusiveArch:  %ix86 x86_64
-Source0:        https://www.fosshub.com/Avidemux.html?dwl=avidemux_%{version}.tar.gz
+Source0:        https://github.com/mean00/avidemux2/releases/download/%{version}/avidemux_%{version}.tar.gz
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
@@ -36,6 +36,7 @@
 Patch7:         avidemux-desktop-file.patch
 Patch8:         avidemux-backport_Fix_threads_setup.patch
 Patch9:         avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
+Patch10:        avidemux-translations.patch
 
 # Utilities / Libraries
 BuildRequires:  cmake
@@ -198,6 +199,7 @@
 %patch7 -p1
 %patch8 -p0 -R
 %patch9 -p1
+%patch10 -p1
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -212,7 +214,6 @@
 export CXXFLAGS="$flags"
 
 options+="--with-cli "
-options+="--with-qt "
 ./bootStrap.bash $options
 
 %install
@@ -220,10 +221,13 @@
 
 # Install man
 install -D -m644 man/avidemux.1 %{buildroot}%{_mandir}/man1/avidemux.1
+rm -f %{buildroot}%{_datadir}/avidemux3/qt5/translations/qtbase_*.qm
 
 # delete devel file (only needed for build)
 rm -rf %{buildroot}%{_includedir}
 
+%find_lang avidemux %{name}-qt5.lang --with-qt
+
 %fdupes %buildroot
 
 %post -p /sbin/ldconfig
@@ -234,13 +238,9 @@
 
 %postun cli -p /sbin/ldconfig
 
-%post qt5
-/sbin/ldconfig
-%desktop_database_post
+%post qt5 -p /sbin/ldconfig 
 
-%postun qt5
-/sbin/ldconfig
-%desktop_database_postun
+%postun qt5 -p /sbin/ldconfig
 
 %files
 %if %{with vapoursynth}
@@ -306,7 +306,7 @@
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaHw.so
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_jack.so
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_oss.so
-%{_libdir}/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
+%{_libdir}/ADM_plugins6/audioDevices/libADM_av_pulseAudio.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_aften.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_dcaenc.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_faac.so
@@ -358,10 +358,8 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/ultraFast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
-%if 0%{?is_opensuse}
 %dir %{_libdir}/ADM_plugins6/videoDecoders
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_aom.so
-%endif
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
@@ -370,6 +368,7 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvencHEVC.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffv1.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_huff.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so
@@ -394,7 +393,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_gauss.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
@@ -421,7 +419,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
 %dir %{_datadir}/ADM6_addons
 %dir %{_datadir}/ADM6_addons/avsfilter
@@ -438,22 +435,46 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_cli.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_cli.so
 %dir %{_libdir}/ADM_plugins6/videoFilters/cli
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_analyzerCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artCartoonCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artCharcoalCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artChromaHoldCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artChromaKeyCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artColorEffectCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artDynThresholdCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artGridCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artMirrorCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artPixelizeCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artPosterizeCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artVHSCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artVignetteCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_blackenBordersCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_blurCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_colorBalanceCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_colorTempCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_debandCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_delogoHQCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeFromImageCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeInCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeOutCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeThroughCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fitToSizeCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_flipCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_imageStabCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_logoCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_lumaStabCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_quadTransCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_waveletDenoiseCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_waveletSharpCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_ZoomCli.so
 
 %files qt5
 %{_bindir}/avidemux3_jobs_qt5
@@ -474,38 +495,61 @@
 %{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader
 %{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so
 %{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_analyzerQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artCartoonQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artCharcoalQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artChromaHoldQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artChromaKeyQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artColorEffectQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artDynThresholdQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artGridQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artMirrorQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artPixelizeQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artPosterizeQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artVHSQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artVignetteQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blurQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_colorBalanceQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_colorTempQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_debandQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_delogoHQQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeFromImageQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeInQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeOutQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeThroughQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fitToSizeQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_flipQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glBenchmark.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glResize.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_imageStabQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_lumaStabQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_mpdelogoQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_msharpenQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_quadTransQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_rotateGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlVertex.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_shaderLoaderGl.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletDenoiseQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletSharpQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_zoomQT5.so
 %{_datadir}/applications/org.avidemux.Avidemux.desktop
 %{_datadir}/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png
 %dir %{_datadir}/metainfo
 %{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml
 
-%files qt5-lang
+%files qt5-lang -f %{name}-qt5.lang
 %dir %{_datadir}/avidemux3
 %dir %{_datadir}/avidemux3/qt5
-%dir %{_datadir}/avidemux3/qt5/i18n
-%{_datadir}/avidemux3/qt5/i18n/*.qm
+%dir %{_datadir}/avidemux3/qt5/translations
 
 %changelog

avidemux-package_version.patch Changed

@@ -1,18 +1,18 @@
-diff -uNr avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt
---- avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt	2020-07-07 21:09:46.344578674 +0200
-+++ avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt	2020-07-07 21:10:47.459492742 +0200
-@@ -127,7 +127,7 @@
+diff -uNr avidemux_2.8.0/avidemux/osxInstaller/CMakeLists.txt avidemux_2.8.0.new/avidemux/osxInstaller/CMakeLists.txt
+--- avidemux_2.8.0/avidemux/osxInstaller/CMakeLists.txt	2021-12-27 13:09:51.167627817 +0100
++++ avidemux_2.8.0.new/avidemux/osxInstaller/CMakeLists.txt	2021-12-27 13:23:47.647736836 +0100
+@@ -110,7 +110,7 @@
  FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 
  
  # Entice macOS to return correct system language (QTBUG-72491)
--FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt5/i18n/avidemux_*.qm")
-+FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt5/i18n/avidemux_*.qm")
+-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt${ADM_QT_VERSION}/i18n/avidemux_*.qm")
++FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt${ADM_QT_VERSION}/i18n/avidemux_*.qm")
  FOREACH(lang ${ListOfTranslationFiles})
      STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")
      STRING(REPLACE ".qm" "" lang "${lang}")
-diff -uNr avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2020-07-07 21:09:45.948585710 +0200
-+++ avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2020-07-07 21:10:47.107498996 +0200
+diff -uNr avidemux_2.8.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.8.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.8.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2021-12-27 13:09:51.007630769 +0100
++++ avidemux_2.8.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2021-12-27 13:23:47.507739558 +0100
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -22,9 +22,9 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake
---- avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake	2020-07-07 21:09:45.532593101 +0200
-+++ avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake	2020-07-07 21:10:46.671506743 +0200
+diff -uNr avidemux_2.8.0/avidemux/qt4/i18n/Ts.cmake avidemux_2.8.0.new/avidemux/qt4/i18n/Ts.cmake
+--- avidemux_2.8.0/avidemux/qt4/i18n/Ts.cmake	2021-12-27 13:09:50.771635121 +0100
++++ avidemux_2.8.0.new/avidemux/qt4/i18n/Ts.cmake	2021-12-27 13:23:47.423741191 +0100
 @@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
@@ -34,10 +34,10 @@
          ENDIF(WIN32)
          INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
  ENDMACRO(INSTALL_I18N _files)
-diff -uNr avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2020-07-07 21:09:46.264580095 +0200
-+++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2020-07-07 21:10:48.919466800 +0200
-@@ -124,14 +124,14 @@
+diff -uNr avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 13:09:51.027630400 +0100
++++ avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 13:23:47.867732558 +0100
+@@ -126,14 +126,14 @@
      if(isPortable)
      {
          std::string i18n=pluginDir;
@@ -54,7 +54,7 @@
          ADM_i18nDir=std::string(ppath);
          delete [] ppath;
          ppath=NULL;
-@@ -163,7 +163,7 @@
+@@ -165,7 +165,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -63,9 +63,9 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2020-07-07 21:09:46.260580166 +0200
-+++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2020-07-07 21:10:48.903467083 +0200
+diff -uNr avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2021-12-27 13:09:51.027630400 +0100
++++ avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2021-12-27 13:23:47.859732714 +0100
 @@ -132,7 +132,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
@@ -87,10 +87,10 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-diff -uNr avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2020-07-07 21:09:45.612591680 +0200
-+++ avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2020-07-07 21:10:39.679630980 +0200
-@@ -265,7 +265,7 @@
+diff -uNr avidemux_2.8.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.8.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.8.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2021-12-27 13:09:50.887632982 +0100
++++ avidemux_2.8.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2021-12-27 13:23:42.655833895 +0100
+@@ -268,7 +268,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
  
@@ -99,9 +99,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.7.6/cmake/se_plugin.cmake avidemux_2.7.6.new/cmake/se_plugin.cmake
---- avidemux_2.7.6/cmake/se_plugin.cmake	2020-07-07 21:09:45.540592960 +0200
-+++ avidemux_2.7.6.new/cmake/se_plugin.cmake	2020-07-07 21:10:50.103445762 +0200
+diff -uNr avidemux_2.8.0/cmake/se_plugin.cmake avidemux_2.8.0.new/cmake/se_plugin.cmake
+--- avidemux_2.8.0/cmake/se_plugin.cmake	2021-12-27 13:09:50.787634826 +0100
++++ avidemux_2.8.0.new/cmake/se_plugin.cmake	2021-12-27 13:23:48.491720427 +0100
 @@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -111,9 +111,9 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.7.6/cmake/sql/update.sh avidemux_2.7.6.new/cmake/sql/update.sh
---- avidemux_2.7.6/cmake/sql/update.sh	2020-07-07 21:09:46.300579456 +0200
-+++ avidemux_2.7.6.new/cmake/sql/update.sh	2020-07-07 21:10:49.887449600 +0200
+diff -uNr avidemux_2.8.0/cmake/sql/update.sh avidemux_2.8.0.new/cmake/sql/update.sh
+--- avidemux_2.8.0/cmake/sql/update.sh	2021-12-27 13:09:51.087629294 +0100
++++ avidemux_2.8.0.new/cmake/sql/update.sh	2021-12-27 13:23:48.407722059 +0100
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump

avidemux-translations.patch Added

@@ -0,0 +1,29 @@
+--- avidemux_2.8.0/avidemux/qt4/i18n/Ts.cmake	2021-12-27 13:09:50.771635121 +0100
++++ avidemux_2.8.0.new/avidemux/qt4/i18n/Ts.cmake	2021-12-27 15:19:33.950945751 +0100
+@@ -28,7 +28,7 @@
+         IF(WIN32)
+                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
+         ELSE(WIN32)
+-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
++                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/translations")
+         ENDIF(WIN32)
+         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
+ ENDMACRO(INSTALL_I18N _files)
+--- avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 13:09:51.027630400 +0100
++++ avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 16:53:46.698272503 +0100
+@@ -126,13 +126,13 @@
+     if(isPortable)
+     {
+         std::string i18n=pluginDir;
+-        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n");
++        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/translations");
+         ADM_i18nDir=canonize(i18n);
+         ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
+         // 181n
+     }else
+     {        
+-        std::string partialPath=flavor+std::string("/i18n");
++        std::string partialPath=flavor+std::string("/translations");
+         char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
+         ADM_i18nDir=std::string(ppath);
+         delete [] ppath;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_icons/videoFilter/5.png Deleted

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.2.4.tar.bz2 Deleted

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_timer.h.patch Deleted

avidemux_2.7.8.tar.gz/AUTHORS -> avidemux_2.8.0.tar.gz/AUTHORS Changed

avidemux_2.7.8.tar.gz/appImage/deployBusterMinimal.sh -> avidemux_2.8.0.tar.gz/appImage/deployBusterMinimal.sh Changed

avidemux_2.7.8.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/DIA_encoding.cpp -> avidemux_2.8.0.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/DIA_encoding.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/DIA_encoding_none.h -> avidemux_2.8.0.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_dialog/DIA_encoding_none.h Changed

avidemux_2.7.8.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp -> avidemux_2.8.0.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/cli/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/cli/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_audioFilter/src/audio_encoderPlugin.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_audioFilter/src/audio_encoderPlugin.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_mixer.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_mixer.cpp Changed

@@ -31,7 +31,8 @@
     memset(outputChannelMapping,0,sizeof(CHANNEL_TYPE)*MAX_CHANNELS);
     CHANNEL_TYPE *map=_previous->getChannelMapping();
     bypass=false;
-    if(map)
+    input_channels = _wavHeader.channels;
+    if(map && input_channels)
         memcpy(inputChannelMapping,map,sizeof(CHANNEL_TYPE)*_wavHeader.channels);
     else
         bypass=true;
@@ -585,20 +586,6 @@
     uint32_t rd = 0;
     int nbSampleMax=max/_wavHeader.channels;
     if(!nbSampleMax) nbSampleMax=1;
-    uint8_t input_channels = _previous->getInfo()->channels;
-    if(!input_channels)
-        return 0;
-
-    if(input_channels!=_wavHeader.channels)
-    {
-        ADM_warning("[Mixer] Number of channels has changed from %d to %d\n",_wavHeader.channels,input_channels);
-        _wavHeader.channels=input_channels;
-        if(_previous->getChannelMapping())
-        {
-            memset(inputChannelMapping,0,sizeof(CHANNEL_TYPE)*MAX_CHANNELS);
-            memcpy(inputChannelMapping,_previous->getChannelMapping(),sizeof(CHANNEL_TYPE)*input_channels);
-        }
-    }
 
 // Fill incoming buffer
     shrink();

avidemux_2.7.8.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_thread.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_audioFilter/src/audiofilter_thread.cpp Changed

@@ -122,6 +122,11 @@
     while(1)
     {
         mutex->lock();
+        if(threadState==RunStateStopOrder)  
+        {
+            mutex->unlock();
+            return false;
+        }
         if(list.size())
         {
             //
@@ -138,9 +143,9 @@
             *size=pkt.dataLen;
             mutex->lock();
             freeList.append(pkt);
-            if(cond->iswaiting())
+            if(producerCond->iswaiting())
             {
-                cond->wakeup();
+                producerCond->wakeup();
             }
             mutex->unlock();
             return true;
@@ -152,8 +157,7 @@
             mutex->unlock();
             return false;
         }
-        mutex->unlock();
-        ADM_usleep(2*1000); // wait 10 ms
+        consumerCond->wait();// Will unlock mutex
     }
     return false;
 }
@@ -165,15 +169,16 @@
 {
     while(1)
     {
+        mutex->lock();
         if(threadState==RunStateStopOrder)  
         {
             ADM_info("Audio Thread, received stop order\n");
+            mutex->unlock();
             goto theEnd;
         }
-        mutex->lock();
         if(!freeList.size())
         {
-            cond->wait();
+            producerCond->wait();
             continue;
         }
         ADM_queuePacket pkt=(freeList[0]);
@@ -191,6 +196,8 @@
         mutex->lock();
         list.append(pkt);
         //printf("Pushing Packet with DTS=%"PRId64",size=%d\n",dts,(int)size);
+        if (consumerCond->iswaiting())
+            consumerCond->wakeup();
         mutex->unlock();
     }

avidemux_2.7.8.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_commonUI/CMakeLists.txt Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_commonUI/DIA_HDRConfig.cpp Added

@@ -0,0 +1,55 @@
+//
+// Author: szlldm, (C) 2021
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+//#include "xonfig.h"
+#include "ADM_default.h"
+
+
+#include "DIA_factory.h"
+
+int DIA_getHDRParams( uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust)
+{
+#ifdef EXPLAIN
+#   define NB_ELEMS 4
+    diaElemReadOnlyText applicability(NULL,QT_TRANSLATE_NOOP("adm","Changing the options above will results the editor jumping to the nearest prior key frame."),NULL);
+#else
+#   define NB_ELEMS 3
+#endif
+    diaMenuEntry toneMapEntries[]={
+                          {0,       QT_TRANSLATE_NOOP("adm","Disabled"),NULL}
+                         ,{1,       QT_TRANSLATE_NOOP("adm","Fast YUV"),NULL}
+                         ,{2,       QT_TRANSLATE_NOOP("adm","RGB clipping"),NULL}
+                         ,{3,       QT_TRANSLATE_NOOP("adm","RGB Reinhard"),NULL}
+                         ,{4,       QT_TRANSLATE_NOOP("adm","RGB Hable"),NULL}
+                         //,{2,      QT_TRANSLATE_NOOP("adm","TODO"),NULL}
+    };
+
+    diaElemMenu menuToneMapHDR(toneMappingMethod,QT_TRANSLATE_NOOP("adm","_Tone mapping:"),sizeof(toneMapEntries)/sizeof(diaMenuEntry),toneMapEntries);
+    diaElemFloatResettable floatSaturationHDR(saturationAdjust,QT_TRANSLATE_NOOP("adm","_Saturation:"),0.,10.,1.);
+    diaElemFloatResettable floatBoostHDR(boostAdjust,QT_TRANSLATE_NOOP("adm","_Boost (level multiplier):"),0.,10.,1.);
+
+    for(int i=0; i < sizeof(toneMapEntries)/sizeof(diaMenuEntry); i++)
+    {
+        menuToneMapHDR.link(&(toneMapEntries[i]), i, &floatSaturationHDR);
+        menuToneMapHDR.link(&(toneMapEntries[i]), i, &floatBoostHDR);
+    }
+
+    diaElem *elems[NB_ELEMS]={
+         &menuToneMapHDR
+        ,&floatSaturationHDR
+        ,&floatBoostHDR
+#ifdef EXPLAIN
+        ,&applicability
+#endif
+    };
+
+    if(diaFactoryRun("HDR tone mapping",NB_ELEMS,elems))
+    {
+        return 1;
+    }
+    return 0;
+}

avidemux_2.7.8.tar.gz/avidemux/common/ADM_commonUI/DIA_audioFilter.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_commonUI/DIA_audioFilter.cpp Changed

@@ -35,37 +35,38 @@
     
     //**********************************
     diaMenuEntry menuFPS[]={
-  {FILMCONV_NONE,     QT_TRANSLATE_NOOP("adm","None")},
-  {FILMCONV_FILM2PAL, QT_TRANSLATE_NOOP("adm","Film to PAL")},
-  {FILMCONV_PAL2FILM, QT_TRANSLATE_NOOP("adm","PAL to Film")}
+  {FILMCONV_NONE,     QT_TRANSLATE_NOOP("adm","None"), NULL},
+  {FILMCONV_FILM2PAL, QT_TRANSLATE_NOOP("adm","Film to PAL"), NULL},
+  {FILMCONV_PAL2FILM, QT_TRANSLATE_NOOP("adm","PAL to Film"), NULL}
     };
-  
-   diaElemMenu      eFPS(&vFilm,QT_TRANSLATE_NOOP("adm","_Frame rate change:"),3,menuFPS);
+#define NB_ITEMS(x) sizeof(x)/sizeof(diaMenuEntry)
+   diaElemMenu      eFPS(&vFilm,QT_TRANSLATE_NOOP("adm","_Frame rate change:"),NB_ITEMS(menuFPS),menuFPS);
 
    //**********************************
     diaMenuEntry menuMixer[]={
-  {CHANNEL_INVALID,     QT_TRANSLATE_NOOP("adm","No change")},
-  {CHANNEL_MONO,        QT_TRANSLATE_NOOP("adm","Mono")},
-  {CHANNEL_STEREO,      QT_TRANSLATE_NOOP("adm","Stereo")},
-  {CHANNEL_2F_1R,       QT_TRANSLATE_NOOP("adm","Stereo+surround")},
-  {CHANNEL_3F,          QT_TRANSLATE_NOOP("adm","Stereo+center")},
-  {CHANNEL_3F_1R,           QT_TRANSLATE_NOOP("adm","Stereo+center+surround")},
-  {CHANNEL_2F_2R,           QT_TRANSLATE_NOOP("adm","Stereo front+stereo rear")},
-  {CHANNEL_3F_2R,           QT_TRANSLATE_NOOP("adm","5 channels")},
-  {CHANNEL_3F_2R_LFE,       QT_TRANSLATE_NOOP("adm","5.1")},
-  {CHANNEL_DOLBY_PROLOGIC,  QT_TRANSLATE_NOOP("adm","Dolby Pro Logic")},
-  {CHANNEL_DOLBY_PROLOGIC2, QT_TRANSLATE_NOOP("adm","Dolby Pro Logic II")}
+  {CHANNEL_INVALID,     QT_TRANSLATE_NOOP("adm","No change"), NULL},
+  {CHANNEL_MONO,        QT_TRANSLATE_NOOP("adm","Mono"), NULL},
+  {CHANNEL_STEREO,      QT_TRANSLATE_NOOP("adm","Stereo"), NULL},
+  {CHANNEL_2F_1R,       QT_TRANSLATE_NOOP("adm","Stereo+surround"), NULL},
+  {CHANNEL_3F,          QT_TRANSLATE_NOOP("adm","Stereo+center"), NULL},
+  {CHANNEL_3F_1R,           QT_TRANSLATE_NOOP("adm","Stereo+center+surround"), NULL},
+  {CHANNEL_2F_2R,           QT_TRANSLATE_NOOP("adm","Stereo front+stereo rear"), NULL},
+  {CHANNEL_3F_2R,           QT_TRANSLATE_NOOP("adm","5 channels"), NULL},
+  {CHANNEL_3F_2R_LFE,       QT_TRANSLATE_NOOP("adm","5.1"), NULL},
+  {CHANNEL_DOLBY_PROLOGIC,  QT_TRANSLATE_NOOP("adm","Dolby Pro Logic"), NULL},
+  {CHANNEL_DOLBY_PROLOGIC2, QT_TRANSLATE_NOOP("adm","Dolby Pro Logic II"), NULL}
     };
   //*************************
     diaElemToggle    tDRC(PX(drcEnabled),QT_TRANSLATE_NOOP("adm","DRC"));
 //*************************
   diaMenuEntry menuGain[]={
-  {ADM_NO_GAIN,       QT_TRANSLATE_NOOP("adm","None")},
-  {ADM_GAIN_AUTOMATIC,QT_TRANSLATE_NOOP("adm","Automatic")},
-  {ADM_GAIN_MANUAL,   QT_TRANSLATE_NOOP("adm","Manual (dB)")}};
-  
+  {ADM_NO_GAIN,       QT_TRANSLATE_NOOP("adm","None"), NULL},
+  {ADM_GAIN_AUTOMATIC,QT_TRANSLATE_NOOP("adm","Automatic"), NULL},
+  {ADM_GAIN_MANUAL,   QT_TRANSLATE_NOOP("adm","Manual (dB)"), NULL}
+    };
+
   diaElemFrame  frameGain(QT_TRANSLATE_NOOP("adm","Gain"));
-  diaElemMenu   eGain(&vGainMode,QT_TRANSLATE_NOOP("adm","_Gain mode:"),3,menuGain);   
+  diaElemMenu   eGain(&vGainMode,QT_TRANSLATE_NOOP("adm","_Gain mode:"),NB_ITEMS(menuGain),menuGain);
   diaElemFloat  eGainValue(&vGainValue,QT_TRANSLATE_NOOP("adm","G_ain value:"),-10,40);
   diaElemFloat  eGainMaxLevel(&vGainMaxLevel,QT_TRANSLATE_NOOP("adm","_Maximum value:"),-10,0);
   
@@ -76,9 +77,9 @@
   frameGain.swallow(&eGainMaxLevel);
   //****************************
 
- diaElemMenu      eMixer(&vChan,QT_TRANSLATE_NOOP("adm","_Mixer:"),11,menuMixer);
+ diaElemMenu      eMixer(&vChan,QT_TRANSLATE_NOOP("adm","_Mixer:"),NB_ITEMS(menuMixer),menuMixer);
  bool bMixer=config->mixerEnabled;
- diaElemToggle    tMixer(&bMixer,QT_TRANSLATE_NOOP("adm","Remix:"));
+ diaElemToggle    tMixer(&bMixer,QT_TRANSLATE_NOOP("adm","Remix"));
  tMixer.link(1,&eMixer);
  
  diaElemFrame frameMixer(QT_TRANSLATE_NOOP("adm","Mixer"));
@@ -88,8 +89,9 @@
  //****************************
  diaElemToggleInt eShift(&bShiftEnabled,QT_TRANSLATE_NOOP("adm","Shift audio:"),&vShift, QT_TRANSLATE_NOOP("adm","Shift Value (ms):"),-30000,30000);
  /************************************/
+#define NB_ELEM(x) sizeof(x)/sizeof(diaElem *)
  diaElem *elems[]={&eFPS, &tDRC, &eResample,&eShift,&frameMixer,&frameGain};
-  if( diaFactoryRun(QT_TRANSLATE_NOOP("adm","Audio Filters"),4+2,elems))
+  if( diaFactoryRun(QT_TRANSLATE_NOOP("adm","Audio Filters"),NB_ELEM(elems),elems))
     {
         config->mixerConf=(CHANNEL_CONF)vChan;
         config->film2pal=(FILMCONV)vFilm;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp Changed

@@ -63,6 +63,7 @@
 char     *alsaDevice=NULL;
 
 bool     lastReadDirAsTarget=false;
+bool     multiPassStatsAutoDelete=false;
 bool     altKeyboardShortcuts=false;
 bool     swapUpDown=false;
 
@@ -71,8 +72,10 @@
 
 bool     useCustomFragmentSize=false;
 uint32_t customFragmentSize=4000;
+bool     loadPicsInReverseOrder=false;
 
 uint32_t editor_cache_size=16;
+bool     editor_use_shared_cache=false;
 
 #ifdef USE_DXVA2
 bool     bdxva2=false;
@@ -85,7 +88,7 @@
 bool     bvideotoolbox=false;
 #endif
 bool     hzd,vzd,dring;
-bool     capsMMX,capsMMXEXT,caps3DNOW,caps3DNOWEXT,capsSSE,capsSSE2,capsSSE3,capsSSSE3,capsAll;
+bool     capsMMX,capsMMXEXT,caps3DNOW,caps3DNOWEXT,capsSSE,capsSSE2,capsSSE3,capsSSSE3,capsSSE4,capsSSE42,capsAVX,capsAVX2,capsAll;
 bool     hasOpenGl=false;
 
 bool     refreshCapEnabled=false;
@@ -94,6 +97,10 @@
 bool     askPortAvisynth=false;
 uint32_t defaultPortAvisynth = 9999;
 
+uint32_t toneMappingHDR = 1;
+#define DEFAULT_TARGET_LUMINANCE_HDR 100.0
+float    targetLumHDR = DEFAULT_TARGET_LUMINANCE_HDR;
+
 #ifdef USE_SDL
 std::string currentSdlDriver=getSdlDriverName();
 #endif
@@ -118,9 +125,14 @@
     DOME(4,dring);
 
 // Cpu caps
-#define CPU_CAPS(x)    	if(cpuMask & ADM_CPUCAP_##x) caps##x=1; else caps##x=0;
+#define CPU_CAPS(x) \
+    if((cpuCaps & cpuMask) & ADM_CPUCAP_##x) \
+        caps##x = true; \
+    else \
+        caps##x = false;
 
         uint32_t cpuMask=CpuCaps::getMask();
+        uint32_t cpuCaps=CpuCaps::getCaps();
     	if(cpuMask==ADM_CPUCAP_ALL) capsAll=1; else capsAll=0;
     	CPU_CAPS(MMX);
     	CPU_CAPS(MMXEXT);
@@ -130,6 +142,10 @@
     	CPU_CAPS(SSE2);
     	CPU_CAPS(SSE3);
     	CPU_CAPS(SSSE3);
+    	CPU_CAPS(SSE4);
+    	CPU_CAPS(SSE42);
+    	CPU_CAPS(AVX);
+    	CPU_CAPS(AVX2);
 
     	//Avisynth
     	if(!prefs->get(AVISYNTH_AVISYNTH_ALWAYS_ASK, &askPortAvisynth))
@@ -145,6 +161,10 @@
     	}
     	ADM_info("Avisynth port: %d\n",defaultPortAvisynth);
 
+    	// HDR
+    	if (!prefs->get(HDR_TONEMAPPING,&toneMappingHDR)) toneMappingHDR=1;
+    	if (!prefs->get(HDR_TARGET_LUMINANCE,&targetLumHDR)) targetLumHDR = DEFAULT_TARGET_LUMINANCE_HDR;
+
         // Alsa
 #ifdef ALSA_SUPPORT
         if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &alsaDevice) != RC_OK )
@@ -155,8 +175,13 @@
             useCustomFragmentSize=false;
         if(!prefs->get(DEFAULT_MULTILOAD_CUSTOM_SIZE_M,&customFragmentSize))
             customFragmentSize=4000;
+        // Should the pics demuxer be used to reverse video?
+        if(!prefs->get(LOAD_PICTURES_REVERSE_ORDER,&loadPicsInReverseOrder))
+            loadPicsInReverseOrder = false;
+
         // Video cache
         prefs->get(FEATURES_CACHE_SIZE,&editor_cache_size);
+        prefs->get(FEATURES_SHARED_CACHE,&editor_use_shared_cache);
 #ifdef USE_DXVA2
         // dxva2
         prefs->get(FEATURES_DXVA2,&bdxva2);
@@ -190,6 +215,9 @@
         // Make users happy who prefer the output dir to be the same as the input dir
         prefs->get(FEATURES_USE_LAST_READ_DIR_AS_TARGET,&lastReadDirAsTarget);
 
+        // Get the default state of the checkbox in the encoding dialog to auto-delete stats files
+        prefs->get(DEFAULT_DELETE_FIRST_PASS_LOG_FILES,&multiPassStatsAutoDelete);
+
         // PgUp and PgDown are cumbersome to reach on some laptops, offer alternative kbd shortcuts
         prefs->get(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,&altKeyboardShortcuts);
 
@@ -229,23 +257,6 @@
         olddevice=newdevice=AVDM_getCurrentDevice();
         // Audio device
         /************************ Build diaelems ****************************************/
-#ifdef HW_ACCELERATED_DECODING
-    #if defined(USE_DXVA2)
-        diaElemToggle useDxva2(&bdxva2,QT_TRANSLATE_NOOP("adm","Decode video using DXVA2 (windows)"));
-        diaElemToggle dxva2OverrideVersion(&bdxva2_override_version,QT_TRANSLATE_NOOP("adm","Ignore driver blacklist (Intel)"));
-        diaElemToggle dxva2OverrideProfile(&bdxva2_override_profile,QT_TRANSLATE_NOOP("adm","Ignore codec blacklist (Intel, HEVC 10bit)"));
-    #elif defined(USE_VIDEOTOOLBOX)
-        diaElemToggle useVideoToolbox(&bvideotoolbox,QT_TRANSLATE_NOOP("adm","Decode video using VideoToolbox (macOS)"));
-    #else
-        diaElemToggle useVdpau(&bvdpau,QT_TRANSLATE_NOOP("adm","Decode video using VDPAU (NVIDIA)"));
-        diaElemToggle useLibVA(&blibva,QT_TRANSLATE_NOOP("adm","Decode video using LIBVA (INTEL)"));
-    #endif
-    #ifndef USE_VIDEOTOOLBOX
-        diaElemReadOnlyText hwAccelText(NULL,QT_TRANSLATE_NOOP("adm","If you use Hw decoding, it is better to use the matching display driver"),NULL);
-    #endif
-        diaElemReadOnlyText hwAccelMultiThreadText(NULL,QT_TRANSLATE_NOOP("adm","Enabling Hw decoding disables multi-threading, restart application to apply changes"),NULL);
-#endif
-        diaElemToggle useOpenGl(&hasOpenGl,QT_TRANSLATE_NOOP("adm","Enable openGl support"));
         diaElemToggle allowAnyMpeg(&mpeg_no_limit,QT_TRANSLATE_NOOP("adm","_Accept non-standard audio frequency for DVD"));
         diaElemToggle resetEncoder(&loadDefault,QT_TRANSLATE_NOOP("adm","_Revert to saved default output settings on video load"));
         diaElemToggle enableAltShortcuts(&altKeyboardShortcuts,QT_TRANSLATE_NOOP("adm","_Enable alternative keyboard shortcuts"));
@@ -265,25 +276,47 @@
         diaElemToggle capsToggleSSE2(&capsSSE2, QT_TRANSLATE_NOOP("adm","Enable SSE2"));
         diaElemToggle capsToggleSSE3(&capsSSE3, QT_TRANSLATE_NOOP("adm","Enable SSE3"));
         diaElemToggle capsToggleSSSE3(&capsSSSE3, QT_TRANSLATE_NOOP("adm","Enable SSSE3"));
-
-        capsToggleAll.link(0, &capsToggleMMX);
-        capsToggleAll.link(0, &capsToggleMMXEXT);
-        capsToggleAll.link(0, &capsToggle3DNOW);
-        capsToggleAll.link(0, &capsToggle3DNOWEXT);
-        capsToggleAll.link(0, &capsToggleSSE);
-        capsToggleAll.link(0, &capsToggleSSE2);
-        capsToggleAll.link(0, &capsToggleSSE3);
-        capsToggleAll.link(0, &capsToggleSSSE3);
+        diaElemToggle capsToggleSSE4(&capsSSE4, QT_TRANSLATE_NOOP("adm","Enable SSE4"));
+        diaElemToggle capsToggleSSE42(&capsSSE42, QT_TRANSLATE_NOOP("adm","Enable SSE4.2"));
+        diaElemToggle capsToggleAVX(&capsAVX, QT_TRANSLATE_NOOP("adm","Enable AVX"));
+        diaElemToggle capsToggleAVX2(&capsAVX2, QT_TRANSLATE_NOOP("adm","Enable AVX2"));
+
+#define CPU_CAP_AVAIL(x) \
+    if(cpuCaps & ADM_CPUCAP_##x) \
+        capsToggleAll.link(0, &capsToggle##x);
+
+        CPU_CAP_AVAIL(MMX)
+        CPU_CAP_AVAIL(MMXEXT)
+        CPU_CAP_AVAIL(3DNOW)
+        CPU_CAP_AVAIL(3DNOWEXT)
+        CPU_CAP_AVAIL(SSE)
+        CPU_CAP_AVAIL(SSE2)
+        CPU_CAP_AVAIL(SSE3)
+        CPU_CAP_AVAIL(SSSE3)
+        CPU_CAP_AVAIL(SSE4)
+        CPU_CAP_AVAIL(SSE42)
+        CPU_CAP_AVAIL(AVX)
+        CPU_CAP_AVAIL(AVX2)
+#undef CPU_CAP_AVAIL
 
         frameSimd.swallow(&capsToggleAll);
-        frameSimd.swallow(&capsToggleMMX);
-        frameSimd.swallow(&capsToggleMMXEXT);
-        frameSimd.swallow(&capsToggle3DNOW);
-        frameSimd.swallow(&capsToggle3DNOWEXT);
-        frameSimd.swallow(&capsToggleSSE);
-        frameSimd.swallow(&capsToggleSSE2);
-        frameSimd.swallow(&capsToggleSSE3);
-        frameSimd.swallow(&capsToggleSSSE3);
+#define CPU_CAP_AVAIL(x) \
+    if(cpuCaps & ADM_CPUCAP_##x) \
+        frameSimd.swallow(&capsToggle##x);
+
+        CPU_CAP_AVAIL(MMX)
+        CPU_CAP_AVAIL(MMXEXT)
+        CPU_CAP_AVAIL(3DNOW)
+        CPU_CAP_AVAIL(3DNOWEXT)
+        CPU_CAP_AVAIL(SSE)
+        CPU_CAP_AVAIL(SSE2)
+        CPU_CAP_AVAIL(SSE3)
+        CPU_CAP_AVAIL(SSSE3)
+        CPU_CAP_AVAIL(SSE4)
+        CPU_CAP_AVAIL(SSE42)
+        CPU_CAP_AVAIL(AVX)
+        CPU_CAP_AVAIL(AVX2)
+#undef CPU_CAP_AVAIL
 
         diaElemThreadCount lavcThreadCount(&lavcThreads, QT_TRANSLATE_NOOP("adm","_lavc threads:"));
 
@@ -302,9 +335,10 @@
                     ,{3,      QT_TRANSLATE_NOOP("adm","Below normal"),NULL}
                     ,{4,      QT_TRANSLATE_NOOP("adm","Low"),NULL}
 };
-        diaElemMenu menuEncodePriority(&encodePriority,QT_TRANSLATE_NOOP("adm","_Encoding priority:"), sizeof(priorityEntries)/sizeof(diaMenuEntry), priorityEntries,"");
-        diaElemMenu menuIndexPriority(&indexPriority,QT_TRANSLATE_NOOP("adm","_Indexing/unpacking priority:"), sizeof(priorityEntries)/sizeof(diaMenuEntry), priorityEntries,"");
-        diaElemMenu menuPlaybackPriority(&playbackPriority,QT_TRANSLATE_NOOP("adm","_Playback priority:"), sizeof(priorityEntries)/sizeof(diaMenuEntry), priorityEntries,"");
+#define NB_ITEMS(x) sizeof(x)/sizeof(diaMenuEntry)
+        diaElemMenu menuEncodePriority(&encodePriority, QT_TRANSLATE_NOOP("adm","_Encoding priority:"), NB_ITEMS(priorityEntries), priorityEntries);
+        diaElemMenu menuIndexPriority(&indexPriority, QT_TRANSLATE_NOOP("adm","_Indexing/unpacking priority:"), NB_ITEMS(priorityEntries), priorityEntries);
+        diaElemMenu menuPlaybackPriority(&playbackPriority, QT_TRANSLATE_NOOP("adm","_Playback priority:"), NB_ITEMS(priorityEntries), priorityEntries);
 
         diaElemFrame framePriority(QT_TRANSLATE_NOOP("adm","Prioritisation"));
         framePriority.swallow(&menuEncodePriority);
@@ -312,7 +346,9 @@
         framePriority.swallow(&menuPlaybackPriority);
 
         diaElemToggle useLastReadAsTarget(&lastReadDirAsTarget,QT_TRANSLATE_NOOP("adm","_Default to the directory of the last read file for saving"));
+        diaElemToggle firstPassLogFilesAutoDelete(&multiPassStatsAutoDelete,QT_TRANSLATE_NOOP("adm","De_lete first pass log files by default"));
 
+        // Multiload
         diaElemFrame frameMultiLoad(QT_TRANSLATE_NOOP("adm","Auto-Append Settings"));
         diaElemToggle multiLoadUseCustomFragmentSize(&useCustomFragmentSize,QT_TRANSLATE_NOOP("adm","_Use custom fragment size for auto-append of MPEG-TS files"));
         diaElemUInteger multiLoadCustomFragmentSize(&customFragmentSize,QT_TRANSLATE_NOOP("adm","_Fragment size:"),250,8196);
@@ -320,34 +356,47 @@
         frameMultiLoad.swallow(&multiLoadCustomFragmentSize);
         multiLoadUseCustomFragmentSize.link(1,&multiLoadCustomFragmentSize);
 
+        // Pictures
+        diaElemFrame framePics(QT_TRANSLATE_NOOP("adm","Pictures")); // the purpose of this frame is to fix tab order
+        diaElemToggle toggleReversePicsOrder(&loadPicsInReverseOrder, QT_TRANSLATE_NOOP("adm","_Load sequentially named pictures in reverse order"));
+        framePics.swallow(&toggleReversePicsOrder);
+
+        // Avisynth
+        diaElemFrame frameAvisynth(QT_TRANSLATE_NOOP("adm","Avisynth"));
+        diaElemToggle togAskAvisynthPort(&askPortAvisynth,QT_TRANSLATE_NOOP("adm","_Always ask which port to use"));
+        diaElemUInteger uintDefaultPortAvisynth(&defaultPortAvisynth,QT_TRANSLATE_NOOP("adm","Default port to use"),1024,65535);
+        frameAvisynth.swallow(&togAskAvisynthPort);
+        frameAvisynth.swallow(&uintDefaultPortAvisynth);
+
+        // Editor cache
         diaElemFrame frameCache(QT_TRANSLATE_NOOP("adm","Caching of decoded pictures"));
         diaElemUInteger cacheSize(&editor_cache_size,QT_TRANSLATE_NOOP("adm","_Cache size:"),8,16);
+        diaElemToggle toggleSharedCache(&editor_use_shared_cache,QT_TRANSLATE_NOOP("adm","Use _shared cache"));
         frameCache.swallow(&cacheSize);
+        frameCache.swallow(&toggleSharedCache);
 
         diaMenuEntry videoMode[]={
-                             {RENDER_GTK, getNativeRendererDesc(0), NULL}
+            {RENDER_GTK, getNativeRendererDesc(0), QT_TRANSLATE_NOOP("adm","This renderer provides no hardware acceleration")}
 #ifdef USE_XV
-                             ,{RENDER_XV,   QT_TRANSLATE_NOOP("adm","XVideo (best)"),NULL}
+            ,{RENDER_XV, QT_TRANSLATE_NOOP("adm","XVideo"),NULL}
 #endif
 #ifdef USE_VDPAU
-                             ,{RENDER_VDPAU,   QT_TRANSLATE_NOOP("adm","VDPAU (best)"),NULL}
+            ,{RENDER_VDPAU, QT_TRANSLATE_NOOP("adm","VDPAU"),NULL}
 #endif
 #ifdef USE_DXVA2
-                             ,{RENDER_DXVA2,   QT_TRANSLATE_NOOP("adm","DXVA2 (best)"),NULL}
+            ,{RENDER_DXVA2, QT_TRANSLATE_NOOP("adm","DXVA2"),NULL}
 #endif
 #ifdef USE_OPENGL
-                             ,{RENDER_QTOPENGL,   QT_TRANSLATE_NOOP("adm","OpenGL (best)"),NULL}
+            ,{RENDER_QTOPENGL, QT_TRANSLATE_NOOP("adm","OpenGL"),NULL}
 #endif
 #ifdef USE_LIBVA
-                             ,{RENDER_LIBVA,   QT_TRANSLATE_NOOP("adm","LIBVA (best)"),NULL}
+            ,{RENDER_LIBVA, QT_TRANSLATE_NOOP("adm","LibVA"),NULL}
 #endif
-
-
 #ifdef USE_SDL
-							 ,{RENDER_SDL,      QT_TRANSLATE_NOOP("adm","SDL (good)"),NULL}
+            ,{RENDER_SDL, QT_TRANSLATE_NOOP("adm","SDL"),NULL}
 #endif
         };
-        diaElemMenu menuVideoMode(&render,QT_TRANSLATE_NOOP("adm","Video _display:"), sizeof(videoMode)/sizeof(diaMenuEntry),videoMode,"");
+        diaElemMenu menuVideoMode(&render,QT_TRANSLATE_NOOP("adm","Video _display:"),NB_ITEMS(videoMode),videoMode);
 #ifdef USE_SDL
         const std::vector<sdlDriverInfo> &listOfSdl=getListOfSdlDrivers();
         int nbSDL=listOfSdl.size();
@@ -364,7 +413,7 @@
                 {
                     current=i;
                 }
-                sdlMenuEntries[i]=new diaMenuEntryDynamic(i,listOfSdl[i].driverName.c_str(),"");
+                sdlMenuEntries[i]=new diaMenuEntryDynamic(i,listOfSdl[i].driverName.c_str(),NULL);
             }
             sdlMenuIndex=current;
             sdlMenu=new diaElemMenuDynamic(&sdlMenuIndex, QT_TRANSLATE_NOOP("adm","Sdl driver"),nbSDL,  sdlMenuEntries);
@@ -380,14 +429,14 @@
                              ,{1,      QT_TRANSLATE_NOOP("adm","Display only error alerts"),NULL}
                              ,{2,      QT_TRANSLATE_NOOP("adm","Display all alerts"),NULL}
         };
-        diaElemMenu menuMessage(&msglevel,QT_TRANSLATE_NOOP("adm","_Message level:"), sizeof(msgEntries)/sizeof(diaMenuEntry),msgEntries,"");
+        diaElemMenu menuMessage(&msglevel,QT_TRANSLATE_NOOP("adm","_Message level:"),NB_ITEMS(msgEntries),msgEntries);
 
 
 #if defined(ALSA_SUPPORT) || defined (OSS_SUPPORT)
         diaMenuEntry volumeEntries[]={
                              {0,       QT_TRANSLATE_NOOP("adm","PCM"),NULL}
                              ,{1,      QT_TRANSLATE_NOOP("adm","Master"),NULL}};
-        diaElemMenu menuVolume(&useMaster,QT_TRANSLATE_NOOP("adm","_Volume control:"), sizeof(volumeEntries)/sizeof(diaMenuEntry),volumeEntries,"");
+        diaElemMenu menuVolume(&useMaster,QT_TRANSLATE_NOOP("adm","_Volume control:"),NB_ITEMS(volumeEntries),volumeEntries);
 #endif
 
 
@@ -397,34 +446,22 @@
                              ,{2,      QT_TRANSLATE_NOOP("adm","Pro Logic"),NULL}
                              ,{3,      QT_TRANSLATE_NOOP("adm","Pro Logic II"),NULL}
          };
-        diaElemMenu menuMixer(&downmix,QT_TRANSLATE_NOOP("adm","_Local playback downmixing:"), sizeof(mixerEntries)/sizeof(diaMenuEntry),mixerEntries,"");
+        diaElemMenu menuMixer(&downmix,QT_TRANSLATE_NOOP("adm","_Local playback downmixing:"),NB_ITEMS(mixerEntries),mixerEntries);
 //*********** AV_
 
 //***AV
         uint32_t nbAudioDevice=ADM_av_getNbDevices();
         diaMenuEntryDynamic **audioDeviceItems=new diaMenuEntryDynamic *[nbAudioDevice+1];
-        audioDeviceItems[0]=new diaMenuEntryDynamic(0,"Dummy","Dummy");
+        audioDeviceItems[0]=new diaMenuEntryDynamic(0,"Dummy",NULL);
         for(int i=0;i<nbAudioDevice;i++)
         {
             std::string name;
             uint32_t major,minor,patch;
             ADM_av_getDeviceInfo(i, name, &major,&minor,&patch);
-            audioDeviceItems[i+1]=new diaMenuEntryDynamic(i+1,name.c_str(),name.c_str());
+            audioDeviceItems[i+1]=new diaMenuEntryDynamic(i+1,name.c_str(),NULL);
         }
         diaElemMenuDynamic menuAudio(&newdevice,QT_TRANSLATE_NOOP("adm","_AudioDevice"), nbAudioDevice+1,
                     audioDeviceItems,NULL);
-        // default Post proc
-     diaElemToggle     fhzd(&hzd,QT_TRANSLATE_NOOP("adm","_Horizontal deblocking"));
-     diaElemToggle     fvzd(&vzd,QT_TRANSLATE_NOOP("adm","_Vertical deblocking"));
-     diaElemToggle     fdring(&dring,QT_TRANSLATE_NOOP("adm","De_ringing"));
-     diaElemUInteger   postProcStrength(&pp_value,QT_TRANSLATE_NOOP("adm","_Strength:"),0,5);
-     diaElemFrame      framePP(QT_TRANSLATE_NOOP("adm","Default Postprocessing"));
-
-     framePP.swallow(&fhzd);
-     framePP.swallow(&fvzd);
-     framePP.swallow(&fdring);
-     framePP.swallow(&postProcStrength);
-
 
 //  -- select language
         typedef struct  { const char *lang;const char *desc;}languageDescriptor;
@@ -458,19 +495,20 @@
         diaElemMenuDynamic menuLanguage(&languageIndex,QT_TRANSLATE_NOOP("adm","_Language"), nbLanguages,
                     languagesMenuItems,NULL);
 //--
-
-
-
+#define NB_ELEM(x) sizeof(x)/sizeof(diaElem *)
         /* User Interface */
         diaElem *diaUser[]={&menuMessage, &menuLanguage, &resetEncoder, &enableAltShortcuts, &swapUpDownKeys, &swapMarkers, &checkForUpdate};
-        diaElemTabs tabUser(QT_TRANSLATE_NOOP("adm","User Interface"),7,diaUser);
+        diaElemTabs tabUser(QT_TRANSLATE_NOOP("adm","User Interface"),NB_ELEM(diaUser),diaUser);
 
          /* Automation */
 
+        /* Import */
+        diaElem *diaImport[]={&frameMultiLoad, &framePics, &frameAvisynth};
+        diaElemTabs tabImport(QT_TRANSLATE_NOOP("adm","Import"),NB_ELEM(diaImport),diaImport);
 
         /* Output */
-        diaElem *diaOutput[]={&allowAnyMpeg,&useLastReadAsTarget,&frameMultiLoad,&frameCache};
-        diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),4,(diaElem **)diaOutput);
+        diaElem *diaOutput[]={&allowAnyMpeg, &useLastReadAsTarget, &firstPassLogFilesAutoDelete};
+        diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),NB_ELEM(diaOutput),diaOutput);
 
         /* Audio */
 
@@ -484,13 +522,53 @@
 
 #if 1
         diaElem *diaAudio[]={&menuMixer,&menuAudio};
-        diaElemTabs tabAudio(QT_TRANSLATE_NOOP("adm","Audio"),2,(diaElem **)diaAudio);
-#endif
+        diaElemTabs tabAudio(QT_TRANSLATE_NOOP("adm","Audio"),NB_ELEM(diaAudio),diaAudio);
+#endif
+
+        /* Post-Processing */
+        diaElemToggle fhzd(&hzd,QT_TRANSLATE_NOOP("adm","_Horizontal deblocking"));
+        diaElemToggle fvzd(&vzd,QT_TRANSLATE_NOOP("adm","_Vertical deblocking"));
+        diaElemToggle fdring(&dring,QT_TRANSLATE_NOOP("adm","De_ringing"));
+        diaElemUInteger postProcStrength(&pp_value,QT_TRANSLATE_NOOP("adm","_Strength:"),0,5);
+
+        diaElemFrame framePP(QT_TRANSLATE_NOOP("adm","Default Postprocessing"));
+        framePP.swallow(&fhzd);
+        framePP.swallow(&fvzd);
+        framePP.swallow(&fdring);
+        framePP.swallow(&postProcStrength);
+
+        // HDR
+        diaMenuEntry toneMapEntries[] = {
+             {0,    QT_TRANSLATE_NOOP("adm","Disabled"),NULL}
+            ,{1,    QT_TRANSLATE_NOOP("adm","Fast YUV"),NULL}
+            ,{2,    QT_TRANSLATE_NOOP("adm","RGB clipping"),NULL}
+            ,{3,    QT_TRANSLATE_NOOP("adm","RGB Reinhard"),NULL}
+            ,{4,    QT_TRANSLATE_NOOP("adm","RGB Hable"),NULL}
+            //,{2,    QT_TRANSLATE_NOOP("adm","TODO"),NULL}
+        };
+        diaElemMenu menuToneMapHDR(&toneMappingHDR,QT_TRANSLATE_NOOP("adm","Default _tone mapping method:"),NB_ITEMS(toneMapEntries),toneMapEntries);
+        diaElemFloatResettable floatTargetLumHDR(&targetLumHDR,QT_TRANSLATE_NOOP("adm","Target peak luminance (nits):"),0.,1000.,DEFAULT_TARGET_LUMINANCE_HDR);
 
+        diaElemFrame frameHDR(QT_TRANSLATE_NOOP("adm","HDR"));
+        frameHDR.swallow(&menuToneMapHDR);
+        frameHDR.swallow(&floatTargetLumHDR);
+
+        diaElem *diaPostProc[] = { &framePP, &frameHDR };
+        diaElemTabs tabPostProc(QT_TRANSLATE_NOOP("adm","Post-Processing"),NB_ELEM(diaPostProc),diaPostProc);
 
         /* Display */
         diaElemToggle togDisplayRefreshCap(&refreshCapEnabled,QT_TRANSLATE_NOOP("adm","_Limit Refresh Rate"));
         diaElemUInteger displayRefreshCap(&refreshCapValue,QT_TRANSLATE_NOOP("adm","Refresh Rate Cap (ms)"),10,1000);
+
+#ifdef USE_OPENGL
+        diaElemToggle useOpenGl(&hasOpenGl,QT_TRANSLATE_NOOP("adm","Enable openGl support"));
+        diaElemReadOnlyText openGlText(NULL,QT_TRANSLATE_NOOP("adm","OpenGL video display and filters require "
+            "OpenGL to be enabled and working at application startup to be available"));
+
+        diaElemFrame frameOpenGL(QT_TRANSLATE_NOOP("adm","OpenGL"));
+        frameOpenGL.swallow(&useOpenGl);
+        frameOpenGL.swallow(&openGlText);
+#endif
         diaElemFrame frameRC(QT_TRANSLATE_NOOP("adm","GUI Rendering Options")); // a hack to fix tabbing order
 
         // Packing the following elements into frameRC rectifies otherwise wrong tabbing order:
@@ -498,50 +576,83 @@
         // toggle resulting in a tabbing order 1-6-7-2-3-4-5-8, counting elements from top to bottom.
         // With this extra frame we get 1-2-3-4-5-6-7-8 (video mode, hor. deblocking, vert. delocking,
         // deringing, deringing strength, OpenGL toggle, refr. rate cap toggle, refr. rate spinbox).
-        frameRC.swallow(&useOpenGl);
         frameRC.swallow(&togDisplayRefreshCap);
         frameRC.swallow(&displayRefreshCap);
 
+        diaElem *diaVideo[] = {
+            &menuVideoMode,
+#ifdef USE_OPENGL
+            &frameOpenGL,
+#endif
 #ifdef USE_SDL
-        diaElem *diaVideo[]={&menuVideoMode,sdlMenu,&framePP,&frameRC};
-#else
-        diaElem *diaVideo[]={&menuVideoMode,&framePP,&frameRC};
+            sdlMenu,
 #endif
-        diaElemTabs tabVideo(QT_TRANSLATE_NOOP("adm","Display"),sizeof(diaVideo)/sizeof(diaElem *),(diaElem **)diaVideo);
+            &frameRC,
+            &frameCache
+        };
+        diaElemTabs tabVideo(QT_TRANSLATE_NOOP("adm","Display"),NB_ELEM(diaVideo),diaVideo);
+
         /* HW accel */
-#ifdef USE_DXVA2
-        diaElem *diaHwDecoding[]={&useDxva2,&dxva2OverrideVersion,&dxva2OverrideProfile,&hwAccelMultiThreadText,&hwAccelText};
-        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),5,(diaElem **)diaHwDecoding);
-#elif defined(USE_VIDEOTOOLBOX)
-        diaElem *diaHwDecoding[]={&useVideoToolbox,&hwAccelMultiThreadText};
-        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),2,(diaElem **)diaHwDecoding);
-#elif defined(HW_ACCELERATED_DECODING)
-        diaElem *diaHwDecoding[]={&useVdpau,&useLibVA,&hwAccelMultiThreadText,&hwAccelText};
-        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),4,(diaElem **)diaHwDecoding);
+#ifdef HW_ACCELERATED_DECODING
+    #if defined(USE_DXVA2)
+        diaElemToggle useDxva2(&bdxva2,QT_TRANSLATE_NOOP("adm","Decode video using DXVA2 (windows)"));
+        diaElemToggle dxva2OverrideVersion(&bdxva2_override_version,QT_TRANSLATE_NOOP("adm","Ignore driver blacklist (Intel)"));
+        diaElemToggle dxva2OverrideProfile(&bdxva2_override_profile,QT_TRANSLATE_NOOP("adm","Ignore codec blacklist (Intel, HEVC 10bit)"));
+    #elif defined(USE_VIDEOTOOLBOX)
+        diaElemToggle useVideoToolbox(&bvideotoolbox,QT_TRANSLATE_NOOP("adm","Decode video using VideoToolbox (macOS)"));
+    #else
+        diaElemToggle useVdpau(&bvdpau,QT_TRANSLATE_NOOP("adm","Decode video using VDPAU (NVIDIA)"));
+        diaElemToggle useLibVA(&blibva,QT_TRANSLATE_NOOP("adm","Decode video using LIBVA (INTEL)"));
+    #endif
+    #ifndef USE_VIDEOTOOLBOX
+        diaElemReadOnlyText hwAccelText(NULL,QT_TRANSLATE_NOOP("adm","If you use Hw decoding, it is better to use the matching display driver"),NULL);
+    #endif
+        diaElemReadOnlyText hwAccelMultiThreadText(NULL,QT_TRANSLATE_NOOP("adm","Enabling Hw decoding disables multi-threading, restart application to apply changes"),NULL);
+
+        diaElem *diaHwDecoding[] = {
+    #ifdef USE_DXVA2
+            &useDxva2,
+            &dxva2OverrideVersion,
+            &dxva2OverrideProfile,
+    #elif defined(USE_VIDEOTOOLBOX)
+            &useVideoToolbox,
+    #else
+            &useVdpau,
+            &useLibVA,
+    #endif
+            &hwAccelMultiThreadText
+    #ifndef USE_VIDEOTOOLBOX
+            ,&hwAccelText
+    #endif
+        };
+        diaElemTabs tabHwDecoding(QT_TRANSLATE_NOOP("adm","HW Accel"),NB_ELEM(diaHwDecoding),diaHwDecoding);
 #endif
 
         /* CPU tab */
         diaElem *diaCpu[]={&frameSimd};
-        diaElemTabs tabCpu(QT_TRANSLATE_NOOP("adm","CPU"),1,(diaElem **)diaCpu);
+        diaElemTabs tabCpu(QT_TRANSLATE_NOOP("adm","CPU"),NB_ELEM(diaCpu),diaCpu);
 
         /* Threading tab */
         diaElem *diaThreading[]={&frameThread, &framePriority};
-        diaElemTabs tabThreading(QT_TRANSLATE_NOOP("adm","Threading"),2,(diaElem **)diaThreading);
-
-        /* Avisynth tab */
-        diaElemToggle togAskAvisynthPort(&askPortAvisynth,QT_TRANSLATE_NOOP("adm","_Always ask which port to use"));
-        diaElemUInteger uintDefaultPortAvisynth(&defaultPortAvisynth,QT_TRANSLATE_NOOP("adm","Default port to use"),1024,65535);
-        diaElem *diaAvisynth[]={&togAskAvisynthPort, &uintDefaultPortAvisynth};
-        diaElemTabs tabAvisynth("Avisynth",2,(diaElem **)diaAvisynth);
-
-        /* Global Glyph tab */
+        diaElemTabs tabThreading(QT_TRANSLATE_NOOP("adm","Threading"),NB_ELEM(diaThreading),diaThreading);
+
+        diaElemTabs *tabs[] = {
+            &tabUser,
+            &tabImport,
+            &tabOutput,
+            &tabAudio,
+            &tabVideo,
+            &tabPostProc,
 #ifdef HW_ACCELERATED_DECODING
-        diaElemTabs *tabs[]={&tabUser, &tabOutput, &tabAudio, &tabVideo, &tabHwDecoding, &tabCpu, &tabThreading, &tabAvisynth};
-        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),8,tabs);
-#else
-        diaElemTabs *tabs[]={&tabUser, &tabOutput, &tabAudio, &tabVideo, &tabCpu, &tabThreading, &tabAvisynth};
-        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),7,tabs);
+            &tabHwDecoding,
 #endif
+            &tabCpu,
+            &tabThreading
+        };
+
+#undef NB_ELEM
+#define NB_ELEM(x) sizeof(x)/sizeof(diaElemTabs *)
+        void *factoryCookiez=diaFactoryRunTabsPrepare(QT_TRANSLATE_NOOP("adm","Preferences"),NB_ELEM(tabs),tabs);
 // Now we can disable stuff if needed
 #if defined(HW_ACCELERATED_DECODING) && !defined(USE_VIDEOTOOLBOX) && !defined(USE_DXVA2)
     #ifndef USE_VDPAU
@@ -552,10 +663,6 @@
     #endif
 #endif
 
-#ifndef USE_OPENGL
-        useOpenGl.enable(false);
-#endif
-
         uint8_t dialogAccepted=0;
         if( diaFactoryRunTabsFinish(factoryCookiez))
         {
@@ -580,6 +687,10 @@
                     CPU_CAPS(SSE2);
                     CPU_CAPS(SSE3);
                     CPU_CAPS(SSSE3);
+                    CPU_CAPS(SSE4);
+                    CPU_CAPS(SSE42);
+                    CPU_CAPS(AVX);
+                    CPU_CAPS(AVX2);
             }
             prefs->set(FEATURES_CPU_CAPS,cpuMaskOut);
             CpuCaps::setMask(cpuMaskOut);
@@ -630,8 +741,11 @@
             // Auto-append
             prefs->set(DEFAULT_MULTILOAD_USE_CUSTOM_SIZE, useCustomFragmentSize);
             prefs->set(DEFAULT_MULTILOAD_CUSTOM_SIZE_M, customFragmentSize);
+            // Auto-load pictures in reverse order
+            prefs->set(LOAD_PICTURES_REVERSE_ORDER, loadPicsInReverseOrder);
             // Video cache
             prefs->set(FEATURES_CACHE_SIZE, editor_cache_size);
+            prefs->set(FEATURES_SHARED_CACHE, editor_use_shared_cache);
             // Encoding priority
             prefs->set(PRIORITY_ENCODING, encodePriority);
             // Indexing / unpacking priority
@@ -671,6 +785,8 @@
             prefs->set(FEATURES_THREADING_LAVC, lavcThreads);
             // Make users happy who prefer the output dir to be the same as the input dir
             prefs->set(FEATURES_USE_LAST_READ_DIR_AS_TARGET,lastReadDirAsTarget);
+            // Store the default state of the encoding dialog checkbox to auto-delete first pass stats
+            prefs->set(DEFAULT_DELETE_FIRST_PASS_LOG_FILES,multiPassStatsAutoDelete);
             // Enable alternate keyboard shortcuts
             prefs->set(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,altKeyboardShortcuts);
             // Allow to use the UP key to navigate back, DOWN to navigate forward
@@ -682,6 +798,10 @@
             prefs->set(AVISYNTH_AVISYNTH_DEFAULTPORT,defaultPortAvisynth);
             prefs->set(AVISYNTH_AVISYNTH_ALWAYS_ASK, askPortAvisynth);
 
+            // HDR
+            prefs->set(HDR_TONEMAPPING, toneMappingHDR);
+            prefs->set(HDR_TARGET_LUMINANCE, targetLumHDR);
+
                 // Initialise SDL again as driver may have changed
 #ifdef USE_SDL
             std::string driverName=listOfSdl[sdlMenuIndex].driverName;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h Changed

@@ -1,10 +1,13 @@
 #pragma once
 
+#define CLEAR_FRAME_TYPE 0xFFFFFFFF
+
 void UI_updateFrameCount(uint32_t curFrame);
 void UI_setFrameCount(uint32_t curFrame,uint32_t total);
 
 void UI_setCurrentTime(uint64_t pts);
 void UI_setTotalTime(uint64_t curTime);
+void UI_setSegments(uint32_t numOfSegs, uint64_t * segPts);
 double 	UI_readScale( void );
 void 	UI_setScale( double  val );
 void 	UI_setFrameType( uint32_t frametype,uint32_t qp);
@@ -45,7 +48,7 @@
 void UI_refreshCustomMenu(void);
 void UI_applySettings(void);
 
-bool UI_setVUMeter( uint32_t volume[8]); // Volume between 0 and 255.
+bool UI_setVUMeter( int32_t volume[8]); // Volume as integer dBFS (valid range -100 to +3), mark inactive channel with +255 (> 3)
 bool UI_setVolume(void);
 bool UI_setDecoderName(const char *name);
 bool UI_setDisplayName(const char *name);
@@ -55,6 +58,9 @@
 bool UI_setTimeShift(int onoff,int value);
 void UI_setAudioTrackCount( int nb );
 
+/* We need to know whether auto-repeat is firing */
+bool UI_navigationButtonsPressed(void);
+
 bool UI_askAvisynthPort(uint32_t &port);
 
 bool UI_reset(void);

avidemux_2.7.8.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

@@ -79,6 +79,8 @@
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),       NULL,ACT_MarkA,         NULL,"Ctrl+PgUp",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),       NULL,ACT_MarkB,         NULL,"Ctrl+PgDown",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Marker A"),     NULL,ACT_ResetMarkerA,  NULL,"Ctrl+Shift+PgUp",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Marker B"),     NULL,ACT_ResetMarkerB,  NULL,"Ctrl+Shift+PgDown",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"),      NULL,ACT_ResetMarkers,  NULL,"Ctrl+Home",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"),       NULL,ACT_PREFERENCES,   NULL,NULL,0},
@@ -96,6 +98,7 @@
 static const MenuEntry _myMenuVideo[] = {
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Decoder Option"),     NULL,ACT_DecoderOption,     NULL,NULL,0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","PostProcessing"),     NULL,ACT_SetPostProcessing, NULL,NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","HDR tone mapping"),   NULL,ACT_SetHDRConfig, NULL,NULL,0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Filters"),            NULL,ACT_VIDEO_FILTERS,     NULL,"Ctrl+Alt+F",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play filtered"),      NULL,ACT_PreviewChanged,    NULL,NULL,0}
         };
@@ -132,6 +135,8 @@
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"),          NULL,ACT_NextFrame,       MKICON(forward),       "Right",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Intra Frame"),NULL,ACT_PreviousKFrame,  MKICON(player_rew),    "Down",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Intra Frame"),    NULL,ACT_NextKFrame,      MKICON(player_fwd),    "Up",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Cut Point"),  NULL,ACT_PrevCutPoint,    MKICON(prev_cut),      NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Cut Point"),      NULL,ACT_NextCutPoint,    MKICON(next_cut),      NULL,0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Black Frame"),NULL,ACT_PrevBlackFrame,  MKICON(prev_black),    NULL,0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Black Frame"),    NULL,ACT_NextBlackFrame,  MKICON(next_black),    NULL,0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","First Frame"),         NULL,ACT_Begin,           MKICON(player_start),  "Home",0},
@@ -140,7 +145,16 @@
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"),      NULL,ACT_GotoMarkA,       MKICON(markA),         "PgUp",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"),      NULL,ACT_GotoMarkB,       MKICON(markB),         "PgDown",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY, NULL,NULL,1},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_GotoTime,        NULL,                  "Ctrl+T",0}
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_SelectTime,      NULL,                  "Ctrl+T",0},
+            {MENU_SEPARATOR,"-",NULL,ACT_DUMMY, NULL,NULL,1},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Backward 1 second"),   NULL,ACT_Back1Second,     NULL,                  "Shift+Left",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Forward 1 second"),    NULL,ACT_Forward1Second,  NULL,                  "Shift+Right",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Backward 2 seconds"),  NULL,ACT_Back2Seconds,    NULL,                  "Ctrl+Left",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Forward 2 seconds"),   NULL,ACT_Forward2Seconds, NULL,                  "Ctrl+Right",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Backward 4 seconds"),  NULL,ACT_Back4Seconds,    NULL,                  "Ctrl+Shift+Left",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Forward 4 seconds"),   NULL,ACT_Forward4Seconds, NULL,                  "Ctrl+Shift+Right",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Backward one minute"), NULL,ACT_Back1Mn,         MKICON(backward1mn),   NULL,0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Forward one minute"),  NULL,ACT_Forward1Mn,      MKICON(forward1mn),    NULL,0}
         };
 
 std::vector<MenuEntry> myMenuGo(_myMenuGo, _myMenuGo + sizeof(_myMenuGo) / sizeof(_myMenuGo[0]));

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/include/ADM_edCache.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/include/ADM_edCache.h Changed

@@ -20,8 +20,9 @@
 
 typedef struct cacheElem
 {
-	ADMImage *image;
+    ADMImage *image;
     uint64_t pts;       // If set to ADM_NO_PTS -> unused entry
+    int ref;
 }cacheElem;
 /**
     \class EditorCache
@@ -29,22 +30,27 @@
 */
 class EditorCache
 {
-	private :
-			uint32_t     readIndex,writeIndex;
-			cacheElem	 *_elem;
-			uint32_t	_nbImage;
-            void        check(void);
-	public:
-                        EditorCache(uint32_t size,uint32_t w, uint32_t h);
-                        ~EditorCache(void);
-			ADMImage	*getFreeImage(void);	
-			bool		validate(ADMImage *image);
-			void		dump(void);
-            void        flush(void);
-            void        invalidate(ADMImage *image);
-            ADMImage    *getByPts(uint64_t Pts);            
-            ADMImage    *getAfter(uint64_t Pts);
-            ADMImage    *getBefore(uint64_t Pts);
-            ADMImage    *getLast(void);
+private :
+    uint32_t        readIndex,writeIndex;
+    uint32_t        commonWidth,commonHeight;
+    cacheElem       _elem[EDITOR_CACHE_MAX_SIZE];
+    uint32_t        _nbImage;
+
+    void            check(void);
+
+public:
+                    EditorCache(uint32_t w, uint32_t h);
+                    ~EditorCache(void);
+
+    bool            createBuffers(uint32_t size);
+    ADMImage        *getFreeImage(int vid);
+    bool            validate(ADMImage *image);
+    void            dump(void);
+    void            flush(void);
+    void            invalidate(ADMImage *image);
+    ADMImage        *getByPts(int vid, uint64_t Pts);
+    ADMImage        *getAfter(int vid, uint64_t Pts);
+    ADMImage        *getBefore(int vid, uint64_t Pts);
+    ADMImage        *getLast(int vid);
 };
 #endif

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

@@ -36,6 +36,7 @@
  #include "ADM_edCache.h"
  #include "ADM_pp.h"
  #include "ADM_colorspace.h"
+ #include "ADM_toneMapper.h"
 
  #include "ADM_audioStream.h"
  #include "ADM_audiocodec.h"
@@ -158,6 +159,7 @@
                     uint8_t     dupe(ADMImage *src,ADMImage *dst,_VIDEOS *vid);
                     uint32_t	_internalFlags;  // Flags :
                     ADM_PP      *_pp;             // Postprocessing settings
+                    ADMToneMapperConfig    *_hdrConfig;
                     ADMImage	*_imageBuffer;   // Temp buffer used for decoding
                     uint64_t    _currentPts;        // Current image PTS
                     uint32_t    _currentSegment;    // Current video segment
@@ -254,6 +256,7 @@
 /************************************ Public API ***************************/
 public:
                     uint64_t    getLastKeyFramePts(void);
+                    uint64_t    getFirstFrameInSegmentPts(uint32_t segment);
                     uint64_t    getCurrentFramePts(void);
                     bool		setCurrentFramePts(uint64_t pts);
                     bool        goToTimeVideo(uint64_t time);
@@ -291,7 +294,7 @@
                     MainAVIHeader   *getMainHeader(void );
                     ADM_BITMAPINFOHEADER *getBIH(void ) ;
 
-                    uint8_t     getVideoInfo(aviInfo *info); // for common timebase, call getTimeBase afterwards
+                    uint8_t     getVideoInfo(aviInfo *info, aviColorInfo *cfo=NULL); // for common timebase, call getTimeBase afterwards
                     _VIDEOS*    getRefVideo(int videoIndex);
                     uint64_t    getVideoDuration(void);
                     uint64_t    getFrameIncrement(bool forCopyMode=false); /// Returns the # of us between 2 frames or the smaller value of them
@@ -315,6 +318,10 @@
                     uint8_t             setPostProc( uint32_t type, uint32_t strength,	bool swapuv);
                     uint8_t             getPostProc( uint32_t *type, uint32_t *strength,bool  *swapuv);
 /******************************* /Post Processing ************************************/
+/******************************* HDR tonemaping config *******************************/
+                    uint8_t             setHDRConfig( uint32_t toneMappingMethod, float saturationAdjust, float boostAdjust);
+                    uint8_t             getHDRConfig( uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust);
+/******************************* /HDR tonemaping config ******************************/
 /******************************* Editing ************************************/
                     bool                remove(uint64_t start,uint64_t end);
                     bool                truncate(uint64_t start);

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/include/IEditor.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/include/IEditor.h Changed

@@ -57,11 +57,12 @@
     virtual bool getPKFramePTS(uint64_t *frameTime) = 0;
     virtual bool getNKFramePTS(uint64_t *frameTime) = 0;
     virtual uint8_t getPostProc(uint32_t *type, uint32_t *strength, bool *swapuv) = 0;
+    virtual uint8_t getHDRConfig( uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust) = 0;
     virtual _SEGMENT* getSegment(int i) = 0;
     virtual char *getVideoCodec(void) = 0;
     virtual int getVideoCount(void) = 0;
     virtual uint64_t getVideoDuration(void) = 0;
-    virtual uint8_t getVideoInfo(aviInfo *info) = 0;
+    virtual uint8_t getVideoInfo(aviInfo *info, aviColorInfo *colfo = NULL) = 0;
     virtual bool getTimeBase(uint32_t *scale, uint32_t *rate, bool copy=false) = 0;
     virtual _VIDEOS* getRefVideo(int videoIndex) = 0;
     virtual bool getVideoPtsDts(uint32_t frame, uint32_t *flags, uint64_t *pts, uint64_t *dts) = 0;
@@ -82,6 +83,7 @@
     virtual bool setMarkerAPts(uint64_t pts) = 0;
     virtual bool setMarkerBPts(uint64_t pts) = 0;
     virtual uint8_t setPostProc(uint32_t type, uint32_t strength, bool swapuv) = 0;
+    virtual uint8_t setHDRConfig( uint32_t toneMappingMethod, float saturationAdjust, float boostAdjust) = 0;
     virtual ADM_videoEncoder6* getCurrentVideoEncoder() = 0;
     virtual int setVideoCodec(const char *codec, CONFcouple *c) = 0;
     virtual int changeVideoParam(const char *codec, CONFcouple *c) = 0;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edRender.cpp Changed

@@ -30,6 +30,7 @@
 #endif
 
 #include "ADM_pp.h"
+#include "ADM_toneMapper.h"
 
 /**
     \fn recalibrateSigned
@@ -213,16 +214,26 @@
     
         // Decode image...
         _SEGMENT *seg=_segments.getSegment(_currentSegment);
+        ADM_assert(seg);
         // Search it in the cache...
         _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
-        
+        ADM_assert(vid);
+
         uint64_t refPts;
-        _segments.LinearToRefTime(_currentSegment,_currentPts,&refPts);
-        ADMImage *cached=vid->_videoCache->getAfter(refPts);
+
+        if(false == _segments.LinearToRefTime(_currentSegment,_currentPts,&refPts))
+        {
+            ADM_error("_currentSegment or _currentPts invalid or mismatched.\n");
+            return false;
+        }
+
+        EditorCache *cache = vid->_videoCache;
+        ADM_assert(cache);
+        ADMImage *cached = cache->getAfter(seg->_reference, refPts);
         if(cached)
         {
-            uint64_t delta=cached->Pts-seg->_refStartTimeUs;
-            if(delta<seg->_durationUs)
+            int64_t delta = cached->Pts - seg->_refStartTimeUs;
+            if(delta < (int64_t)seg->_durationUs)
             {
                 // Got it
                 image->duplicate(cached);
@@ -249,7 +260,7 @@
                 if(frame && DecodePictureUpToIntra(seg->_reference,frame))
                 {
                     ADM_info("Successfully skipped to the next keyframe\n");
-                    cached=vid->_videoCache->getByPts(nkfPts);
+                    cached = cache->getByPts(seg->_reference, nkfPts);
                     if(cached)
                         image->duplicate(cached);
                 }else
@@ -291,6 +302,7 @@
             }
             ADM_info("Switched to next segment\n");
             seg=_segments.getSegment(_currentSegment);
+            ADM_assert(seg);
             samePictureInternal(seg->_reference,image);
             updateImageTiming(seg,image);
             SET_CURRENT_PTS(image->Pts);
@@ -366,12 +378,17 @@
         uint64_t targetPts=_currentPts;
         // Decode image...
         _SEGMENT *seg=_segments.getSegment(_currentSegment);
+        ADM_assert(seg);
         // Search it in the cache...
         _VIDEOS *vid=_segments.getRefVideo(seg->_reference);
-        
-        uint64_t refPts;
+        ADM_assert(vid);
 
-        _segments.LinearToRefTime(_currentSegment,_currentPts,&refPts);
+        uint64_t refPts;
+        if(false == _segments.LinearToRefTime(_currentSegment,_currentPts,&refPts))
+        {
+            ADM_error("_currentSegment or _currentPts invalid or mismatched.\n");
+            return false;
+        }
 
         if(refPts<=vid->firstFramePts) // at the first frame of segment too
         {
@@ -385,8 +402,10 @@
             // and the segment boundary. Call a taxi then.
             targetPts=seg->_startTimeUs;
         }
-        ADMImage *cached=vid->_videoCache->getBefore(refPts);
-       
+        EditorCache *cache = vid->_videoCache;
+        ADM_assert(cache);
+        ADMImage *cached = cache->getBefore(seg->_reference, refPts);
+
         if(cached && cached->Pts<refPts)
         {
             if(cached->Pts>=seg->_refStartTimeUs) // It might be in the cache but belonging to the previous seg
@@ -398,8 +417,8 @@
                 return true;
             }
         }
-        ADM_info("while looking for frame %" PRIu64"\n",_currentPts);
-        vid->_videoCache->dump();
+        ADM_info("while looking for frame at PTS %s (%" PRIu64")\n",ADM_us2plain(_currentPts),_currentPts);
+        cache->dump();
         // The previous is not available
         // either it is in the same segment but we have decoded later in that segment
         // , or it is in the previous segment
@@ -415,17 +434,16 @@
         // 1- we are still in the same segment, in that case, we have to go back
         // and decode forward 
         // 2- We are at a jum, i.e. what we want is the last image from the previous segment
-        seg=_segments.getSegment(segNo);
         if(segNo==_currentSegment) // Still in the same segment..
         {
                 switch(decodeTillPictureAtPts(targetPts,image))
                 {
                     case 1:
-                        cached=vid->_videoCache->getBefore(refPts);
+                        cached = cache->getBefore(seg->_reference, refPts);
                         break;
                     case ADM_IGN:
                         ADM_warning("Cannot decode till our current pts\n");
-                        cached=vid->_videoCache->getLast();
+                        cached = cache->getLast(seg->_reference);
                         break;
                     default:
                         return false;
@@ -443,7 +461,7 @@
                     ADM_warning("The image found is before refStartTime ???\n");
                 }
                 ADM_error("Find our frame and its predecessor (%" PRIu64"), but it is out of range\n",refPts);
-                vid->_videoCache->dump();
+                cache->dump();
                 return false;
         }
         ADM_assert(segNo+1==_currentSegment);
@@ -455,20 +473,26 @@
             ADM_error("Cannot switch to previous segment to get previous frame\n");
             return false;
         }
-        
         seg=_segments.getSegment(_currentSegment);
+        ADM_assert(seg);
         vid=_segments.getRefVideo(seg->_reference);
-        
+        ADM_assert(vid);
 
-        if(false==decodeTillPictureAtPts(targetPts,image))
+        if(0 == decodeTillPictureAtPts(targetPts,image))
         {
             ADM_error("Cannot decode to get a candidate.\n");
             return false;
         }
         _currentSegment=segNo;
         // We may have overshot...
-        _segments.LinearToRefTime(_currentSegment,targetPts,&refPts);
-        ADMImage *candidate=vid->_videoCache->getLast();
+        if(false == _segments.LinearToRefTime(_currentSegment,targetPts,&refPts))
+        {
+            ADM_error("targetPts out of range for the ref video in segment %" PRIu32"\n",_currentSegment);
+            return false;
+        }
+        cache = vid->_videoCache;
+        ADM_assert(cache);
+        ADMImage *candidate = cache->getLast(seg->_reference);
         if(!candidate)
         {
             ADM_error("No frame in cache !\n");
@@ -481,7 +505,7 @@
                 break;
             }
             // Try to go before...
-            ADMImage *img=vid->_videoCache->getBefore(candidate->Pts);
+            ADMImage *img = cache->getBefore(seg->_reference, candidate->Pts);
             if(!img) break;
             candidate=img;
         }
@@ -512,7 +536,7 @@
     }
       ADM_assert(_currentSegment==segNo);
       refPts=segTime+seg->_refStartTimeUs;
-      ADMImage *last=ref->_videoCache->getByPts(refPts);
+      ADMImage *last=ref->_videoCache->getByPts(seg->_reference, refPts);
       if(last)
       {
             image->duplicate(last);
@@ -531,12 +555,12 @@
 */
 uint8_t ADM_Composer::dupe(ADMImage *src,ADMImage *dst,_VIDEOS *vid)
 {
-    if(src->_colorspace==ADM_COLOR_YV12)
+    if(src->_pixfrmt==ADM_PIXFRMT_YV12)
         return dst->duplicate(src);
     // We need to do some colorspace conversion
     // Is there already one ?
     if(!vid->color)
-        vid->color=new ADMColorScalerSimple(src->_width,src->_height,src->_colorspace,ADM_COLOR_YV12);
+        vid->color=new ADMColorScalerSimple(src->_width,src->_height,src->_pixfrmt,ADM_PIXFRMT_YV12);
     // Since it is not YV12 it MUST be a ref
     ADM_assert(src->isRef());
     dst->copyInfo(src);
@@ -569,6 +593,27 @@
 	return 1;
 }
 /**
+    \fn setHDRConfig
+*/
+uint8_t ADM_Composer::setHDRConfig( uint32_t toneMappingMethod, float saturationAdjust, float boostAdjust)
+{
+    if(!_segments.getNbRefVideos()) return 0;
+    if(!_hdrConfig) return 0;
+    _hdrConfig->setConfig(toneMappingMethod, saturationAdjust, boostAdjust);
+    return 1;
+}
+/**
+    \fn getHDRConfig
+*/
+
+uint8_t ADM_Composer::getHDRConfig( uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust)
+{
+    if(!_segments.getNbRefVideos()) return 0;
+    if(!_hdrConfig) return 0;
+    _hdrConfig->getConfig(toneMappingMethod, saturationAdjust, boostAdjust);
+    return 1;
+}
+/**
     \fn switchToNextSegment
     \brief Switch to the next segment

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp Changed

@@ -43,7 +43,7 @@
     bool found=false;
     if(timeToSeek>vid->firstFramePts && !dontdecode)
     {
-        ADMImage *image=cache->getByPts(timeToSeek);
+        ADMImage *image=cache->getByPts(ref,timeToSeek);
         if(image)
         {
             vid->lastDecodedPts=vid->lastReadPts=timeToSeek;
@@ -121,7 +121,7 @@
     EditorCache   *cache =vid->_videoCache;
     ADM_assert(cache);
 
-  ADMImage *in=cache->getByPts(vid->lastDecodedPts);
+  ADMImage *in=cache->getByPts(ref,vid->lastDecodedPts);
   if(!in)
   {
     printf("[ADM_Composer::getSamePicture] Failed, while looking for Pts=%" PRIu64" ms\n",vid->lastDecodedPts);
@@ -164,7 +164,7 @@
             continue;
         }
         // Search the lowest PTS above our current PTS...
-        ADMImage *img=cache->getAfter(vid->lastReadPts);
+        ADMImage *img=cache->getAfter(ref,vid->lastReadPts);
         if(img)
         {
             if(time && img->Pts!=ADM_NO_PTS && img->Pts>=time)
@@ -220,6 +220,7 @@
     // PlaceHolder...
     ADMCompressedImage img;
     img.data=compBuffer;
+    img.dataLength=0;
     img.cleanup(vid->lastSentFrame+1);
 
     ADM_assert(cache);
@@ -232,7 +233,6 @@
     drain=vid->decoder->getDrainingState();
     if(!drain)
     {
-        img.dataLength=0;
         if(demuxer->getFrameSize(frame,&(img.dataLength)) && img.dataLength > ADM_COMPRESSED_MAX_DATA_LENGTH)
         {
             ADM_warning("Frame %" PRIu32" length %" PRIu32" exceeds max %" PRIu32", skipping it.\n",
@@ -251,9 +251,9 @@
     }
     // Be prepared for the case that the decoder doesn't output a picture
     // but tells us to repeat the previous one.
-    last=cache->getLast();
+    last=cache->getLast(ref);
     // Now uncompress it...
-    result=cache->getFreeImage();
+    result=cache->getFreeImage(ref);
     if(!result)
     {
         ADM_warning(" Cache full for frame %" PRIu32"\n",frame);
@@ -348,6 +348,10 @@
 {
     ADMImage *tmpImage=NULL;
     _VIDEOS  *v=_segments.getRefVideo(ref);
+    ADM_assert(v);
+    vidHeader *demuxer = v->_aviheader;
+    ADM_assert(demuxer);
+
     bool refOnly=v->decoder->dontcopy(); // can we skip one memcpy ?
     // This is only an empty Shell
     if(refOnly)
@@ -370,7 +374,21 @@
         tmpImage=_imageBuffer;
     }
 
-    tmpImage->_colorspace=ADM_COLOR_YV12;
+    tmpImage->_pixfrmt=ADM_PIXFRMT_YV12;
+
+    aviColorInfo info;
+    demuxer->getColorInfo(&info);
+    if(info.colflags & ADM_COL_FLAG_RANGE_SET)
+        tmpImage->_range = validateColorRange(info.range);
+    if(info.colflags & ADM_COL_FLAG_PRIMARIES_SET)
+        tmpImage->_colorPrim = validateColorPrimaries(info.prim);
+    if(info.colflags & ADM_COL_FLAG_TRANSFER_SET)
+        tmpImage->_colorTrc = validateColorTrC(info.coltc);
+    if(info.colflags & ADM_COL_FLAG_MATRIX_COEFF_SET)
+        tmpImage->_colorSpace = validateColorSpace(info.mcoeff);
+
+    demuxer->getHDRInfo(&tmpImage->_hdrInfo);
+
     // Decode it
     if (!v->decoder->uncompress (in, tmpImage))
     {
@@ -388,37 +406,37 @@
     aprintf("[::Decompress] in:%" PRIu64" out:%" PRIu64" flags:%x\n",in->demuxerPts,out->Pts,out->flags);
     // If not quant and it is already YV12, we can stop here
     // Also, if the image is decoded through hw, dont do post proc
-    if(tmpImage->refType!=ADM_HW_NONE || ((!tmpImage->quant || !tmpImage->_qStride) && tmpImage->_colorspace==ADM_COLOR_YV12))
+    if(tmpImage->refType!=ADM_HW_NONE || ((!tmpImage->quant || !tmpImage->_qStride) && tmpImage->_pixfrmt==ADM_PIXFRMT_YV12))
     {
-        out->_Qp=2;
         out->duplicate(tmpImage);
         aprintf("[decompressImage] : No quant avail\n");
         return true;
     }
     // We got everything, let's go
-    // 1 compute average quant
-    int qz;
-    uint32_t sumit=0;
     // Dupe infos
     out->copyInfo(tmpImage);
-
-
-    // Do postprocessing if any
-    for(uint32_t z=0;z<tmpImage->_qSize;z++)
+    // 1 compute average quant
+    if(tmpImage->_Qp == ADM_IMAGE_UNKNOWN_QP && tmpImage->_qSize)
     {
-        qz=(int)tmpImage->quant[z];
-        sumit+=qz;
+        int qz;
+        uint32_t z, sumit = 0;
+        for(z = 0; z < tmpImage->_qSize; z++)
+        {
+            qz=(int)tmpImage->quant[z];
+            sumit+=qz;
+        }
+        sumit+=(tmpImage->_qSize-1);
+        float sum=(float)sumit;
+        sum/=tmpImage->_qSize;
+        if(sum>31) sum=31;
+        if(sum<1) sum=1;
+        // update average Q
+        tmpImage->_Qp=out->_Qp=(uint32_t)floor(sum);
     }
-    sumit+=(tmpImage->_qSize-1);
-    float sum=(float)sumit;
-    sum/=tmpImage->_qSize;
-    if(sum>31) sum=31;
-    if(sum<1) sum=1;
-
-    // update average Q
-    tmpImage->_Qp=out->_Qp=(uint32_t)floor(sum);
+
+    // Do postprocessing if any
     // Pp deactivated ?
-    if(!_pp->postProcType || !_pp->postProcStrength || tmpImage->_colorspace!=ADM_COLOR_YV12)
+    if(!_pp->postProcType || !_pp->postProcStrength || tmpImage->_pixfrmt!=ADM_PIXFRMT_YV12)
     {
         dupe(tmpImage,out,v);
         aprintf("EdCache: Postproc disabled\n");
@@ -428,7 +446,47 @@
     _pp->process(tmpImage,out);
     return true;
 }
-
+//#define EDITOR_DEBUG_FRAME_TYPE
+#ifdef EDITOR_DEBUG_FRAME_TYPE
+static char *flags2string(uint32_t flags)
+{
+    char frameType[4] = {0};
+    char *p = frameType;
+    switch (flags & AVI_FRAME_TYPE_MASK)
+    {
+        case AVI_KEY_FRAME:
+            *p++ = 'I';
+            break;
+        case AVI_P_FRAME:
+            *p++ = 'P';
+            break;
+        case AVI_B_FRAME:
+        case AVI_B_FRAME + AVI_NON_REF_FRAME:
+            *p++ = 'B';
+            break;
+        default:
+            *p++ = '?';
+            break;
+    }
+    *p++ = '/';
+    switch (flags & AVI_STRUCTURE_TYPE_MASK)
+    {
+        case AVI_FIELD_STRUCTURE + AVI_TOP_FIELD:
+            *p = 'T';
+            break;
+        case AVI_FIELD_STRUCTURE + AVI_BOTTOM_FIELD:
+            *p = 'B';
+            break;
+        case AVI_FRAME_STRUCTURE:
+            *p = 'F';
+            break;
+        default:
+            *p = '?';
+            break;
+    }
+    return ADM_strdup(frameType);
+}
+#endif
 /**
     \fn DecodePictureUpToIntra
     \brief Decode pictures from frameno, which must be an intra and on
@@ -480,7 +538,7 @@
     endOfStream=false;
     // The PTS associated with our frame is the one we are looking for
     uint64_t wantedPts=demuxer->estimatePts(frame);
-    uint32_t tries=15+7; // Max Ref frames for H264 + MaxRecovery , let's say 7 is ok for recovery
+    uint32_t tries = 32 + LAVC_MAX_SAFE_THREAD_COUNT; // Worst case, max ref fields for H.264 + max multi-threading delay
     bool syncFound=false;
     while(found==false && tries--)
     {
@@ -489,8 +547,6 @@
             ADM_warning("End of stream reached\n");
             break;
         }
-        // Last frame ? if so repeat
-        if(vid->lastSentFrame>=nbFrames-1) vid->lastSentFrame=nbFrames-1;
         // Fetch frame
         aprintf("[Editor] Decoding  frame %u\n",vid->lastSentFrame);
         img.dataLength=0;
@@ -505,6 +561,13 @@
             //cache->flush();
             vid->decoder->setDrainingState(true);
         }
+#ifdef EDITOR_DEBUG_FRAME_TYPE
+        {
+            char *z = flags2string(img.flags);
+            printf("[ADM_Composer::DecodePictureUpToIntra] %d tries left, img type: %s\n",tries,z);
+            ADM_dealloc(z);
+        }
+#endif
         if(!vid->decoder->getDrainingState() && !img.dataLength)
         {
             aprintf("Skipping zero-length frame %u\n",vid->lastSentFrame);
@@ -513,7 +576,7 @@
             continue;
         }
         // Now uncompress it...
-        result=cache->getFreeImage();
+        result=cache->getFreeImage(ref);
         if(!result)
         {
             ADM_warning("Cache full for frame %" PRIu32"\n",vid->lastSentFrame);

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edSearch.cpp Changed

@@ -521,4 +521,56 @@
     ADM_info("Cannot find lastKeyFrame with a valid PTS\n");
     return ADM_NO_PTS;
 }
+/**
+ * \fn getFirstFrameInSegmentPts
+ */
+uint64_t ADM_Composer::getFirstFrameInSegmentPts(uint32_t segment)
+{
+    if(segment >= _segments.getNbSegments())
+        return ADM_NO_PTS;
+
+    _SEGMENT *s = _segments.getSegment(segment);
+    ADM_assert(s);
+    _VIDEOS  *v = _segments.getRefVideo(s->_reference);
+    ADM_assert(v);
+    vidHeader *h = v->_aviheader;
+    ADM_assert(h);
+
+    int frame = 0;
+    uint64_t start = s->_refStartTimeUs;
+    if(!getFrameNumFromPtsOrBefore(v,start,frame))
+        return ADM_NO_PTS;
+#define MAX_REF_FRAMES (32) /* 16 max ref frames for H.264 * 2 fields */
+    frame = (frame > MAX_REF_FRAMES)? frame - MAX_REF_FRAMES : 0;
+    int depth = MAX_REF_FRAMES;
+    uint64_t candidate = ADM_NO_PTS;
+    for(int i=frame; i < v->_nb_video_frames; i++)
+    {
+        uint64_t pts,dts;
+        h->getPtsDts(i,&pts,&dts);
+        if(pts == ADM_NO_PTS)
+            continue;
+        if(pts == start) // perfect match
+            return s->_startTimeUs;
+
+        if(pts > start)
+        {
+            if(depth < 0)
+                break;
+            depth--;
+            pts += s->_startTimeUs;
+            pts -= start;
+            if(pts >= s->_startTimeUs + s->_durationUs)
+                continue;
+            if(candidate == ADM_NO_PTS)
+            {
+                candidate = pts;
+                continue;
+            }
+            if(candidate > pts)
+                candidate = pts;
+        }
+    }
+    return candidate;
+}
 //EOF

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edStub.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edVideoCopy.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

@@ -47,6 +47,7 @@
 ADM_Composer::ADM_Composer (void)
 {
   _pp=NULL;
+  _hdrConfig=NULL;
   _imageBuffer=NULL;
   _internalFlags=0;
   _currentSegment=0;
@@ -127,6 +128,8 @@
 
     if(_pp) delete _pp;
     _pp=NULL;
+    if (_hdrConfig) delete _hdrConfig;
+    _hdrConfig=NULL;
    
 
 }
@@ -257,9 +260,14 @@
     *scale=1;
     *rate=MAX_STD_CLOCK_FREQ;
     /* Which segments does the selection span? */
-    uint64_t segTime,start,end;
+    uint64_t segTime,start,end,total;
     start=getMarkerAPts();
     end=getMarkerBPts();
+    total=_segments.getTotalDuration();
+    if(!total)
+        return false;
+    if(end >= total)
+        end = total-1;
     if(start>end)
     {
         uint64_t tmp=end;
@@ -471,8 +479,10 @@
         return ret;
     }
 
+    bool first = !_segments.getNbRefVideos();
+
    /* check for resolution */
-   if( _segments.getNbRefVideos())
+   if(!first)
     {
       /* append operation */
       aviInfo info0, infox;
@@ -531,19 +541,8 @@
   }
   video._aviheader->setMyName (name);
 
-  // Printf some info about extradata
-
-    uint32_t l=0;
-    uint8_t *d=NULL;
-    video._aviheader->getExtraHeaderData(&l,&d);
-    if(l && d)
-    {
-        printf("[Editor]The video codec has some extradata (%d bytes)\n",l);
-        mixDump(d,l);
-    }
-
   // 1st if it is our first video we update postproc
-    if(!_segments.getNbRefVideos())
+    if(first)
     {
         uint32_t type=0,value=0;
         prefs->get(DEFAULT_POSTPROC_TYPE,&type);
@@ -555,6 +554,9 @@
         _pp->postProcStrength=value;
         _pp->forcedQuant=0;
         _pp->update();
+        
+        if (_hdrConfig) delete _hdrConfig;
+        _hdrConfig=new ADMToneMapperConfig(true);
 
         if(_imageBuffer)
         {
@@ -575,7 +577,6 @@
         ADM_vf_clearFilters();
     }
 
-
   // Update audio infos
   // an spawn the appropriate decoder
   //_________________________
@@ -661,13 +662,13 @@
             }
 
             thisVid->audioTracks.push_back(track);
-            if(!_segments.getNbRefVideos()) // 1st video..
+            if(first) // 1st video..
             {
                 ADM_edAudioTrackFromVideo *trackFromVideo=new ADM_edAudioTrackFromVideo(track,i,this);
                 audioTrackPool.addInternalTrack(trackFromVideo);
             }
       }
-      if(!_segments.getNbRefVideos()) // only for 1st video
+      if(first) // only for 1st video
       {
         activeAudioTracks.clear();
         for(int i=0;i<audioTrackPool.size();i++)
@@ -675,10 +676,6 @@
       }
     }
 
-  printf ("[Editor] Decoder FCC: ");
-  fourCC::print (info.fcc);
-  printf("\n");
-
     // ugly hack
     bool fpsTooHigh=false;
     // we switch to 25 fps hardcoded in addReferenceVideo and update info here
@@ -689,7 +686,24 @@
         info.fps1000 = 25 * 1000;
     }
 
-    _segments.addReferenceVideo(&video);
+    if(false == _segments.addReferenceVideo(&video))
+    {
+        ADM_warning("Cannot add video.\n");
+        delete video._aviheader;
+        video._aviheader = NULL;
+        for(uint32_t i = 0; i < video.audioTracks.size(); i++)
+        {
+            ADM_audioStreamTrack *track = video.audioTracks[i];
+            video.audioTracks[i] = NULL;
+            if(track)
+                delete track;
+            track = NULL;
+        }
+        video.audioTracks.clear();
+        if(first)
+            cleanup();
+        return 0;
+    }
 
     if(fpsTooHigh)
         updateVideoInfo(&info);

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

@@ -27,8 +27,11 @@
 #include "ADM_codec.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_vidMisc.h"
+#include "fourcc.h"
 #include "prefs.h"
 
+#define ADM_ZERO_OFFSET
+
 #if 1
 #define aprintf printf
 #else
@@ -37,6 +40,7 @@
 
 ADM_EditorSegment::ADM_EditorSegment(void)
 {
+    _sharedVideoCache = NULL;
 }
 ADM_EditorSegment::~ADM_EditorSegment()
 {
@@ -65,17 +69,36 @@
     ADM_assert(n);
     _VIDEOS *ref=getRefVideo(n-1);
     vidHeader *demuxer=ref->_aviheader;
-    uint64_t pts,dts;
 
-        demuxer->getPtsDts(0,&pts,&dts);
-        if(pts!=ADM_NO_PTS && pts >0)
-        {
-            ADM_warning("Updating firstFramePTS, The first frame has a PTS >0, adjusting to %" PRIu64" ms\n",pts/1000);
-            ref->firstFramePts=pts;
-        }else
+    aviInfo info;
+    demuxer->getVideoInfo(&info);
+    uint32_t frame,flags;
+    bool found = false;
+    for(frame = 0; frame < info.nb_frames; frame++)
+    {
+        demuxer->getFlags(frame,&flags);
+        if(flags & AVI_KEY_FRAME)
         {
-            ADM_info("First PTS is %s\n",ADM_us2plain(pts));
+            found = true;
+            break;
         }
+    }
+    if(!found)
+    {
+        ADM_warning("No frame in ref video %d is marked as keyframe.\n",n-1);
+        return false;
+    }
+
+    uint64_t pts,dts;
+    demuxer->getPtsDts(frame,&pts,&dts);
+    if(pts!=ADM_NO_PTS && pts >0)
+    {
+        ADM_warning("Updating firstFramePTS, The first keyframe has a PTS >0, adjusting to %" PRIu64" ms\n",pts/1000);
+        ref->firstFramePts=pts;
+    }else
+    {
+        ADM_info("First PTS is %s\n",ADM_us2plain(pts));
+    }
 
     //
     n=segments.size();
@@ -83,9 +106,10 @@
     {
     _SEGMENT *seg=getSegment(n-1);
     uint64_t dur=ref->_aviheader->getVideoDuration();
+    seg->_durationUs = dur;
 #ifdef ADM_ZERO_OFFSET
     seg->_refStartTimeUs=pts;
-    seg->_durationUs=dur-pts;
+    seg->_durationUs-=pts;
 #endif
     printf("Current duration %" PRIu64" ms real one %" PRIu64" ms\n",dur/1000,seg->_durationUs/1000);
     }
@@ -98,8 +122,8 @@
 */
 bool        ADM_EditorSegment::addReferenceVideo(_VIDEOS *ref)
 {
-    uint32_t l, cacheSize;
-    uint8_t *d;
+    uint32_t l = 0, cacheSize;
+    uint8_t *d = NULL;
     aviInfo info;
     _SEGMENT seg;
 
@@ -107,6 +131,15 @@
     ref->dontTrustBFramePts=demuxer->unreliableBFramePts();
     demuxer->getVideoInfo (&info);
     demuxer->getExtraHeaderData (&l, &d);
+    printf("[ADM_EditorSegment::addReferenceVideo] Video FCC: ");
+    fourCC::print (info.fcc);
+    printf("\n");
+    // Printf some info about extradata
+    if(l && d)
+    {
+        printf("[ADM_EditorSegment::addReferenceVideo] The video codec has some extradata (%d bytes)\n",l);
+        mixDump(d,l);
+    }
     ref->decoder = ADM_getDecoder (info.fcc, info.width, info.height, l, d, info.bpp);
 
     if(false==prefs->get(FEATURES_CACHE_SIZE,&cacheSize))
@@ -116,7 +149,22 @@
     // For extremely short videos like individual image files, reduce cache size to the bare minimum.
     if(info.nb_frames && info.nb_frames < cacheSize) // should we be paranoid and check the fcc?
         cacheSize = info.nb_frames + 1;
-    ref->_videoCache = new EditorCache(cacheSize,info.width,info.height);
+
+    // Shall we use a shared cache?
+    bool shareCache = false;
+    if(false == prefs->get(FEATURES_SHARED_CACHE,&shareCache))
+        shareCache = false;
+    if(shareCache)
+    {
+        if(!videos.size())
+            _sharedVideoCache = new EditorCache(info.width,info.height);
+        ref->_videoCache = _sharedVideoCache;
+    }else
+    {
+        ref->_videoCache = new EditorCache(info.width,info.height);
+    }
+    ADM_assert(ref->_videoCache)
+    ref->_videoCache->createBuffers(cacheSize);
 
     // discard implausibly high fps, hardcode the value to 25 fps
     if (info.fps1000 > 2000 * 1000)
@@ -134,8 +182,8 @@
     ADM_info("Original frame increment %s = %" PRIu64" us\n",ADM_us2plain(ref->timeIncrementInUs),ref->timeIncrementInUs);
     uint64_t minDelta=100000;
     uint64_t maxDelta=0;
-    uint32_t flags,fmin=0,fmax=0;
-    for (uint32_t frame=0; frame<info.nb_frames; frame++)
+    uint32_t frame,flags,fmin=0,fmax=0;
+    for(frame = 0; frame < info.nb_frames; frame++)
     {
         if(!ref->fieldEncoded)
         {
@@ -197,8 +245,27 @@
     seg._durationUs=demuxer->getVideoDuration();
 
     // Set the default startTime to the pts of first Pic
-    demuxer->getFlags(0,&flags);
-    demuxer->getPtsDts(0,&pts,&dts);
+    bool found = false;
+    for(frame = 0; frame < info.nb_frames; frame++)
+    {
+        demuxer->getFlags(frame,&flags);
+        if(flags & AVI_KEY_FRAME)
+        {
+            found = true;
+            break;
+        }
+    }
+    if(!found)
+    {
+        ADM_warning("Reached the end of ref video while searching for the first keyframe.\n");
+        if(!videos.size() && (ref->_videoCache != _sharedVideoCache))
+            delete ref->_videoCache;
+        ref->_videoCache = NULL;
+        if(ref->decoder) delete ref->decoder;
+        ref->decoder = NULL;
+        return false;
+    }
+    demuxer->getPtsDts(frame,&pts,&dts);
     ref->firstFramePts=0;
     if(pts==ADM_NO_PTS) ADM_warning("First frame has unknown PTS\n");
     if(dts==ADM_NO_PTS) ADM_warning("The first frame DTS is not set\n");
@@ -248,54 +315,53 @@
 */
 bool ADM_EditorSegment::deleteAll (void)
 {
-  ADM_info("[Editor] Deleting all videos\n");
-  int n=videos.size();
-  for (uint32_t vid = 0; vid < n; vid++)
+    ADM_info("[Editor] Deleting all videos\n");
+    // Delete cache 1st, might contain refs to decoder etc..
+    if(_sharedVideoCache)
+        delete _sharedVideoCache;
+    for (uint32_t vid = 0; vid < videos.size(); vid++)
     {
         _VIDEOS *v=&(videos[vid]);
-        // Delete cache 1st, might contain refs to decoder etc..
-      if(v->_videoCache)
-      	delete  v->_videoCache;
-      // if there is a video decoder...
-      if (v->decoder)
+        if(v->_videoCache && v->_videoCache != _sharedVideoCache) // per-video cache
+            delete v->_videoCache;
+        // if there is a video decoder...
+        if (v->decoder)
             delete v->decoder;
-      if(v->color)
+        if(v->color)
             delete v->color;
-      if(v->_aviheader)
-      {
-          v->_aviheader->close ();
-          delete v->_aviheader;
-      }
-      if(v->infoCache)
-          delete [] v->infoCache;
-      if(v->paramCache)
-          delete [] v->paramCache;
-      v->_videoCache=NULL;
-      v->color=NULL;
-      v->decoder=NULL;
-      v->_aviheader=NULL;
-      v->infoCache=NULL;
-      v->paramCache=NULL;
-     // Delete audio codec too
-     // audioStream will be deleted by the demuxer
+        if(v->_aviheader)
+        {
+            v->_aviheader->close ();
+            delete v->_aviheader;
+        }
+        if(v->infoCache)
+            delete [] v->infoCache;
+        if(v->paramCache)
+            delete [] v->paramCache;
+        v->_videoCache=NULL;
+        v->color=NULL;
+        v->decoder=NULL;
+        v->_aviheader=NULL;
+        v->infoCache=NULL;
+        v->paramCache=NULL;
+        // Delete audio codec too
+        // audioStream will be deleted by the demuxer
 
 
-            int nb=v->audioTracks.size();
-            for(int i=0;i<nb;i++)
-            {
+        int nb=v->audioTracks.size();
+        for(int i=0;i<nb;i++)
+        {
 
-                ADM_audioStreamTrack *t=v->audioTracks[i];
-                v->audioTracks[i]=NULL;
+            ADM_audioStreamTrack *t=v->audioTracks[i];
+            v->audioTracks[i]=NULL;
 #if 1 // Deleted elsewhere ?
-                if(t)
-                    delete t;
+            if(t)
+                delete t;
 #endif
-            }
-            v->audioTracks.clear();
-
-
+        }
+        v->audioTracks.clear();
     }
-
+    _sharedVideoCache = NULL;
     clipboard.clear();
     videos.clear();
     segments.clear();
@@ -408,40 +474,105 @@
 {
     int n=segments.size();
     if(!n) return true;
-    
-    uint64_t t=0;
-    for(int i=0;i<n;i++)
-    {
-        segments[i]._startTimeUs=t;
-        t+=segments[i]._durationUs;
-    }
-    // Now set the _refStartDts field
+
+    uint64_t cumulated = 0;
+
     for(int i=0;i<n;i++)
     {
         _VIDEOS *vid=getRefVideo(segments[i]._reference);
         _SEGMENT *seg=getSegment(i);
         vidHeader *demuxer=vid->_aviheader;
 
+        aviInfo info;
+        demuxer->getVideoInfo(&info);
 
         uint64_t pts,dts;
-        pts=seg->_refStartTimeUs;
+        const uint64_t compare = pts = seg->_refStartDts = seg->_refStartTimeUs;
+        // Skip to the first keyframe
+        uint32_t frame,flags;
+        bool found = false;
+        for(frame = 0; frame < info.nb_frames; frame++)
+        {
+            demuxer->getFlags(frame,&flags);
+            if(flags & AVI_KEY_FRAME)
+            {
+                found = true;
+                break;
+            }
+        }
+        if(!found)
+        {
+            ADM_error("No frame in ref %u is flagged as keyframe, crashing.\n",segments[i]._reference);
+            ADM_assert(0);
+        }
         // Special case : If pts=0 it might mean beginning of seg i, but the PTS might be not 0
         // in such a case the DTS is wrong
-        if(!pts)
+        uint64_t pts2,dts2,start = pts;
+        // We need to ensure that start time in ref matches a frame exactly
+        int depth = 32; // H.264 max ref frames * 2 fields
+        uint64_t candidate = ADM_NO_PTS;
+        for(uint32_t i = frame; i < info.nb_frames; i++)
         {
-            uint64_t pts2,dts2;
-            demuxer->getPtsDts(0,&pts2,&dts2);
-            if(pts2 && pts2!=ADM_NO_PTS)
+            demuxer->getPtsDts(i,&pts2,&dts2);
+            if(pts2 == ADM_NO_PTS)
+                continue;
+            if(i == frame)
             {
-                ADM_info("Using pts2=%s to get dts, as this video does not start at zero\n",ADM_us2plain(pts2));
-                pts=pts2;
+                start = pts2;
+                if(pts < start)
+                {
+                    pts = start;
+                    break;
+                }
             }
-
+            if(pts2 < start)
+                continue;
+            if(pts2 == pts)
+            {
+                candidate = ADM_NO_PTS;
+                break;
+            }
+            if(pts2 > pts)
+            {
+                if(candidate == ADM_NO_PTS)
+                {
+                    candidate = pts2;
+                    continue;
+                }
+                if(pts2 < candidate)
+                    candidate = pts2;
+                if(depth-- < 0) break;
+            }
+        }
+        if(candidate != ADM_NO_PTS)
+            pts = candidate;
+#ifdef ADM_ZERO_OFFSET
+        if(pts != compare)
+        {
+            char *old = ADM_strdup(ADM_us2plain(compare));
+            ADM_warning("Updating start time in ref from %s to %s\n",old,ADM_us2plain(pts));
+            ADM_dealloc(old);
+            // adjust duration
+            uint64_t delta = (pts > compare)? pts - compare : compare - pts;
+            if(pts > compare)
+                seg->_durationUs = (seg->_durationUs > delta)? seg->_durationUs - delta : 0;
+            else
+                seg->_durationUs += delta;
+        }
+        // adjust start time in ref
+        seg->_refStartTimeUs = pts;
+#endif
+        // set linear start time
+        seg->_startTimeUs = cumulated;
+        cumulated += seg->_durationUs;
+        // set the _refStartDts field
+        if(dtsFromPts(seg->_reference,pts,&dts))
+        {
+            ADM_info("Setting DTS start in ref to %s\n",ADM_us2plain(dts));
+            seg->_refStartDts = dts;
         }
-        dtsFromPts(seg->_reference,pts,&dts);
-        seg->_refStartDts=dts;
     }
-
+    ADM_info("New total duration = %s\n",ADM_us2plain(cumulated));
     return true;
 }
 /**
@@ -529,6 +660,7 @@
             return true;
         }
     }
+#if 0 /* time matching the total duration doesn't belong to a segment */
     int max=segments.size();
     if(max)
     {
@@ -541,6 +673,7 @@
             return true;
         }
     }
+#endif
     ADM_warning("Cannot find segment matching time %" PRIu64"ms \n",frameTime/1000);
     dump();
     return false;
@@ -672,6 +805,7 @@
         segments.erase(segments.begin()+startSeg+1);
     }
     removeEmptySegments();
+    mergeContinuousSegments();
     updateStartTime();
     if(isEmpty())
     {
@@ -721,6 +855,7 @@
         segments.erase(segments.begin()+startSeg+1);
     }
     removeEmptySegments();
+    mergeContinuousSegments();
     updateStartTime();
     if(isEmpty())
     {
@@ -877,6 +1012,44 @@
     return true;
 }
 /**
+    \fn mergeContinuousSegments
+    \brief Merge adjacent segments representing the same continuous video stream.
+*/
+bool ADM_EditorSegment::mergeContinuousSegments(void)
+{
+    uint32_t refIndex;
+    uint64_t refStart;
+    uint64_t segmentDuration;
+    bool res = false;
+    int i = 0;
+
+    while(i < getNbSegments())
+    {
+        _SEGMENT *seg = getSegment(i);
+        ADM_assert(seg);
+        bool erase = false;
+        if(i && refIndex == seg->_reference && refStart + segmentDuration == seg->_refStartTimeUs)
+        {
+            _SEGMENT *prevSeg = getSegment(i-1);
+            ADM_assert(prevSeg);
+            prevSeg->_durationUs += seg->_durationUs;
+            erase = true;
+            res = true;
+        }
+        refIndex = seg->_reference;
+        refStart = seg->_refStartTimeUs;
+        segmentDuration = seg->_durationUs;
+        if(erase)
+        {
+            ADM_info("Merging continuous segments %d and %d out of %d\n",i-1,i,getNbSegments());
+            segments.erase(segments.begin() + i);
+            continue; // we do not increment the index
+        }
+        i++;
+    }
+    return res;
+}
+/**
  * \fn isEmpty
  * @return 
  */
@@ -1017,6 +1190,7 @@
     // If a video doesn't start at zero and we paste to its first frame,
     // we end up with an empty segment at the beginning. Remove it.
     removeEmptySegments();
+    mergeContinuousSegments();
     updateStartTime();
     dump();
     return true;
@@ -1035,8 +1209,8 @@
         return true;
     }
     ADM_info("Appending from clipboard\n");
-    ListOfSegments tmp=segments;
     for(int i=0;i<clipboard.size();i++) segments.push_back(clipboard[i]);
+    mergeContinuousSegments();
     updateStartTime();
     dump();
     return true;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPacket.cpp Changed

@@ -79,6 +79,14 @@
             codec=trk->codec;
     if(codec)
     {
+#if 1
+        /* If the codec requires extradata and codec parameters have changed,
+        we would need to respawn the decoder. However, doing so while unable to
+        handle on-the-fly changes means we cannot resume normal playback after
+        switch to the original channel layout present at the start of playback
+        prior to segment switch. FIXME */
+        codec->resetAfterSeek();
+#else
         /* If the codec requires extradata, we need to respawn the decoder
         to deal with a chance that codec parameters have changed. */
         uint32_t eLen=0;
@@ -97,6 +105,7 @@
         }
         if(trk->codec)
             trk->codec->resetAfterSeek();
+#endif
     }
     ADM_info("Switched ok to audio segment %" PRIu32", with a ref time=%s\n",
             _audioSeg,ADM_us2plain(seg->_refStartTimeUs));
@@ -109,6 +118,9 @@
 */
 bool ADM_edAudioTrackFromVideo::refillPacketBuffer(void)
 {
+    if(_audioSeg >= parent->_segments.getNbSegments())
+        return false;
+
     packetBufferSize=0;
     uint64_t dts;
     _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
@@ -154,7 +166,9 @@
 */
 uint8_t ADM_edAudioTrackFromVideo::getPacket(uint8_t  *dest, uint32_t *len,uint32_t sizeMax, uint32_t *samples,uint64_t *odts)
 {
-zgain:        
+    if(_audioSeg >= parent->_segments.getNbSegments())
+        return 0;
+zgain:
     _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
     ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
     if(!trk) return 0;
@@ -311,7 +325,11 @@
 */
 WAVHeader       *ADM_edAudioTrackFromVideo::getInfo(void)
 {
-
+    if(_audioSeg >= parent->_segments.getNbSegments())
+    {
+        ADM_error("Audio segment %u out of range!\n",_audioSeg);
+        return NULL;
+    }
     _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
     ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
     if(!trk) // this segment has no audio, try to get info from another one
@@ -328,8 +346,13 @@
 */
  CHANNEL_TYPE    *ADM_edAudioTrackFromVideo::getChannelMapping(void )
 {
-  _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
-  ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
+    if(_audioSeg >= parent->_segments.getNbSegments())
+    {
+        ADM_error("Audio segment %u out of range!\n",_audioSeg);
+        return NULL;
+    }
+    _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
+    ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
     if(!trk) return NULL;
     return trk->codec->channelMapping;
 }
@@ -338,8 +361,13 @@
 */
 bool            ADM_edAudioTrackFromVideo::getExtraData(uint32_t *l, uint8_t **d)
 {
-  _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
-  ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
+    if(_audioSeg >= parent->_segments.getNbSegments())
+    {
+        ADM_error("Audio segment %u out of range!\n",_audioSeg);
+        return false;
+    }
+    _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
+    ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
 
     *l=0;
     *d=NULL;
@@ -366,6 +394,11 @@
 */
 ADM_audioStreamTrack *ADM_edAudioTrackFromVideo::getCurrentTrack()
 {
+    if(_audioSeg >= parent->_segments.getNbSegments())
+    {
+        ADM_error("Audio segment %u out of range!\n",_audioSeg);
+        return NULL;
+    }
     _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
     if(!seg) return NULL;
     _VIDEOS *v=parent->_segments.getRefVideo(seg->_reference);
@@ -380,6 +413,11 @@
 */
 bool ADM_edAudioTrackFromVideo::updateHeader(void)
 {
+    if(_audioSeg >= parent->_segments.getNbSegments())
+    {
+        ADM_error("Audio segment %u out of range!\n",_audioSeg);
+        return false;
+    }
     _SEGMENT *seg=parent->_segments.getSegment(_audioSeg);
     ADM_audioStreamTrack *trk=getTrackAtVideoNumber(seg->_reference);
     if(!trk) return false;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackFromVideo.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCache.cpp Changed

@@ -29,17 +29,19 @@
     \fn EditorCache
     \brief Constructor
 */
-
-EditorCache::EditorCache(uint32_t size,uint32_t w, uint32_t h)
+EditorCache::EditorCache(uint32_t w, uint32_t h)
 {
-    _elem=new cacheElem[size];
-    for(uint32_t i=0;i<size;i++)
+    readIndex = writeIndex = 0;
+    commonWidth = w;
+    commonHeight = h;
+    for(uint32_t i=0; i < EDITOR_CACHE_MAX_SIZE; i++)
     {
-        _elem[i].image=new ADMImageDefault(w,h);
-        _elem[i].pts=ADM_NO_PTS;
+        _elem[i].image = NULL;
+        _elem[i].pts = ADM_NO_PTS;
+        _elem[i].ref = -1;
     }
-    _nbImage=size;
-    ADM_info("Video cache created for %u decoded images.\n",_nbImage);
+    _nbImage = 0;
+    ADM_info("Video cache instance created at %p\n",this);
 }
 /**
     \fn EditorCache
@@ -51,10 +53,25 @@
     {
         delete _elem[i].image;
     }
-    delete[] _elem;
 }
+
 /**
+    \fn createBuffers
+*/
+bool EditorCache::createBuffers(uint32_t size)
+{
+    int added = 0;
+    while(_nbImage < size)
+    {
+        _elem[_nbImage++].image = new ADMImageDefault(commonWidth,commonHeight);
+        added++;
+    }
+    ADM_info("Added %d video cache buffers, %u total.\n",added,_nbImage);
+    return true;
+}
 
+/**
+    \fn check
 */
 void EditorCache::check()
 {
@@ -79,7 +96,7 @@
                 the cache is big enough to be immune
                 to reuse in the same go
 */
-ADMImage *EditorCache::getFreeImage(void)
+ADMImage *EditorCache::getFreeImage(int vid)
 {
     int found=-1;
     check();
@@ -97,9 +114,11 @@
     
     // Mark it as used
     if(found==-1) ADM_assert(0);
-    _elem[found].pts=ADM_NO_PTS;;
+    _elem[found].pts=ADM_NO_PTS;
+    _elem[found].image->hwDecRefCount(); // ??
     writeIndex++;
     aprintf("Using free image at index %d\n",found);
+    _elem[found].ref = vid;
     return _elem[found].image;
 
 }
@@ -114,6 +133,7 @@
     for(int i=0;i<_nbImage;i++)
     {
         _elem[i].pts=ADM_NO_PTS;
+        _elem[i].ref = -1;
         _elem[i].image->hwDecRefCount();
     }
     writeIndex=readIndex=0;
@@ -173,7 +193,7 @@
         {
             case ADM_NO_PTS:  printf("Not used %02d\n",i);break;
             default:
-                printf("Edcache content[%02d]: PTS : %s %" PRIu64" ms\n",i,
+                printf("Edcache content[%02d]: ref: %d, PTS : %s %" PRIu64" ms\n",i,e->ref,
                                                                     ADM_us2plain(e->image->Pts),e->image->Pts/1000);
                 break;
         }
@@ -184,35 +204,36 @@
     \brief Find the image with the closest PTS just above pts.
 
 */
-ADMImage    *EditorCache::getAfter(uint64_t pts)
+ADMImage    *EditorCache::getAfter(int vid, uint64_t pts)
 {
     if(!writeIndex) return NULL;
     for(uint32_t i=readIndex;i<writeIndex-1;i++)
     {
         int index=i%_nbImage;
         ADM_assert(_elem[index].pts!=ADM_NO_PTS);
-        if(_elem[index].pts==pts)
+        if(_elem[index].pts == pts && _elem[index].ref == vid)
         {
             index++;
             index%=_nbImage;
             ADMImage *candidate=_elem[index].image;
-            if(candidate->Pts<=pts)
+            if(_elem[index].ref == vid)
             {
+                if(candidate->Pts>pts)
+                    return candidate;
+
                 ADM_error("The next frame has a PTS <= the one we started from. We got timing %s\n", ADM_us2plain(candidate->Pts));
                 ADM_error("We are looking for the one after %s\n",ADM_us2plain(pts));
-                // in that case try to find a the next valid one
+                // in that case try to find the next valid one
                 for(int k=i+2;k<writeIndex-1;k++)
                 {
                     int otherIndex=k%_nbImage;
-                    if(_elem[otherIndex].pts>pts)
-                      {
+                    if(_elem[otherIndex].pts > pts && _elem[otherIndex].ref == vid)
                         return _elem[otherIndex].image;
-                      }
+
                     ADM_error("Cannot find a second valid candidate after bad timing\n");
                     dump();
                 }
-            }else
-                return candidate;
+            }
         }
     }
     aADM_warning("Cannot find image after %" PRIu64" ms in cache\n",pts/1000);
@@ -223,18 +244,19 @@
     \brief Find the image with the closest PTS just above pts.
 
 */
-ADMImage    *EditorCache::getBefore(uint64_t pts)
+ADMImage    *EditorCache::getBefore(int vid, uint64_t pts)
 {
     for(int i=readIndex+1;i<writeIndex;i++)
     {
         int index=i%_nbImage;
         ADM_assert(_elem[index].pts!=ADM_NO_PTS);
-        if(_elem[index].pts==pts)
+        if(_elem[index].pts==pts && _elem[index].ref == vid)
         {
             index+=_nbImage-1;
             index%=_nbImage;
             printf("GetBefore : Looking for %" PRIu64" ms get %" PRIu64" ms\n",pts/1000,_elem[index].image->Pts/1000);
-            return _elem[index].image;
+            if(_elem[index].ref == vid)
+                return _elem[index].image;
         }
     }
     aADM_warning("Cannot find image before %" PRIu64" ms in cache\n",pts/1000);
@@ -245,15 +267,13 @@
     \fn getByPts
     \brief returns the image that has exactly that PTS
 */
-ADMImage *EditorCache::getByPts(uint64_t Pts)
+ADMImage *EditorCache::getByPts(int vid, uint64_t Pts)
 {
     for(int i=readIndex;i<writeIndex;i++)
     {
         int index=i%_nbImage;
-        if(_elem[index].image->Pts==Pts)
-        {
+        if(_elem[index].image->Pts==Pts && _elem[index].ref == vid)
             return _elem[index].image;
-        }
     }
     return NULL;
 }
@@ -261,10 +281,12 @@
     \fn getLast
     \brief Return the most recent image from cache
 */
-ADMImage *EditorCache::getLast(void)
+ADMImage *EditorCache::getLast(int vid)
 {
     if(readIndex==writeIndex) return NULL;
     int index=(writeIndex-1)%_nbImage;
-    return _elem[index].image;
+    if(_elem[index].ref == vid)
+        return _elem[index].image;
+    return NULL;
 }
 // EOF

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp Changed

@@ -14,7 +14,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <algorithm> 
+#include <algorithm>
+#include <map>
 #include "ADM_cpp.h"
 #include "ADM_default.h"
 #include "A_functions.h"
@@ -129,31 +130,35 @@
             vid->dontTrustBFramePts=true;
         }else
         {
-            std::vector<uint64_t> ListOfDts; // future PTS values
-            std::vector<uint64_t> ListOfPts; // identify the frame for a PTS from above
             goToTimeVideo(from);
             vid->lastSentFrame=0;
-            uint64_t bfdelay=2*inc; // FIXME B-frame delay
+
+            if(false == ADM_verifyDts(hdr,inc))
+                return false;
+            if(false == setPtsEqualDts(hdr,inc))
+                return false;
+
+            std::map<uint64_t,uint32_t> timing;
+            std::vector<uint64_t> ListOfPts,ListOfDts;
+
             for(int i=0;i<totalFrames;i++)
             {
                 uint64_t pts,dts;
                 hdr->getPtsDts(i,&pts,&dts);
-                if(dts==ADM_NO_PTS)
-                {
-                    if(!i)
-                        dts=0;
-                    else
-                    {
-                        hdr->getPtsDts(i-1,&pts,&dts);
-                        dts+=inc;
-                    }
-                }
-                pts=dts;
-                hdr->setPtsDts(i,pts,dts);
+                timing.insert({dts,i});
             }
 
+            EditorCache *cache = vid->_videoCache;
+            ADM_assert(cache);
+            cache->flush();
+
+            bool interlaced = false; // when true and less than ~ 2/3 of frames produce pics => field-encoded
+            uint64_t bfdelay = 0;
+            std::map<uint64_t,uint32_t>::iterator it = timing.begin();
+
             DIA_workingBase *decoding=createWorking(QT_TRANSLATE_NOOP("ADM_Composer","Decoding video..."));
-            for(int i=0;i<totalFrames;i++)
+
+            while(!vid->decoder->endOfStreamReached())
             {
                 if(false==decoding->isAlive())
                 {
@@ -162,91 +167,138 @@
                     delete decoding;
                     return true;
                 }
-                decoding->update(i,totalFrames);
+                decoding->update(vid->lastSentFrame,totalFrames);
 
-                EditorCache *cache;
-                uint64_t pts,dts;
-                hdr->getPtsDts(i,&pts,&dts);
-                ListOfDts.push_back(dts);
-                //printf("adding %" PRIu64" ms to the list of DTS\n",dts/1000);
-
-                cache=vid->_videoCache;
                 ADMCompressedImage img;
-
-                img.data=compBuffer;
+                img.data = compBuffer;
                 img.cleanup(vid->lastSentFrame);
+                img.dataLength = 0;
 
-                uint32_t frame=vid->lastSentFrame;
-                vid->lastSentFrame++;
-                if(!hdr->getFrame(frame,&img))
+                if(!vid->decoder->getDrainingState())
                 {
-                    ADM_warning("getFrame failed for frame %" PRIu32"\n",frame);
-                    break;
+                    if(!hdr->getFrame(vid->lastSentFrame,&img))
+                    {
+                        ADM_warning("getFrame failed for frame %" PRIu32"\n",vid->lastSentFrame);
+                        img.dataLength = 0;
+                        vid->decoder->setDrainingState(true);
+                    }else
+                    {
+                        vid->lastSentFrame++;
+                    }
                 }
 
-                ADMImage *pic;
-                pic=cache->getFreeImage();
-                if(!decompressImage(pic,&img,seg->_reference))
+                ADMImage *pic = cache->getFreeImage(seg->_reference);
+                if(!pic)
                 {
-                    ADM_info("Decoding error for frame %" PRIu32"\n",frame);
+                    ADM_warning("Cannot find free image in cache, aborting PTS reconstruction.\n");
+                    rewind();
+                    delete decoding;
+                    return false;
                 }
-                if(dts!=ADM_NO_PTS && dts>vid->lastDecodedPts)
-                    vid->lastDecodedPts=dts;
-                pts=pic->Pts; // used only to match the decoded frame to its source
-                if(pts==ADM_NO_PTS)
-                    pts=vid->lastDecodedPts;
-                cache->invalidate(pic);
-                //printf("adding PTS %" PRIu64" ms to the list of reordered PTS\n",pts/1000);
-                ListOfPts.push_back(pts);
-            }
-            delete decoding;
-
-            uint32_t size=ListOfPts.size();
-            if(ListOfDts.size()<size)
-                size=ListOfDts.size();
-            for(uint32_t i=0; i<size; i++)
-            { // look up a nearby frame with matching DTS
-                uint64_t pts,dts;
-                int match=-1;
-                uint32_t lower=0;
-                if(i>16)
-                    lower=i-16;
-                uint32_t upper=size;
-                if(size-i>16)
-                    upper=i+16;
-                for(uint32_t j=lower;j<upper;j++)
+                if(false == decompressImage(pic,&img,seg->_reference))
                 {
-                    hdr->getPtsDts(j,&pts,&dts);
-                    if(dts==ADM_NO_PTS)
+                    if(vid->decoder->keepFeeding())
                     {
-                        //printf("skipping frame %d\n",(int)j);
+                        //printf("[checkForValidPts] No pic for frame %u yet.\n",vid->lastSentFrame);
                         continue;
                     }
-                    if(dts==ListOfPts.at(i))
+                    if(vid->decoder->endOfStreamReached())
                     {
-                        match=j; // found the frame
-                        //printf("frame %d matches %d, dts=%" PRIu64" ms\n",(int)i,match,dts/1000);
+                        //printf("[checkForValidPts] End of stream\n");
                         break;
                     }
+                    ADM_warning("Decoding error for frame %d\n",vid->lastSentFrame);
+                    continue;
+                }
+                if(pic->Pts == ADM_NO_PTS)
+                {
+                    //printf("[checkForValidPts] No PTS out of decoder, last frame: %d\n",vid->lastSentFrame);
+                    cache->invalidate(pic);
+                    continue;
                 }
-                if(match==-1)
+                uint64_t pts = pic->Pts; // used only to match the decoded frame to its source
+                if(pic->flags & AVI_FIELD_STRUCTURE)
+                    interlaced = true;
+                cache->invalidate(pic);
+
+                ListOfPts.push_back(pts);
+                ListOfDts.push_back(pts);
+            }
+            delete decoding;
+            decoding = NULL;
+
+            // invalidate pts in the index
+            it = timing.begin();
+            hdr->setPtsDts(0,0,it->first);
+            it++;
+            for(int i=1;i<totalFrames;i++)
+            {
+                if(it == timing.end())
+                    break;
+                hdr->setPtsDts(i,ADM_NO_PTS,it->first);
+                it++;
+            }
+            // now set pts for all frames which produced output
+            std::sort(ListOfDts.begin(),ListOfDts.end());
+            int nbValid = ListOfDts.size();
+            //printf("[checkForValidPts] We have %d pics out of %d frames.\n",nbValid,totalFrames);
+            if(interlaced && nbValid < totalFrames*2/3) // arbitrary threshold
+            {
+                ADM_info("Video seems to be field-encoded.\n");
+                vid->fieldEncoded = true;
+                inc *= 2;
+            }
+            {
+            int frame = 0;
+            for(std::vector<uint64_t>::iterator t = ListOfPts.begin(); t != ListOfPts.end(); t++)
+            {
+                if(frame >= nbValid)
+                    break;
+                it = timing.find(*t);
+                if(it == timing.end())
                 {
-                    ADM_warning("No match for PTS %" PRIu64" ms\n",ListOfPts.at(i)/1000);
+                    ADM_warning("Timestamp %s not found!\n",ADM_us2plain(*t));
                     continue;
                 }
-                hdr->getPtsDts(match,&pts,&dts);
-                pts=ListOfDts.at(i);
-                hdr->setPtsDts(match,pts,dts);
+                uint64_t pts = ListOfDts.at(frame);
+                uint64_t dts = it->first;
+                // calculate B-frame delay
+                if(pts != ADM_NO_PTS && dts != ADM_NO_PTS && dts > pts && bfdelay < dts-pts)
+                    bfdelay = dts-pts;
+#if 0
+                printf("adding entry %d for frame %u with PTS %s ",frame,it->second,ADM_us2plain(pts));
+                printf("DTS %s\n",ADM_us2plain(dts));
+#endif
+                hdr->setPtsDts(it->second,pts,dts);
+                frame++;
+            }
             }
 
+            ADM_info("B-frame delay set to %" PRIu64" ms\n",bfdelay/1000);
+
+            uint64_t maxPts = ADM_NO_PTS;
             for(int i=0;i<totalFrames;i++)
             { // add B-frame delay
                 uint64_t pts,dts;
                 hdr->getPtsDts(i,&pts,&dts);
-                if(pts!=ADM_NO_PTS)
-                    pts+=bfdelay;
+                if(pts == ADM_NO_PTS)
+                    continue;
+                pts += bfdelay;
+                if(maxPts == ADM_NO_PTS || maxPts < pts)
+                    maxPts = pts;
                 hdr->setPtsDts(i,pts,dts);
             }
+            // update segment duration
+            if(maxPts != ADM_NO_PTS)
+            {
+                maxPts += inc;
+                if(maxPts > seg->_durationUs)
+                {
+                    printf("[checkForValidPts] Increasing segment duration from %s \n",ADM_us2plain(seg->_durationUs));
+                    printf("to %s\n",ADM_us2plain(maxPts));
+                    seg->_durationUs = maxPts;
+                }
+            }
 
             _segments.updateRefVideo();

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edMarker.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edMarker.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edScriptGenerator.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_editIface.cpp Changed

@@ -16,34 +16,30 @@
  ***************************************************************************/
 #include "ADM_cpp.h"
 #include "ADM_default.h"
-#include "A_functions.h"
-#include "ADM_audioFilterInterface.h"
-#include "audioEncoderApi.h"
-#include "ADM_muxerProto.h"
-#include "GUI_ui.h"
-#include "avi_vars.h"
-
-#include <fcntl.h>
-#include <errno.h>
 
 #include "fourcc.h"
 #include "ADM_edit.hxx"
 #include "ADM_edAudioTrackFromVideo.h"
-#include "DIA_coreToolkit.h"
-#include "prefs.h"
-
+#include "ADM_edAudioTrackExternal.h"
 
-//#include "ADM_outputfmt.h"
-#include "ADM_edPtsDts.h"
-#include "ADM_vidMisc.h"
 #include "ADM_confCouple.h"
+
+#include "ADM_filterCategory.h"
+#include "ADM_coreVideoFilterFunc.h"
 #include "ADM_videoFilters.h"
-#include "ADM_videoEncoderApi.h"
 #include "ADM_videoFilterApi.h"
+
+#include "ADM_audioFilterInterface.h"
+
+#include "ADM_videoEncoderApi.h"
+#include "audioEncoderApi.h"
+
+#include "ADM_muxerProto.h"
+
+#include "A_functions.h"
+#include "GUI_ui.h"
+#include "avi_vars.h"
 #include "ADM_preview.h"
-#include "ADM_edAudioTrackExternal.h"
-#include "ADM_coreVideoFilterFunc.h"
-#include "ADM_coreVideoFilterFunc.h"
 
 #include "gtkgui.h"
 #include "prototype.h"
@@ -146,18 +142,41 @@
 }
 int ADM_Composer::addVideoFilter(const char *filter, CONFcouple *c)
 {
-	uint32_t filterTag = ADM_vf_getTagFromInternalName(filter);
+    uint32_t filterTag = ADM_vf_getTagFromInternalName(filter);
+
+    std::string name = filter;
+
+    if (filterTag == VF_INVALID_FILTER)
+    {
+        if (false == ADM_vf_findCompatibleFilter(name, &c))
+        {
+            delete c;
+            c = NULL;
+            return 0;
+        }
+        // retry
+        filterTag = ADM_vf_getTagFromInternalName(name.c_str());
+        if (filterTag == VF_INVALID_FILTER)
+        {
+            ADM_warning("Cannot get valid tag for \"%s\".\n", name.c_str());
+            delete c;
+            c = NULL;
+            return 0;
+        }
+    }
+    ADM_info("Internal filter name \"%s\" matched to tag %" PRIu32"\n", name.c_str(), filterTag);
 
-	printf("Adding Filter %s -> %" PRIu32"... \n", filter, filterTag);
+    bool r = (ADM_vf_addFilterFromTag(this, filterTag, c, false) != NULL);
 
-	bool r = (ADM_vf_addFilterFromTag(this, filterTag, c, false) != NULL);
+    delete c;
+    c = NULL;
 
-	if (c)
-	{
-		delete c;
-	}
+    if (r)
+        ADM_info("Filter \"%s\" added.\n", name.c_str());
+    else
+        ADM_warning("Cannot add filter \"%s\".\n", name.c_str());
 
-	return r;
+    return r;
 }
 
 char *ADM_Composer::getVideoCodec(void)

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-artistic.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-colors.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-interlacing.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-misc.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-noise.png Added

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-opengl.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-sharpness.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-subtitles.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-transform.png Changed

avidemux_2.8.0.tar.gz/avidemux/common/ADM_icons/videoFilter/filter-category-transition.png Added

avidemux_2.7.8.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopy.cpp Changed

@@ -34,22 +34,24 @@
 ADM_videoStreamCopy::ADM_videoStreamCopy(uint64_t startTime,uint64_t endTime)
 {
     aviInfo info;
+    aviColorInfo cfo;
     uint64_t ptsStart=startTime+1;
     uint64_t dtsStart;
     ADM_info("Creating copy video stream, start time: %s\n",ADM_us2plain(startTime));
     ADM_info("End time: %s\n",ADM_us2plain(endTime));
-    video_body->getVideoInfo(&info);
+    video_body->getVideoInfo(&info, &cfo);
     width=info.width;
     height=info.height;
     fourCC=info.fcc;
     averageFps1000=info.fps1000;
-    if(info.colflags)
+
+    if(cfo.colflags)
     {
         colorInfoPresent = true;
-        colorRange = info.range;
-        colorPrimaries = info.prim;
-        colorTransferCharacteristic = info.coltc;
-        colorMatrixCoefficients = info.mcoeff;
+        colorRange = cfo.range;
+        colorPrimaries = cfo.prim;
+        colorTransferCharacteristic = cfo.coltc;
+        colorMatrixCoefficients = cfo.mcoeff;
     }
     video_body->getTimeBase(&timeBaseNum,&timeBaseDen,true);
     frameIncrement=video_body->getFrameIncrement(true);
@@ -186,7 +188,7 @@
               }
 
           }
-        if(image.demuxerPts>endTimePts ) 
+        if(image.demuxerPts >= endTimePts)
         {
             eofMet=true;
             return false;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_preview.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_preview.cpp Changed

@@ -96,12 +96,20 @@
   {
         uint32_t phyW,phyH;
         UI_getMaximumPreviewSize(&phyW, &phyH);
-        if(phyW*2 < w || phyH*2 < h)
+        /*if(phyW*2 < w || phyH*2 < h)
             nzoom=ZOOM_1_4;
         else if(phyW < w || phyH < h)
             nzoom=ZOOM_1_2;
         else
-            nzoom=ZOOM_1_1;
+            nzoom=ZOOM_1_1;*/
+        if(phyW < w || phyH < h)
+        {
+            float widthRatio = (float)phyW / (float)w;
+            float heightRatio = (float)phyH / (float)h;
+            nzoom = (widthRatio < heightRatio ? widthRatio : heightRatio);
+        }
+        else
+            nzoom = ZOOM_1_1;
   }
   zoom=nzoom;
   renderDisplayResize(rdrPhysicalW,rdrPhysicalH,zoom);
@@ -126,20 +134,20 @@
       @return current preview mode
 
 */
-
-ADM_PREVIEW_MODE getPreviewMode(void)
+ADM_PREVIEW_MODE admPreview::getPreviewMode(void)
 {
   return previewMode; 
 }
 /**
     \fn changePreviewZoom
 */
-void changePreviewZoom(float nzoom)
+void admPreview::changePreviewZoom(float nzoom)
 {
     admPreview::stop();
     ADM_info("Preview :: Change zoom %.4f->%.4f\n",zoom,nzoom);
     zoom=nzoom;
     renderDisplayResize(rdrPhysicalW,rdrPhysicalH,zoom);
+    UI_displayZoomLevel();
     admPreview::start();
 }
 
@@ -149,8 +157,7 @@
       @param mode  new preview mode
 
 */
-
- void setPreviewMode(ADM_PREVIEW_MODE mode)
+void admPreview::setPreviewMode(ADM_PREVIEW_MODE mode)
 {
   previewMode=mode; 
   UI_setCurrentPreview( (int)mode);
@@ -250,9 +257,10 @@
 */
 bool admPreview::updateImage(void)
 {
+    if(defered_display)
+        return true;
     UI_setFrameType(  rdrImage->flags,rdrImage->_Qp);
-    if(!defered_display) 
-        renderUpdateImage(rdrImage);                  
+    renderUpdateImage(rdrImage);
     return true;
 }

avidemux_2.7.8.tar.gz/avidemux/common/ADM_preview.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_preview.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_render/ADM_coreDxva2/src/ADM_coreDxva2.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_render/GUI_render.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_render/GUI_render.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_render/GUI_simpleRender.cpp Changed

@@ -77,12 +77,15 @@
     lock.lock();
     int stride=ADM_IMAGE_ALIGN(displayWidth*4);
     myImage=QImage(videoBuffer,displayWidth,displayHeight,stride,QImage::Format_RGB32).copy(0,0,displayWidth,displayHeight);
+#if QT_VERSION >= QT_VERSION_CHECK(5,5,0)
+    myImage.setDevicePixelRatio(info.scalingFactor);
+#endif
     lock.unlock();
     refresh();
     return true;
 }
 //#if (ADM_UI_TYPE_BUILD == ADM_UI_QT4)
-    #define IVERT ADM_COLOR_BGR32A
+    #define IVERT ADM_PIXFRMT_BGR32A
 //#else
 //    #define IVERT ADM_COLOR_RGB32A
 //#endif
@@ -104,7 +107,7 @@
 {
         cleanup();
         scaler=new ADMColorScalerFull(ADM_CS_BICUBIC,imageWidth,imageHeight,displayWidth,displayHeight,
-            ADM_COLOR_YV12,
+            ADM_PIXFRMT_YV12,
             IVERT
         );
         uint32_t sz=ADM_IMAGE_ALIGN(displayWidth*4);
@@ -120,6 +123,10 @@
 {
         ADM_info("changing zoom, simple render.\n");
         calcDisplayFromZoom(newZoom);
+#if QT_VERSION >= QT_VERSION_CHECK(5,5,0)
+        displayWidth*=info.scalingFactor;
+        displayHeight*=info.scalingFactor;
+#endif
         currentZoom=newZoom;
         allocateStuff();
         return true;
@@ -131,6 +138,10 @@
 {
     info=*window;
     baseInit(w,h,zoom);
+#if QT_VERSION >= QT_VERSION_CHECK(5,5,0)
+    displayWidth*=info.scalingFactor;
+    displayHeight*=info.scalingFactor;
+#endif
     ADM_info("init, simple render. w=%d, h=%d,zoom=%.4f\n",(int)w,(int)h,zoom);
     allocateStuff();
     videoWidget=(ADM_Qvideo *)info.widget;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

@@ -493,6 +493,8 @@
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
 
+    int ret = 0;
+
     if(_parent->getDrainingState())
     {
         if(_parent->getDrainingInitiated()==false)
@@ -502,22 +504,30 @@
         }
     }else if(!handover)
     {
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=in->data;
-        pkt.size=in->dataLength;
+        AVPacket *pkt = _parent->getPacketPointer();
+        ADM_assert(pkt);
+        pkt->data = in->data;
+        pkt->size = in->dataLength;
+
         if(in->flags&AVI_KEY_FRAME)
-            pkt.flags=AV_PKT_FLAG_KEY;
+            pkt->flags = AV_PKT_FLAG_KEY;
         else
-            pkt.flags=0;
+            pkt->flags = 0;
 
-        avcodec_send_packet(_context, &pkt);
+        ret = avcodec_send_packet(_context, pkt);
+        if(ret)
+        {
+            char er[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, ret);
+            ADM_warning("Ignoring error %d submitting packet to decoder (\"%s\")\n",ret,er);
+        }
+        av_packet_unref(pkt);
     }else
     {
         handover=false;
     }
 
-    int ret = avcodec_receive_frame(_context, frame);
+    ret = avcodec_receive_frame(_context, frame);
 
     if(!_parent->decodeErrorHandler(ret))
         return false;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

@@ -508,6 +508,8 @@
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
 
+    int ret = 0;
+
     if(_parent->getDrainingState())
     {
         if(_parent->getDrainingInitiated()==false)
@@ -517,22 +519,30 @@
         }
     }else if(!handover)
     {
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=in->data;
-        pkt.size=in->dataLength;
+        AVPacket *pkt = _parent->getPacketPointer();
+        ADM_assert(pkt);
+        pkt->data = in->data;
+        pkt->size = in->dataLength;
+
         if(in->flags&AVI_KEY_FRAME)
-            pkt.flags=AV_PKT_FLAG_KEY;
+            pkt->flags = AV_PKT_FLAG_KEY;
         else
-            pkt.flags=0;
+            pkt->flags = 0;
 
-        avcodec_send_packet(_context, &pkt);
+        ret = avcodec_send_packet(_context, pkt);
+        if(ret)
+        {
+            char er[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, ret);
+            ADM_warning("Ignoring error %d submitting packet to decoder (\"%s\")\n",ret,er);
+        }
+        av_packet_unref(pkt);
     }else
     {
         handover=false;
     }
 
-    int ret = avcodec_receive_frame(_context, frame);
+    ret = avcodec_receive_frame(_context, frame);
 
     if(!_parent->decodeErrorHandler(ret))
         return false;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

@@ -379,6 +379,8 @@
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
 
+    int ret = 0;
+
     if(_parent->getDrainingState())
     {
         if(_parent->getDrainingInitiated()==false)
@@ -388,22 +390,30 @@
         }
     }else if(!handover)
     {
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=in->data;
-        pkt.size=in->dataLength;
+        AVPacket *pkt = _parent->getPacketPointer();
+        ADM_assert(pkt);
+        pkt->data = in->data;
+        pkt->size = in->dataLength;
+
         if(in->flags&AVI_KEY_FRAME)
-            pkt.flags=AV_PKT_FLAG_KEY;
+            pkt->flags = AV_PKT_FLAG_KEY;
         else
-            pkt.flags=0;
+            pkt->flags = 0;
 
-        avcodec_send_packet(_context, &pkt);
+        ret = avcodec_send_packet(_context, pkt);
+        if(ret)
+        {
+            char er[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, ret);
+            ADM_warning("Ignoring error %d submitting packet to decoder (\"%s\")\n",ret,er);
+        }
+        av_packet_unref(pkt);
     }else
     {
         handover=false;
     }
 
-    int ret = avcodec_receive_frame(_context, frame);
+    ret = avcodec_receive_frame(_context, frame);
 
     if(!_parent->decodeErrorHandler(ret))
         return false;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp Changed

@@ -152,7 +152,7 @@
     AVFrame *frame=_parent->getFramePointer();
     ADM_assert(frame);
 
-    int ret;
+    int ret = 0;
 
     if(_parent->getDrainingState())
     {
@@ -163,16 +163,19 @@
         }
     }else if(!handover)
     {
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=in->data;
-        pkt.size=in->dataLength;
+        AVPacket *pkt = _parent->getPacketPointer();
+        ADM_assert(pkt);
+        pkt->data = in->data;
+        pkt->size = in->dataLength;
+
         if(in->flags&AVI_KEY_FRAME)
-            pkt.flags=AV_PKT_FLAG_KEY;
+            pkt->flags = AV_PKT_FLAG_KEY;
         else
-            pkt.flags=0;
+            pkt->flags = 0;
+
+        ret = avcodec_send_packet(_context, pkt);
 
-        ret = avcodec_send_packet(_context, &pkt);
+        av_packet_unref(pkt);
 
         /* libavcodec doesn't handle switching between field and frame encoded parts of H.264 streams
         in the way VideoToolbox expects. Proceeding with avcodec_receive_frame as if nothing happened
@@ -185,6 +188,12 @@
             alive = false; // misuse, harmless
             return _parent->uncompress(in,out); // retry
         }
+        if(ret)
+        {
+            char er[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, ret);
+            ADM_warning("Ignoring error %d submitting packet to decoder (\"%s\")\n",ret,er);
+        }
     }else
     {
         handover=false;

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilterApi.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoFilter2/include/ADM_videoFilters.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_filterThread.cpp Changed

@@ -39,23 +39,22 @@
 */
 ADM_videoFilterQueue::~ADM_videoFilterQueue()
 {
-        stopThread();
-        int fCount;
-        fCount=freeList.size();
-        for(int j=0;j<fCount;j++)
-        {
-            ADMImage *image=(ADMImage *)freeList[j].data;
-            delete image;
-        }
-        freeList.clear();
-        int count=list.size();
-        for(int j=0;j<count;j++)
-        {
-            ADMImage *image=(ADMImage *)list[j].data;
-            delete image;
-        }
-        list.clear();
-
+    stopThread();
+    int fCount;
+    fCount=freeList.size();
+    for(int j=0;j<fCount;j++)
+    {
+        ADMImage *image=(ADMImage *)freeList[j].data;
+        delete image;
+    }
+    freeList.clear();
+    int count=list.size();
+    for(int j=0;j<count;j++)
+    {
+        ADMImage *image=(ADMImage *)list[j].data;
+        delete image;
+    }
+    list.clear();
 }
 /**
     \fn     goToTime
@@ -63,8 +62,8 @@
 */
 bool         ADM_videoFilterQueue::goToTime(uint64_t usSeek)
 {
-        ADM_assert(0);
-        return false;
+    ADM_assert(0);
+    return false;
 }
 /**
     \fn     getNextFrame
@@ -76,45 +75,48 @@
 }
 bool         ADM_videoFilterQueue::getNextFrameAs( ADM_HW_IMAGE type,uint32_t *frameNumber,ADMImage *image)
 {
-
-     if(false==started)
+    if(false==started)
+    {
+        startThread();      
+    }
+    while(1)
+    {
+        mutex->lock();
+        if(threadState==RunStateStopOrder)  
         {
-            startThread();      
+            mutex->unlock();
+            return false;
         }
-        while(1)
+        if(list.size())
         {
-            mutex->lock();
-            if(list.size())
-            {
-                //
-                // Dequeue one item
-                ADM_queuePacket pkt=(list[0]);
-                ADM_assert(pkt.data);
-                ADMImage *source=(ADMImage *)pkt.data;
-                *frameNumber=pkt.pts;
-                image->duplicateFull(source);
-                if(type!=image->refType && type!=ADM_HW_ANY)
-                    image->hwDownloadFromRef();
-                list.popFront();
-                freeList.append(pkt);
-                if(cond->iswaiting())
-                {
-                    cond->wakeup();
-                }
-                mutex->unlock();
-                return true;
-            }
-            // If no item, thread still alive ?
-            if(threadState==RunStateStopped)
+            //
+            // Dequeue one item
+            ADM_queuePacket pkt=(list[0]);
+            ADM_assert(pkt.data);
+            ADMImage *source=(ADMImage *)pkt.data;
+            *frameNumber=pkt.pts;
+            image->duplicateFull(source);
+            if(type!=image->refType && type!=ADM_HW_ANY)
+                image->hwDownloadFromRef();
+            list.popFront();
+            freeList.append(pkt);
+            if(producerCond->iswaiting())
             {
-                ADM_info("Video thread stopped, no more data\n");
-                mutex->unlock();
-                return false;
+                producerCond->wakeup();
             }
             mutex->unlock();
-            ADM_usleep(10*1000); // wait 10 ms
+            return true;
         }
-        return false;
+        // If no item, thread still alive ?
+        if(threadState==RunStateStopped)
+        {
+            ADM_info("Video thread stopped, no more data\n");
+            mutex->unlock();
+            return false;
+        }
+        consumerCond->wait();// Will unlock mutex
+    }
+    return false;
 }
 /**
     \fn     getInfo
@@ -122,7 +124,7 @@
 */
 FilterInfo   *ADM_videoFilterQueue::getInfo(void)    
 {
-        return previousFilter->getInfo();
+    return previousFilter->getInfo();
 }
 /**
     \fn
@@ -132,23 +134,18 @@
 {
     while(1)
     {
+        mutex->lock();
         if(threadState==RunStateStopOrder)  
         {
             ADM_info("Video thread, received stop order\n");
+            mutex->unlock();
             goto theEnd;
         }
-        mutex->lock();
         if(!freeList.size())
         {
-            cond->wait(); // Will unlock mutex
+            producerCond->wait(); // Will unlock mutex
             continue;
         }
-        if(threadState==RunStateStopOrder)  
-        {
-            ADM_info("Video thread, received stop order\n");
-            mutex->unlock();
-            goto theEnd;
-        }
         uint32_t fn=0;
         ADM_queuePacket pkt=(freeList[0]);
         ADM_assert(pkt.data);
@@ -169,8 +166,9 @@
         mutex->lock();
         pkt.pts=fn;
         list.append(pkt);
+        if (consumerCond->iswaiting())
+            consumerCond->wakeup();
         mutex->unlock();
-
     }
 theEnd:
         ADM_info("Exiting video thread loop\n");

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_pluginLoad.cpp Changed

@@ -43,7 +43,7 @@
 
 ADM_vf_plugin::ADM_vf_plugin(const char *file) : ADM_LibWrapper()
 {
-	initialised = (loadLibrary(file) && getSymbols(11,
+	initialised = (loadLibrary(file) && getSymbols(12,
 		&create, "create",
 		&destroy, "destroy",
 		&getApiVersion, "getApiVersion",
@@ -54,7 +54,8 @@
 		&getInternalName, "getInternalName",
 		&getDisplayName, "getDisplayName",
         &getCategory,"getCategory",
-        &partializable,"partializable"
+        &partializable,"partializable",
+        &redirector,"redirector"
         ));
 };
 
@@ -320,7 +321,6 @@
         }
     }
     ADM_error("Cannot get video filter from name <%s>\n",name);
-    ADM_assert(0);
     return NULL;
 }
 /**
@@ -330,6 +330,7 @@
 const char *ADM_vf_getDisplayNameFromTag(uint32_t tag)
 {
     ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
+    if(!plugin) return NULL;
     return plugin->info.displayName;
 }
 /**
@@ -338,6 +339,7 @@
 VF_CATEGORY ADM_vf_getFilterCategoryFromTag(uint32_t tag)
 {
     ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
+    if(!plugin) return VF_INVALID;
     return plugin->info.category;
 }
 
@@ -347,26 +349,43 @@
 */
 const char *ADM_vf_getInternalNameFromTag(uint32_t tag)
 {
-  ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
-  return plugin->getInternalName();
+    ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
+    if(!plugin) return NULL;
+    return plugin->getInternalName();
 }
 /**
     \fn ADM_vf_getTagFromInternalName
-    \brief
 */
-uint32_t    ADM_vf_getTagFromInternalName(const char *name)
+uint32_t ADM_vf_getTagFromInternalName(const char *name)
 {
     ADM_vf_plugin *plg=ADM_vf_getPluginFromInternalName(name);
+    if(!plg) return -1;
     return plg->tag;
-
 }
+/**
+    \fn ADM_vf_canBePartialized
+*/
 bool ADM_vf_canBePartialized(uint32_t tag)
 {
-  ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
-  if(!plugin->partializable)
-        return false;
-  return plugin->partializable();
-
+    ADM_vf_plugin *plugin=ADM_vf_getPluginFromTag(tag);
+    if(!plugin) return false;
+    return plugin->partializable();
+}
+/**
+    \fn ADM_vf_findCompatibleFilter
+*/
+bool ADM_vf_findCompatibleFilter(std::string &name, CONFcouple **c)
+{
+    for(int cat=0;cat<VF_HIDDEN;cat++)
+    {
+        int nb = ADM_videoFilterPluginsList[cat].size();
+        for(int i=0;i<nb;i++)
+        {
+            ADM_vf_plugin *a = ADM_videoFilterPluginsList[cat][i];
+            if(a->redirector(name,c))
+                return true;
+        }
+    }
+    return false;
 }
-
 //EOF

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_vidPartial.cpp Changed

@@ -61,6 +61,7 @@
                 bool         hasIntermediate;
                 uint32_t     intermediateFn;
                 bool         sonFilterPreview;
+                FilterInfo   previewFilterInfo;
 
 
                 bool        isInRange(uint64_t tme);
@@ -72,6 +73,7 @@
         virtual const char   *getConfiguration(void);                   /// Return  current configuration as a human readable string
         virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
         virtual bool         getNextFrameForSon(uint32_t *fn,ADMImage *image);    /// Return the next image
+        virtual FilterInfo   *getInfo(void);
         virtual bool         getCoupledConf(CONFcouple **couples) ;     /// Return the current filter configuration
         virtual void         setCoupledConf(CONFcouple *couples);
         virtual bool         configure(void); /// Start graphical user interface
@@ -133,8 +135,6 @@
         configuration.startBlack=configuration.endBlack;
         configuration.endBlack=swap;
     }
-    if(configuration.endBlack > info.totalDuration)
-        configuration.endBlack=info.totalDuration;
     // Ok, create trampoline & son
     trampoline=new trampolineFilter(this,NULL);
     // Create swallowed filter
@@ -229,14 +229,27 @@
 }
 
 /**
+    \fn getInfo
+    \brief Get FilterInfo
+*/
+FilterInfo  *partialFilter::getInfo(void)
+{
+    if (!sonFilterPreview)
+        return previousFilter->getInfo();
+    
+    previewFilterInfo = *(previousFilter->getInfo());
+    getRange(&(previewFilterInfo.markerA), &(previewFilterInfo.markerB));
+    return &previewFilterInfo;
+}
+
+/**
  */
 bool partialFilter::isInRange(uint64_t tme)
 {
-    uint64_t first=previousFilter->getAbsoluteStartTime();
-    uint64_t from=1000LL*configuration.startBlack;
-    uint64_t to=1000LL*configuration.endBlack;
+    tme += previousFilter->getAbsoluteStartTime();
+    uint32_t tmeMs = tme / 1000LL;	// we need to comprare at ms resolution, otherwise if usec part not zero, would mess up things
 
-    if(tme+first<from || tme+first>to)
+    if(tmeMs<configuration.startBlack || tmeMs>=configuration.endBlack)
     {
         return false;
     }
@@ -449,16 +462,12 @@
   CONFcouple tmp(3+sonNbItems);
 
   uint32_t start, end;
-  if(source->getInfo()->totalDuration == video_body->getVideoDuration())
-  {
-      start=video_body->getMarkerAPts()/1000;
-      end=video_body->getMarkerBPts()/1000;
-  }else
-  {
-      double f=(double)(source->getInfo()->totalDuration) / video_body->getVideoDuration();
-      start=(uint32_t)(video_body->getMarkerAPts() * f / 1000);
-      end=(uint32_t)(video_body->getMarkerBPts() * f / 1000);
-  }
+  uint64_t startPts, endPts;
+  startPts = source->getInfo()->markerA;
+  endPts = source->getInfo()->markerB;
+
+  start = startPts/1000;
+  end = endPts/1000;
 
   tmp.writeAsString("filterName",internalName);
   tmp.writeAsUint32 ("startBlack",start);

avidemux_2.7.8.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp Changed

@@ -43,6 +43,15 @@
     return ADM_VideoFilters[index].instance;
 }
 /**
+    \fn ADM_vf_getEnabled
+    \brief Return filter enabled status  of rank index
+*/
+bool ADM_vf_getEnabled(int index)
+{
+    ADM_assert(index<ADM_vf_getSize());
+    return ADM_VideoFilters[index].enabled;
+}
+/**
     \fn ADM_vf_getTag
     \brief Return tag of index active filter
 */
@@ -65,7 +74,7 @@
     ADM_coreVideoFilter *instance=e->instance;
     ADM_assert(instance);
 
-    if(instance->configure() && index < nb-1) // not the last one
+    if(instance->configure() && ((index < nb-1) || (e->tag == VF_PARTIAL_FILTER))) // not the last one -OR- partial filter (if only partial timing were changed, the child filter might operate noughty, until next chain rebuild)
     {
         return ADM_vf_recreateChain();
     }
@@ -131,6 +140,7 @@
 
     //--
     ADM_VideoFilterElement scratch2;
+    scratch2.enabled = scratch.enabled;
     scratch2.instance=partialized;
     scratch2.tag=VF_PARTIAL_FILTER;
     scratch2.objectId=0;
@@ -140,6 +150,62 @@
     //--
     return ADM_vf_recreateChain();
 }
+/**
+ * 
+ */
+extern uint32_t ADM_vf_getTagFromInternalName(const char *name);
+bool ADM_vf_absolvePartialized(int index)
+{
+    ADM_info("Absolving partialized filter at index %d\n",index);
+    //
+    ADM_assert(index<ADM_VideoFilters.size());
+    
+    
+    ADM_VideoFilterElement scratch=ADM_VideoFilters[index];
+    const char *internalName=ADM_vf_getInternalNameFromTag(scratch.tag);
+    CONFcouple *conf=NULL;
+    if(!scratch.instance->getCoupledConf (&conf))
+    {
+        ADM_warning("Cannot get configuration\n");
+        return false;
+    }
+    // first conf entry: filterName
+    // second and third are start and stop time
+    int confNb = conf->getSize();
+    ADM_assert(confNb>=3);
+    char * filterNameName, * filterNameValue;
+    conf->getInternalName(0, &filterNameName, &filterNameValue);
+    ADM_assert(strcmp(filterNameName,"filterName")==0);
+    
+    CONFcouple * newConf = new CONFcouple(confNb-3);
+    for (int i=3; i<confNb; i++)
+    {
+        char * name, * key;
+        conf->getInternalName(i, &name, &key);
+        newConf->setInternalName(name, key);
+    }
+    
+    uint32_t newTag = ADM_vf_getTagFromInternalName(filterNameValue);
+    
+    ADM_coreVideoFilter *unPartialized=ADM_vf_createFromTag(newTag, scratch.instance->getSource(), newConf);
+    delete newConf;
+    if(!unPartialized)
+    {
+        return false;
+    }
+
+    //--
+    ADM_VideoFilterElement scratch2;
+    scratch2.enabled = scratch.enabled;
+    scratch2.instance=unPartialized;
+    scratch2.tag=newTag;
+    scratch2.objectId=0;
+    ADM_VideoFilters[index]=scratch2;
+    delete scratch.instance;
+    scratch.instance=NULL;
+    //--
+    return ADM_vf_recreateChain();
+}
 
 /**
     \fn createVideoFilterChain
@@ -157,6 +223,7 @@
     bool openGl=false;
     for(int i=0;i<nb;i++)
     {
+            if (!(ADM_VideoFilters[i].enabled)) continue;
             // Get configuration
             CONFcouple *c;
             ADM_coreVideoFilter *old=ADM_VideoFilters[i].instance;

avidemux_2.7.8.tar.gz/avidemux/common/A_functions.h -> avidemux_2.8.0.tar.gz/avidemux/common/A_functions.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/avi_vars.h -> avidemux_2.8.0.tar.gz/avidemux/common/avi_vars.h Changed

avidemux_2.7.8.tar.gz/avidemux/common/button_mapping -> avidemux_2.8.0.tar.gz/avidemux/common/button_mapping Changed

avidemux_2.7.8.tar.gz/avidemux/common/gui_action.names -> avidemux_2.8.0.tar.gz/avidemux/common/gui_action.names Changed

avidemux_2.7.8.tar.gz/avidemux/common/gui_blackframes.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/gui_blackframes.cpp Changed

@@ -43,34 +43,32 @@
 
 static const int  sliceOrder[8]={3,4,2,5,1,6,0,7};
 /**
-        \fn sliceScanNotBlack
-        \brief The image is split into 8 slices, returns if the given slice is black or not
+    \fn sliceScanNotBlack
+    \brief The image is split into 8 slices, returns if the given slice is black or not
 */
 static int sliceScanNotBlack(int darkness, int maxnonb, int sliceNum,ADMImage *img)
 {
-    uint32_t width = img->_width;
-    int       stride=img->GetPitch(PLANAR_Y);
     uint32_t height = img->_height;
-    uint32_t sliceOffset = (stride * height)>>3 ;    // 1/8 of an image
-
-    uint8_t *buff,*start;
-
+    uint32_t width = img->_width;
+    int      stride = img->GetPitch(PLANAR_Y);
+    uint8_t *buff = img->GetReadPtr(PLANAR_Y)+ stride*(height>>3)*sliceNum;    // 1/8 of an image
     int cnt4=0;
 
-    start=img->GetReadPtr(PLANAR_Y)+ sliceOffset*sliceNum;
-    buff=start+sliceOffset;
-
-    while(--buff>start)
+    for (int y=0; y<(height>>3); y++)
     {
-      if(*buff > darkness )
-      {
-        cnt4++;
-        if(cnt4>=maxnonb)
-          return(1);
-      }
+        for (int x=0; x<width; x++)
+        {
+            if(buff[x] > darkness)
+            {
+                cnt4++;
+                if(cnt4>=maxnonb)
+                    return 1;
+            }
+        }
+        buff += stride;
     }
-    return(0);
 
+    return 0;
 }
 /**
     \fn fastIsNotBlack
@@ -82,17 +80,17 @@
     uint32_t width = img->_width;
     uint32_t height = img->_height;    
     uint32_t maxnonb=(width* height)>>8;
-    
-        maxnonb>>=3;
-        // Divide the screen in 8 part  : 0 1 2 3 4 5 6 7 
-        // Scan 2 & 3 first, if still good, go on
-        for(uint32_t i=0;i<6;i++)
-        {
-                if(sliceScanNotBlack(darkness,maxnonb,sliceOrder[i],img)) return 1;
-        }
-        // The slice 0 & 7 are particular and we admit twice as much
-        if(sliceScanNotBlack(darkness,maxnonb*2,0,img)) return 1;
-        if(sliceScanNotBlack(darkness,maxnonb*2,7,img)) return 1;
+
+    maxnonb>>=3;
+    // Divide the screen in 8 part  : 0 1 2 3 4 5 6 7 
+    // Scan 2 & 3 first, if still good, go on
+    for(uint32_t i=0;i<6;i++)
+    {
+        if(sliceScanNotBlack(darkness,maxnonb,sliceOrder[i],img)) return 1;
+    }
+    // The slice 0 & 7 are particular and we admit twice as much
+    if(sliceScanNotBlack(darkness,maxnonb*2,0,img)) return 1;
+    if(sliceScanNotBlack(darkness,maxnonb*2,7,img)) return 1;
 
     return(0);
 }
@@ -102,7 +100,153 @@
 */
 void GUI_PrevBlackFrame(void)
 {
-    GUI_Error_HIG(QT_TRANSLATE_NOOP("blackframes", "BlackFrame"), QT_TRANSLATE_NOOP("blackframes", "This function is unsupported at the moment"));
+    if (playing)
+        return;
+    if (! avifileinfo)
+        return;
+    const int darkness=40;
+    admPreview::deferDisplay(true);
+    ADMImage *rdr = NULL;
+
+    uint64_t startTime=admPreview::getCurrentPts();
+    uint64_t lastBlackPts=ADM_NO_PTS;
+    DIA_processingBase *work=createProcessing(QT_TRANSLATE_NOOP("blackframes", "Searching black frame.."),startTime);
+    
+    // search among (likely) cached images
+#define LIKELY_CACHED 6
+    int keyFrameCount = 0;
+    for (int i=0; i < LIKELY_CACHED; i++)
+    {
+        if(false==admPreview::previousPicture())
+            break;
+        rdr=admPreview::getBuffer();
+        if(!rdr)
+            break;
+        if(rdr->refType!=ADM_HW_NONE) // need to convert it to plain YV12
+        {
+            if(false==rdr->hwDownloadFromRef())
+            {
+                ADM_warning("Cannot convert hw image to yv12\n");
+                break;
+            }
+        }
+        if(rdr->flags & AVI_KEY_FRAME)
+            keyFrameCount++;
+        if(!fastIsNotBlack(darkness,rdr))
+        {
+            lastBlackPts = admPreview::getCurrentPts();
+            break;
+        }
+    }
+
+    uint64_t gopPts, anchorPts = startTime;
+    bool error = false;
+    bool firstBlock = false;
+
+    if (lastBlackPts != ADM_NO_PTS)
+        goto _finish;
+
+    // special case all-intra video
+    if (keyFrameCount == LIKELY_CACHED)
+    {
+        video_body->rewind();
+        admPreview::samePicture();
+        while(1)
+        {
+            UI_purge();
+            uint64_t current = admPreview::getCurrentPts();
+            if (current >= startTime)
+                break;
+            rdr = admPreview::getBuffer();
+            if (!rdr)
+                break;
+            if (rdr->refType != ADM_HW_NONE /* need to convert it to plain YV12 */ && !rdr->hwDownloadFromRef())
+            {
+                ADM_warning("Cannot convert hw image to yv12\n");
+                break;
+            }
+            if (!fastIsNotBlack(darkness,rdr))
+            {
+                lastBlackPts = current;
+            }
+            if (work->update(1,current) || false == admPreview::nextPicture())
+            {
+                error = true;
+                break;
+            }
+        }
+        if (error)
+            lastBlackPts = ADM_NO_PTS;
+        goto _finish;
+    }
+
+    admPreview::seekToTime(anchorPts);
+    while(1)
+    {
+        UI_purge();
+        if (firstBlock)
+            break;
+        if (false==admPreview::previousKeyFrame())
+        {
+            video_body->rewind();
+            admPreview::samePicture();
+            firstBlock = true;
+        }
+        gopPts = admPreview::getCurrentPts();
+        while(1)
+        {
+            UI_purge();
+            if (admPreview::getCurrentPts() >= anchorPts)
+            {
+                if (!firstBlock)
+                {
+                    if (false==admPreview::previousKeyFrame())
+                        error = true;
+                    anchorPts = admPreview::getCurrentPts();
+                }
+                break;
+            }
+            rdr=admPreview::getBuffer();
+            if(!rdr)
+            {
+                error = true;
+                break;
+            }
+            if(rdr->refType != ADM_HW_NONE && !rdr->hwDownloadFromRef())
+            {
+                ADM_warning("Cannot convert hw image to yv12\n");
+                break;
+            }
+            if(!fastIsNotBlack(darkness,rdr))
+            {
+                lastBlackPts = admPreview::getCurrentPts();
+            }
+            if(work->update(1,startTime-anchorPts + admPreview::getCurrentPts()-gopPts))
+            {
+                error = true;
+                break;
+            }
+            if(false==admPreview::nextPicture())
+            {
+                error = true;
+                break;
+            }
+        }
+        if (error)
+        {
+            lastBlackPts = ADM_NO_PTS;
+            break;
+        }
+        if (lastBlackPts != ADM_NO_PTS)
+            break;
+    }
+_finish:
+    delete work;
+    admPreview::seekToTime((lastBlackPts==ADM_NO_PTS)?startTime:lastBlackPts);
+    admPreview::deferDisplay(false);
+    admPreview::samePicture();
+    GUI_setCurrentFrameAndTime();
+    return;
 }
 
 /**
@@ -112,27 +256,24 @@
 void GUI_NextBlackFrame(void)
 {
     if (playing)
-		return;
+        return;
     if (! avifileinfo)
-       return;
+        return;
     const int darkness=40;
     admPreview::deferDisplay(true);
     ADMImage *rdr;
-    
-//#warning set real fps
-    
-    // guess ~ number of frames
+
     uint64_t duration=video_body->getVideoDuration();    
     uint64_t startTime=admPreview::getCurrentPts();
     DIA_processingBase *work=createProcessing(QT_TRANSLATE_NOOP("blackframes", "Searching black frame.."),duration-startTime);
 
-    uint32_t count=0;
+    bool blackFound=false;
     while(1)
     {
         UI_purge();
 
         if(false==admPreview::nextPicture())
-                break;
+            break;
         rdr=admPreview::getBuffer();
         if(rdr->refType!=ADM_HW_NONE) // need to convert it to plain YV12
         {
@@ -141,21 +282,22 @@
                 ADM_warning("Cannot convert hw image to yv12\n");
                 break;
             }
-
         }
         if(!fastIsNotBlack(darkness,rdr))
         {
-                break;
+            blackFound = true;
+            break;
         }
         if(work->update(1,admPreview::getCurrentPts()-startTime))
-              break;
+            break;
     }
     delete work;
+    if (!blackFound)
+        admPreview::seekToTime(startTime);
     admPreview::deferDisplay(false);
     admPreview::samePicture();
     GUI_setCurrentFrameAndTime();
     return;
-
 }
 
 //EOF

avidemux_2.7.8.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -101,6 +101,7 @@
 void HandleAction (Action action);
 void HandleAction_Navigate(Action action);
 void HandleAction_Save(Action action);
+void HandleAction_Staged(Action action);
 
 extern void call_scriptEngine(const char *scriptFile);
 
@@ -337,11 +338,10 @@
           }
         ADM_info("Closing ui\n");
         UI_closeGui();
-        if(video_body && video_body->canUndo())
-        {
+        if(video_body && avifileinfo)
             A_saveSession();
+        if(video_body && video_body->canUndo())
             video_body->clearUndoQueue();
-        }
         return;
     case ACT_RESTORE_SESSION:
         if(playing) break;
@@ -395,6 +395,10 @@
   {
     return HandleAction_Save(action);
   }
+  if(action > ACT_STAGED_BEGIN && action < ACT_STAGED_END)
+  {
+    return HandleAction_Staged(action);
+  }
 
   switch (action)
     {
@@ -437,7 +441,7 @@
         {
                 float currentZoom=(float)(2<<(action-ACT_ZOOM_1_4))/8;
                 UI_setBlockZoomChangesFlag(true);
-                changePreviewZoom(currentZoom);
+                admPreview::changePreviewZoom(currentZoom);
                 UI_setBlockZoomChangesFlag(false);
                 UI_resetZoomThreshold();
                 admPreview::samePicture();
@@ -466,7 +470,7 @@
 #define TOGGLE_PREVIEW ADM_PREVIEW_OUTPUT
     case ACT_PreviewChanged:
     {
-        ADM_PREVIEW_MODE oldpreview=getPreviewMode(),newpreview=(ADM_PREVIEW_MODE)UI_getCurrentPreview();
+        ADM_PREVIEW_MODE oldpreview = admPreview::getPreviewMode(),newpreview=(ADM_PREVIEW_MODE)UI_getCurrentPreview();
           printf("Old preview %d, New preview mode : %d\n",oldpreview,newpreview);
 
           if(oldpreview==newpreview)
@@ -474,7 +478,7 @@
             return;
           }
             admPreview::stop();
-            setPreviewMode(newpreview);
+            admPreview::setPreviewMode(newpreview);
             admPreview::start();
 //            admPreview::update(curframe);
       }
@@ -522,13 +526,29 @@
         UI_setMarkers (markA, markB);
       break;
     }
+    case ACT_ResetMarkerA:
+        if(0 == video_body->getMarkerAPts())
+            break;
+        video_body->addToUndoQueue();
+        video_body->setMarkerAPts(0);
+        UI_setMarkers(0, video_body->getMarkerBPts());
+        break;
+    case ACT_ResetMarkerB:
+    {
+        uint64_t end = video_body->getVideoDuration();
+        if(end == video_body->getMarkerBPts())
+            break;
+        video_body->addToUndoQueue();
+        video_body->setMarkerBPts(end);
+        UI_setMarkers(video_body->getMarkerAPts(), end);
+        break;
+    }
     case ACT_ResetMarkers:
     {
         if(!video_body->getMarkerAPts() && video_body->getMarkerBPts()==video_body->getVideoDuration())
             break; // do nothing if the markers were not moved
         video_body->addToUndoQueue();
         A_ResetMarkers();
-        A_Resync();
         break;
     }
     case ACT_Copy:
@@ -667,7 +687,14 @@
                 A_Resync();
                 A_Rewind();
 
-                if(currentPts<=video_body->getVideoDuration()) GUI_GoToTime(currentPts);
+                if(currentPts<=video_body->getVideoDuration())
+                    r = GUI_GoToTime(currentPts);
+                else
+                    r = false;
+
+                EditableAudioTrack *ed=video_body->getDefaultEditableAudioTrack();
+                if(ed && ed->edTrack)
+                    ed->edTrack->goToTime(r? currentPts : 0); // update audio segment
             }
         }
         break;
@@ -829,6 +856,10 @@
             {
                 // Can we go to the last keyframe before the cut?
                 current=after;
+                // current equal segment duration does not belong to this segment or
+                // to any segment, when it matches video duration, triggering rewind.
+                if(current && current != ADM_NO_PTS)
+                    current--;
                 if(!video_body->getPKFramePTS(&current))
                 { // nope
                     A_Rewind();
@@ -1070,7 +1101,7 @@
     UI_setAudioTrackCount( video_body->getNumberOfActiveAudioTracks() );
     ADM_info(" conf updated \n");
     UI_setDecoderName(video_body->getVideoDecoderName());
-
+    UI_displayZoomLevel();
 }
 
 //___________________________________________
@@ -1340,23 +1371,22 @@
 bool A_checkSavedSession(bool load)
 {
     std::string where=LAST_SESSION_FILE;
-    bool exists=ADM_fileExist(where.c_str());
+    if(false == ADM_fileExist(where.c_str()))
+        return false;
     if(!load)
-        return exists;
-    bool r=false;
-    if(exists)
-    {
-        IScriptEngine *engine=getPythonScriptEngine();
-        if(engine)
-        {
-            ADM_info("Restoring the last editing state from %s\n",where.c_str());
-            r=A_parseScript(engine,where.c_str());
-            A_Resync();
-            if(!ADM_eraseFile(where.c_str()))
-                ADM_warning("Could not delete %s\n",where.c_str());
-        }
-    }
-    return r;
+        return true;
+    IScriptEngine *engine=getPythonScriptEngine();
+    if(!engine)
+        return false;
+    ADM_info("Restoring the last editing state from %s\n",where.c_str());
+    if(false == A_parseScript(engine,where.c_str()))
+        return false;
+    video_body->rewind();
+    admPreview::samePicture();
+    A_Resync();
+    if(false == ADM_eraseFile(where.c_str()))
+        ADM_warning("Could not delete %s\n",where.c_str());
+    return true;
 }
 /**
     Unpack all frames without displaying them to check for error
@@ -1459,6 +1489,26 @@
 
 }
 
+//
+extern int DIA_getHDRParams( uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust);
+//
+void    A_setHDRConfig( void )
+{
+    uint32_t method;
+    float saturation, boost;
+    stagedActionSuccess = 0;
+    if(!avifileinfo) return;
+
+    video_body->getHDRConfig(&method,&saturation,&boost);
+
+     if(DIA_getHDRParams( &method, &saturation,&boost))
+     {
+        video_body->setHDRConfig(method,saturation,boost);
+        stagedActionSuccess = 1;
+        return;
+     }
+}
+
 /**
 
 */
@@ -1726,17 +1776,16 @@
   if (avifileinfo)        // already opened ?
     {                // delete everything
       // if preview is on
-      if(getPreviewMode()!=ADM_PREVIEW_NONE)
+      if(ADM_PREVIEW_NONE != admPreview::getPreviewMode())
       {
         admPreview::stop();
-        setPreviewMode(ADM_PREVIEW_NONE);
+        admPreview::setPreviewMode(ADM_PREVIEW_NONE);
       }
       admPreview::setMainDimension(0, 0, ZOOM_1_1); // destroy preview
       UI_setNeedsResizingFlag(false);
-      uint32_t zero[8]={0};
-      UI_setVUMeter(zero);
-      if(video_body->canUndo())
-        A_saveSession();
+      int32_t inactiveVolume[8]={255,255,255,255,255,255,255,255};
+      UI_setVUMeter(inactiveVolume);
+      A_saveSession();
       delete avifileinfo;
       //delete wavinfo;
       avifileinfo = NULL;
@@ -1748,6 +1797,7 @@
 //      filterCleanUp ();
       UI_setTitle(NULL);
       UI_setDecoderName("XXXX");
+      UI_displayZoomLevel();
 
     A_ResetMarkers();
     ReSync();
@@ -1922,10 +1972,12 @@
 {
                admPreview::stop();
                video_body->rewind();
+#if 0 /* Should not be needed anymore after ADM_Composer::DecodePictureUpToIntra has been fixed. */
                video_body->rewind(); // do it twice, for interlaced content it may fail the 1st time
+#endif
                admPreview::start();
                admPreview::samePicture();
-               admPreview::samePicture();
+               //admPreview::samePicture();
                GUI_setCurrentFrameAndTime();
 }
 void brokenAct(void)

avidemux_2.7.8.tar.gz/avidemux/common/gui_navigate.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/gui_navigate.cpp Changed

@@ -36,13 +36,45 @@
 #include "ADM_preview.h"
 
 static ADMCountdown  NaggingCountDown(5000); // Wait 5 sec before nagging again for cannot seek
-static void A_timedError(bool force, const char *s);
+static void A_timedError(bool *first, const char *s);
 
 extern uint8_t DIA_gotoTime(uint32_t *hh, uint32_t *mm, uint32_t *ss,uint32_t *ms);
+extern void A_setHDRConfig(void);
+
+static uint32_t jumpTarget[4] = {0};
+
 bool   GUI_infiniteForward(uint64_t pts);
 bool   GUI_lastFrameBeforePts(uint64_t pts);
 bool   GUI_SeekByTime(int64_t time);
+bool   GUI_CoarseSeekByTime(int64_t time);
+void  GUI_PrevCutPoint();
+void  GUI_NextCutPoint();
 bool A_jumpToTime(uint32_t hh,uint32_t mm,uint32_t ss,uint32_t ms);
+
+/**
+    \fn HandleAction_Staged
+*/
+void HandleAction_Staged(Action action)
+{
+    switch(action)
+    {
+        case ACT_SetHDRConfig:
+            A_setHDRConfig();
+            break;
+        case ACT_SelectTime:
+            {
+                stagedActionSuccess = 0;
+                // Get current time
+                uint64_t pts = admPreview::getCurrentPts();
+                uint32_t *t = jumpTarget;
+                ms2time((uint32_t)(pts/1000),t,t+1,t+2,t+3);
+                if (DIA_gotoTime(t,t+1,t+2,t+3))
+                    stagedActionSuccess = 1;
+            }
+            break;
+        default:break;
+    }
+}
 /**
     \fn HandleAction_Navigate
 
@@ -88,32 +120,104 @@
             ignore_change--;
         }
         break;
+      case ACT_FineScale:
+        if(playing) break;
+        if (!ignore_change)
+        {
+            uint32_t nf;
+            ignore_change++;
+            nf = GUI_GetScale ();
+            ADM_info("Fine Scale :%" PRIu32"\n",nf);
+            double tme=nf;
+            double totalDuration=(double) video_body->getVideoDuration();
+            tme*=totalDuration;
+            tme/=ADM_SCALE_SIZE;
+            uint64_t pts=5000+(uint64_t)tme; // aim a bit higher to avoid double "search previous" events
+            if(pts>totalDuration) pts=totalDuration;
+
+            ADM_info("Fine Scale Time:%" PRIu64" ms (total=%" PRIu64" ms)\n",pts/1000,video_body->getVideoDuration()/1000);
+            ADM_info("Fine Scale Time:%s ms \n",ADM_us2plain(pts));
+
+            uint64_t lastpts=pts;
+            if(false==video_body->getNKFramePTS(&lastpts)) // at the end of the video, be careful
+            {
+                if(false==video_body->getPKFramePTS(&lastpts))
+                {
+                    ignore_change--;
+                    break;
+                }
+                GUI_infiniteForward(lastpts);
+                lastpts=admPreview::getCurrentPts();
+                if(pts>=lastpts)
+                    pts=lastpts;
+            }
+            if(false==GUI_lastFrameBeforePts(pts)) // we are probably at the beginning of the video,
+                video_body->rewind(); // go to the first frame then
+            admPreview::samePicture();
+            UI_setCurrentTime(pts);
+            UI_purge();
+            ignore_change--;
+        }
+        break;      
       case ACT_GotoMarkA:
       case ACT_GotoMarkB:
+        {
+            uint64_t pts = ADM_NO_PTS;
+            uint64_t rescue = admPreview::getCurrentPts();
+            if(action==ACT_GotoMarkA)
+                pts = video_body->getMarkerAPts();
+            else
+                pts = video_body->getMarkerBPts();
+            if(pts == ADM_NO_PTS) return;
+            // handle default values
+            if(!pts)
             {
-                uint64_t pts;
-                if(action==ACT_GotoMarkA) 
-                        pts=video_body->getMarkerAPts();
-                else  
-                        pts=video_body->getMarkerBPts();
-                if(false==video_body->goToTimeVideo(pts))
-                {
-                    if(action==ACT_GotoMarkA)
-                    {
-                        ADM_warning("Go to Marker A: Seek to time %s ms failed\n",ADM_us2plain(pts));
-                    }else // PTS returned by getMarkerBPts() may be beyond the last frame.
-                          // Go to the last frame then.
+                video_body->rewind();
+            }else if(pts == video_body->getVideoDuration())
+            {
+                pts = video_body->getLastKeyFramePts();
+                if(pts == ADM_NO_PTS) return;
+                GUI_infiniteForward(pts);
+            }else if(false == video_body->goToTimeVideo(pts))
+            {
+                ADM_warning("Marker %s PTS %s doesn't match a frame exactly or decoding failure, making something up.\n",
+                    (action == ACT_GotoMarkA)? "A" : "B",
+                    ADM_us2plain(pts));
+                uint64_t start = pts;
+                // Can we seek to previous keyframe and approach the marker from there?
+                if(false == video_body->getPKFramePTS(&start) || start == ADM_NO_PTS)
+                { // Nope, try to seek to the next keyframe instead.
+                    start = pts;
+                    if(false == video_body->getNKFramePTS(&start) || start == ADM_NO_PTS)
                     {
-                        pts=video_body->getLastKeyFramePts();
-                        if(pts==ADM_NO_PTS) 
-                                break;     
-                        GUI_infiniteForward(pts);
+                        ADM_warning("Seek to marker %s at %s failed.\n", (action == ACT_GotoMarkA)? "A" : "B", ADM_us2plain(pts));
+                        admPreview::seekToTime(rescue);
+                        return;
+                    }
+                    if(false == admPreview::seekToIntraPts(start))
+                    { // try to recover
+                        admPreview::seekToTime(rescue);
+                        return;
                     }
+                    GUI_setCurrentFrameAndTime();
+                    return;
                 }
-                admPreview::samePicture();
-                GUI_setCurrentFrameAndTime();
+                admPreview::deferDisplay(true);
+                if(false == admPreview::seekToIntraPts(start))
+                {
+                    admPreview::seekToTime(rescue);
+                    admPreview::deferDisplay(false);
+                    return;
+                }
+                while(pts > admPreview::getCurrentPts() && admPreview::nextPicture())
+                {
+                }
+                admPreview::deferDisplay(false);
             }
-            break;
+            admPreview::samePicture();
+            GUI_setCurrentFrameAndTime();
+        }
+        break;
 
       case ACT_PreviousKFrame:
         GUI_PreviousKeyFrame();
@@ -157,6 +261,12 @@
       case ACT_NextKFrame:
         GUI_NextKeyFrame();
       break;
+      case ACT_PrevCutPoint:
+        GUI_PrevCutPoint();
+      break;
+      case ACT_NextCutPoint:
+        GUI_NextCutPoint();
+      break;
       case ACT_NextBlackFrame:
         GUI_NextBlackFrame();
       break;
@@ -180,17 +290,48 @@
             break;
       case ACT_GotoTime:
       {
-           // Get current time
-            uint64_t pts=admPreview::getCurrentPts();
-
-          uint32_t mm, hh, ss, ms;
-            ms2time((uint32_t)(pts/1000),&hh,&mm,&ss,&ms);
-          if (DIA_gotoTime(&hh, &mm, &ss,&ms))
-          {
-            A_jumpToTime(hh, mm, ss, ms);
-          }
+            if(playing) break;
+            if(!stagedActionSuccess) break;
+            uint32_t *t = jumpTarget;
+            uint32_t hh,mm,ss,ms;
+            hh = *t++;
+            mm = *t++;
+            ss = *t++;
+            ms = *t;
+            A_jumpToTime(hh,mm,ss,ms);
+            stagedActionSuccess = 0;
       }
       break;
+      case ACT_Refresh:
+        { // Flush cache and seek to the current picture
+            if(playing) break;
+            if(!stagedActionSuccess) break;
+            ADMImage *pic = admPreview::getBuffer();
+            if(!pic) break;
+            uint64_t time = admPreview::getCurrentPts();
+            admPreview::deferDisplay(true);
+            if(pic->flags & AVI_KEY_FRAME)
+            {
+                admPreview::nextPicture();
+                admPreview::previousKeyFrame();
+            }else
+            {
+                admPreview::previousKeyFrame(); // flush cache
+                if(false == admPreview::seekToTime(time))
+                    video_body->rewind(); // avoid crash
+            }
+            admPreview::deferDisplay(false);
+            admPreview::samePicture();
+            GUI_setCurrentFrameAndTime();
+            stagedActionSuccess = 0;
+            break;
+        }
+      case ACT_SeekBackward:
+            GUI_CoarseSeekByTime(-4000000LL);
+            break;
+      case ACT_SeekForward:
+            GUI_CoarseSeekByTime(4000000LL);
+            break;
       default:
       ADM_assert(0);
       break;
@@ -230,9 +371,7 @@
 
     if (!admPreview::nextKeyFrame())
       {
-        bool force = firstError;
-        firstError = false;
-        A_timedError(force, QT_TRANSLATE_NOOP("navigate","Cannot go to next keyframe"));
+        A_timedError(&firstError, QT_TRANSLATE_NOOP("navigate","Cannot go to next keyframe"));
         return false;
       }
     GUI_setCurrentFrameAndTime();
@@ -298,9 +437,7 @@
 
     if (!admPreview::previousKeyFrame())
       {
-        bool force = firstError;
-        firstError = false;
-        A_timedError(force, QT_TRANSLATE_NOOP("navigate","Cannot go to previous keyframe"));
+        A_timedError(&firstError, QT_TRANSLATE_NOOP("navigate","Cannot go to previous keyframe"));
         return false;
       }
     GUI_setCurrentFrameAndTime();
@@ -409,6 +546,18 @@
 void GUI_setAllFrameAndTime(void)
 {
     UI_setTotalTime(video_body->getVideoDuration());
+    uint32_t numOfSegs = video_body->getNbSegment();
+    uint64_t * segPts = new uint64_t[numOfSegs];
+    for(int i=0; i<numOfSegs; i++)
+    {
+        _SEGMENT * seg = video_body->getSegment(i);
+        if (seg)
+            segPts[i] = seg->_startTimeUs;
+        else
+            segPts[i] = ADM_NO_PTS;
+    }
+    UI_setSegments(numOfSegs, segPts);
+    delete [] segPts;
     // progress bar
     GUI_setCurrentFrameAndTime(0);
 }
@@ -435,30 +584,23 @@
 */
 bool A_jumpToTime(uint32_t hh,uint32_t mm,uint32_t ss,uint32_t ms)
 {
-    uint64_t pts;
+    uint64_t pts, total = video_body->getVideoDuration();
+    if(!total) return false;
+
     pts=hh*3600+mm*60+ss;
     pts*=1000;
     pts+=ms;
     pts*=1000;
-    if(pts > video_body->getVideoDuration())
-    {
-        ADM_warning("Cannot navigate beyond the end of the video\n");
-        return false;
-    }
-    uint64_t lastpts=pts;
-    if(false==video_body->getNKFramePTS(&lastpts)) // at the end of the video, be careful
-    {
-        if(false==video_body->getPKFramePTS(&lastpts))
-            return false;
-        GUI_infiniteForward(lastpts);
-        lastpts=admPreview::getCurrentPts();
-        if(pts>=lastpts) // if at or beyond the last frame but within the total duration
-            return GUI_GoToTime(lastpts); // go to the last frame
-    }
+
+    pts++;
+    if(pts >= total)
+        pts = total-1;
     if(false==GUI_lastFrameBeforePts(pts)) // we are probably at the beginning of the video,
+    {
         video_body->rewind(); // go to the first frame then
-    admPreview::samePicture();
-    GUI_setCurrentFrameAndTime();
+        admPreview::samePicture();
+        GUI_setCurrentFrameAndTime();
+    }
     return true;
 }
 /**
@@ -483,6 +625,209 @@
 }
 
 /**
+    \fn GUI_SeekByTime
+*/
+bool GUI_CoarseSeekByTime(int64_t time)
+{
+    uint64_t pts=admPreview::getCurrentPts();
+
+    if (time < 0 && pts < -time)
+    {   // we can't assume that pts=0 were legitimate, rewind to the first frame instead
+        video_body->rewind();
+        admPreview::samePicture();
+        GUI_setCurrentFrameAndTime();
+        return true;
+    }else
+    {
+        pts += time;
+    }
+    uint64_t totalDuration = video_body->getVideoDuration();
+    if(pts>totalDuration) pts=totalDuration;
+    ADM_info("Coarse Seek to:%s ms \n",ADM_us2plain(pts));
+    if (time >= 0)
+    {
+        if(false==video_body->getNKFramePTS(&pts))
+        {
+            ADM_warning("Cannot seek to %" PRIu64" ms\n",pts/1000);
+            return false;
+        }
+    }
+    else
+    {
+        if(false==video_body->getPKFramePTS(&pts))
+        {
+            ADM_warning("Cannot seek to %" PRIu64" ms\n",pts/1000);
+            return false;
+        }
+    }
+    ADM_info("Actual Seeking to  Time:%s ms \n",ADM_us2plain(pts));
+    if(false==admPreview::seekToIntraPts(pts))
+    {
+        ADM_warning("Coarse Seeking: Seeking to intra at %" PRIu64" ms failed\n",pts/1000);
+        return false;
+    }
+    GUI_setCurrentFrameAndTime();
+    UI_purge();
+    return true;
+}
+
+
+/**
+    \fn GUI_PrevCutPoint
+*/
+void GUI_PrevCutPoint()
+{
+    if (playing)
+        return;
+    if (!avifileinfo)
+        return;
+
+    uint64_t pts=admPreview::getCurrentPts();
+    uint64_t last_prev_pts=ADM_NO_PTS;
+    int segNo, numOfSegs = video_body->getNbSegment();
+    for(int i=1; i<numOfSegs; i++) // we are not interested in the first segment
+    {
+        _SEGMENT * seg = video_body->getSegment(i);
+        if (seg)
+        {
+            if (seg->_startTimeUs < pts)
+            {
+                last_prev_pts = seg->_startTimeUs;
+                segNo = i;
+            } else
+                break;
+        }
+    }
+
+    if (last_prev_pts == ADM_NO_PTS)
+        return;
+
+    ADM_info("Seeking to cut point at %s ms\n",ADM_us2plain(last_prev_pts));
+
+    // Can we use a fast lane?
+    uint64_t tmp = video_body->getFirstFrameInSegmentPts(segNo);
+    if(tmp != ADM_NO_PTS && admPreview::seekToTime(tmp))
+    {
+        GUI_setCurrentFrameAndTime();
+        return;
+    }
+    // Does the start time of the segment match a keyframe?
+    tmp = last_prev_pts + 1;
+    bool gotPreviousKeyFrame = video_body->getPKFramePTS(&tmp);
+    if (gotPreviousKeyFrame && tmp == last_prev_pts)
+    {
+        if(admPreview::seekToIntraPts(last_prev_pts))
+            GUI_setCurrentFrameAndTime();
+        return;
+    }
+    // Nope, seek to the previous keyframe and decode from there
+    // until we have crossed the segment boundary.
+    admPreview::deferDisplay(true);
+    if (gotPreviousKeyFrame)
+    {
+        if (false == admPreview::seekToIntraPts(tmp))
+        {
+            admPreview::deferDisplay(false);
+            return;
+        }
+    } else // no keyframe before the cut point
+    {
+        video_body->rewind();
+    }
+    while (admPreview::nextPicture())
+    {
+        tmp = admPreview::getCurrentPts();
+        if (!tmp || tmp == ADM_NO_PTS)
+        { // should never happen, try not to crash in admPreview::samePicture
+            video_body->rewind();
+            break;
+        }
+        if (tmp >= last_prev_pts) // we've crossed the segment boundary
+            break;
+    }
+    admPreview::deferDisplay(false);
+    admPreview::samePicture();
+    GUI_setCurrentFrameAndTime();
+}
+
+/**
+    \fn GUI_NextCutPoint
+*/
+void GUI_NextCutPoint()
+{
+    if (playing)
+        return;
+    if (!avifileinfo)
+        return;
+
+    uint64_t pts=admPreview::getCurrentPts();
+    uint64_t first_next_pts=ADM_NO_PTS;
+    int segNo, numOfSegs = video_body->getNbSegment();
+    for(int i=1; i<numOfSegs; i++)
+    {
+        _SEGMENT * seg = video_body->getSegment(i);
+        if (seg)
+        {
+            if (seg->_startTimeUs > pts)
+            {
+                first_next_pts = seg->_startTimeUs;
+                segNo = i;
+                break;
+            }
+        }
+    }
+
+    if (first_next_pts == ADM_NO_PTS)
+        return;
+
+    ADM_info("Seeking to cut point at %s ms\n",ADM_us2plain(first_next_pts));
+
+    // Can we use the fast lane?
+    uint64_t tmp = video_body->getFirstFrameInSegmentPts(segNo);
+    if(tmp != ADM_NO_PTS && admPreview::seekToTime(tmp))
+    {
+        GUI_setCurrentFrameAndTime();
+        return;
+    }
+
+    // Does the start time of the segment match a keyframe?
+    tmp = first_next_pts + 1;
+    bool gotPreviousKeyFrame = video_body->getPKFramePTS(&tmp);
+    if (gotPreviousKeyFrame && tmp == first_next_pts)
+    {
+        if(admPreview::seekToIntraPts(first_next_pts))
+            GUI_setCurrentFrameAndTime();
+        return;
+    }
+    // Nope, seek to the last keyframe before the cut point if it is after
+    // the current position and decode from there until we have crossed
+    // the segment boundary.
+    admPreview::deferDisplay(true);
+    if (gotPreviousKeyFrame && tmp > pts)
+    {
+        if (false == admPreview::seekToIntraPts(tmp))
+        {
+            admPreview::deferDisplay(false);
+            return;
+        }
+    }
+    while (admPreview::nextPicture())
+    {
+        tmp = admPreview::getCurrentPts();
+        if (!tmp || tmp == ADM_NO_PTS)
+        { // should never happen, try not to crash in admPreview::samePicture
+            video_body->rewind();
+            break;
+        }
+        if (tmp >= first_next_pts) // we've crossed the segment boundary
+            break;
+    }
+    admPreview::deferDisplay(false);
+    admPreview::samePicture();
+    GUI_setCurrentFrameAndTime();
+}
+
+/**
     \fn GUI_GoToTime
 */
 bool GUI_GoToTime(uint64_t time)
@@ -534,30 +879,35 @@
     uint64_t tmp=pts;
     uint64_t current=admPreview::getCurrentPts();
     // Try to find a keyframe just before pts...
-    if(video_body->getPKFramePTS(&tmp))
+    if(!video_body->getPKFramePTS(&tmp))
+        return false;
+
+    if(tmp<=current && pts>current) // within the same GOP, seeking forward
+        tmp=current; // no need to go back to the keyframe
+    else if(!video_body->goToTimeVideo(tmp))
+        return false;
+
+    // Starting from tmp, approach the last frame before pts
+    admPreview::deferDisplay(true);
+    bool stepBack = false;
+    while(true)
     {
-        bool r=true;
-        if(tmp<=current && pts>current) // within the same GOP, seeking forward
-            tmp=current; // no need to go back to the keyframe
-        else
-            r=video_body->goToTimeVideo(tmp);
-        // Starting from tmp, approach the last frame before pts
-        if(r)
-        {
-            admPreview::deferDisplay(1);
-            uint64_t inc=video_body->getFrameIncrement();
-            while(tmp+inc <= pts) // otherwise we may overshoot
-            {
-                admPreview::nextPicture();
-                tmp=admPreview::getCurrentPts();
-            }
-            admPreview::deferDisplay(0);
-            admPreview::samePicture();
-            GUI_setCurrentFrameAndTime();
-            return true;
-        }
+        stepBack = admPreview::nextPicture();
+        if(!stepBack)
+            break;
+        tmp = admPreview::getCurrentPts();
+        if(tmp == ADM_NO_PTS)
+            break;
+        if(tmp >= pts)
+            break;
     }
-    return false;
+    if(stepBack)
+        admPreview::previousPicture();
+    admPreview::deferDisplay(false);
+    admPreview::samePicture();
+    GUI_setCurrentFrameAndTime();
+
+    return true;
 }
 
 /**
@@ -565,15 +915,19 @@
  * \brief display error unless the last error is too recent
  * @param s
  */
-void A_timedError(bool force, const char *s)
+void A_timedError(bool *first, const char *s)
 {
-    if(force || NaggingCountDown.done()) // else still running, do not nag
+    if(*first || NaggingCountDown.done()) // else still running, do not nag
     {
+        if(UI_navigationButtonsPressed()) // probably auto-repeat in action
+            return;
         NaggingCountDown.reset();
+        *first = false;
         GUI_Error_HIG(QT_TRANSLATE_NOOP("navigate","Error"),s);
         return;
     }
     NaggingCountDown.reset();
+    *first = false;
 }
 
 // EOF

avidemux_2.7.8.tar.gz/avidemux/common/gui_play.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/gui_play.cpp Changed

@@ -157,9 +157,11 @@
     // might not be matching a source video time => PROBLEM
     // Go back to the beginning to be on safe ground
     // In copy mode, we can keep the current position
-    if(getPreviewMode()!=ADM_PREVIEW_NONE)
+    if(ADM_PREVIEW_NONE != admPreview::getPreviewMode())
+    {
+        UI_displayZoomLevel();
         admPreview::seekToTime(oldTimeFrame);
-    else
+    }else
     {
         if(false==admPreview::seekToTime(newTimeFrame))
             admPreview::nextPicture();
@@ -219,12 +221,12 @@
     prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
 
     firstPts=admPreview::getCurrentPts();
-    if(getPreviewMode()==ADM_PREVIEW_NONE) // copy
+    if(ADM_PREVIEW_NONE == admPreview::getPreviewMode()) // copy
     {
-        videoChain=createEmptyVideoFilterChain(firstPts,1000*1000*1000*1000LL); 
+        videoChain=createEmptyVideoFilterChain(firstPts,ADM_NO_PTS);
     }else
     {
-        videoChain=createVideoFilterChain(firstPts,1000*1000*1000*1000LL); 
+        videoChain=createVideoFilterChain(firstPts,ADM_NO_PTS);
     }
     if(!videoChain)
     {
@@ -239,10 +241,13 @@
     // if the video output has same width/height as input, we keep the same zoom
     aviInfo originalVideo;
     video_body->getVideoInfo(&originalVideo);
-    if(info->width==originalVideo.width && info->height==originalVideo.height)
+    bool keepZoom = info->width == originalVideo.width && info->height == originalVideo.height;
+    if(keepZoom)
         zoom=currentZoom;
     //
     admPreview::setMainDimension(info->width,info->height,zoom);
+    if(ADM_PREVIEW_NONE != admPreview::getPreviewMode() && !keepZoom)
+        UI_displayZoomLevel();
     initializeAudio();
     return true;
 }
@@ -255,6 +260,8 @@
 
     uint32_t movieTime;
     uint32_t systemTime;
+    uint32_t lastUIpurgeTime = 0;
+    int32_t delta;
     uint32_t fn;
     bool gotAudio=true;
     bool first=true;
@@ -265,6 +272,8 @@
     ADMImage *previewBuffer=admPreview::getBuffer();
     ADM_HW_IMAGE hwImageFormat=admPreview::getPreferedHwImageFormat();
 
+    UI_setFrameType(CLEAR_FRAME_TYPE, ADM_IMAGE_UNKNOWN_QP);
+
     do
     {
         if(!first)
@@ -308,12 +317,12 @@
             {
                 UI_purge();
                 UI_purge();
+                lastUIpurgeTime = systemTime;
                 refreshCounter=0;
             }
         }
         else
         {
-        int32_t delta;
             delta=(int32_t)movieTime-(int32_t)systemTime;
             // a call to whatever sleep function will last at leat 10 ms
             // give some time to GTK
@@ -335,11 +344,19 @@
                 }
 
                 UI_purge();
+                lastUIpurgeTime = systemTime;
                 refreshCounter=0;
                 systemTime = ticktock.getElapsedMS();
                 delta=(int32_t)movieTime-(int32_t)systemTime;
             }
         }
+        
+        delta=(int32_t)systemTime-(int32_t)lastUIpurgeTime;
+        if (delta > 33)	// ~ 30 Hz rate
+        {
+            UI_purge();
+            lastUIpurgeTime = systemTime;
+        }
     }
     while (!stop_req);
     return true;
@@ -379,8 +396,8 @@
              {
                   if(status==AUD_END_OF_STREAM)
                   {
-                      uint32_t stat[8]={0};
-                      UI_setVUMeter(stat);
+                      int32_t inactiveVolume[8]={255,255,255,255,255,255,255,255};
+                      UI_setVUMeter(inactiveVolume);
                       return false;
                   }
                   if(errorMet==false)
@@ -438,9 +455,6 @@
     fill+=small_;
 
      state = AVDM_AudioSetup(frequency,  channels ,playbackAudio->getChannelMapping());
-     latency=AVDM_GetLayencyMs();
-     printf("[Playback] Latency : %d ms\n",latency);
-     audioLatency=latency; // ms -> us
       if (!state)
       {
           GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Trouble initializing audio device"), NULL);
@@ -459,6 +473,8 @@
     // Let audio latency sets in...
     ticktock.reset();
     AVDM_AudioPlay(wavbuf, fill);
+    audioLatency = AVDM_GetLayencyMs();
+    printf("[GUIPlayback::initializeAudio] Initial latency : %" PRIu64" ms\n",audioLatency);
     updateVu();
 #if 0
     uint32_t slice=(frequency * channels)/100; // 10 ms
@@ -494,7 +510,7 @@
     if(!playbackAudio)  return true;
     if(time>(vuMeterPts+wait))
     {
-        uint32_t stat[8];
+        int32_t stat[8];
         AVDM_getStats(stat);
         UI_setVUMeter(stat);
         vuMeterPts=time;

avidemux_2.7.8.tar.gz/avidemux/common/gui_save.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/gui_save.cpp Changed

@@ -257,11 +257,11 @@
   uint32_t hold,len,sample;
   uint64_t tgt_sample,cur_sample;
 
+   printf("[saveAudio] Duration: %s, ",ADM_us2plain(duration));
    duration*=stream->getInfo()->frequency;
    duration/=1000000; // in seconds to have samples
    tgt_sample=(uint64_t)floor(duration);
-   printf("[saveAudio]Duration:%f ms\n",duration/1000);
-   printf("[saveAudio]Samples:%" PRIu64" ms\n",tgt_sample);
+   printf("%" PRIu64" samples.\n",tgt_sample);
 
    cur_sample=0;
    written = 0;
@@ -296,7 +296,7 @@
   delete saver;
   delete work;
   delete[] buffer;
-  ADM_info ("\n wanted %" PRIu64" samples, goto %" PRIu64" samples, written %" PRIu32" bytes\n", tgt_sample,cur_sample, written);
+  ADM_info ("wanted %" PRIu64" samples, got %" PRIu64" samples, written %" PRIu32" bytes\n", tgt_sample,cur_sample, written);
   return true;
 }
 
@@ -452,7 +452,7 @@
 {
     bool result=true;
     bool fromDisplayBuffer=false;
-    if(getPreviewMode()==ADM_PREVIEW_NONE)
+    if(ADM_PREVIEW_NONE == admPreview::getPreviewMode())
         fromDisplayBuffer=true;
     ADMImage *image;
     image=NULL;
@@ -516,7 +516,7 @@
     ADM_HW_IMAGE hw=admPreview::getPreferedHwImageFormat();
 
     ADM_videoFilterChain *chain;
-    if(getPreviewMode()==ADM_PREVIEW_NONE)
+    if(ADM_PREVIEW_NONE == admPreview::getPreviewMode())
         chain=createEmptyVideoFilterChain(start,end);
     else
         chain=createVideoFilterChain(start,end);
@@ -598,7 +598,7 @@
 {
     bool result=true;
     bool fromDisplayBuffer=false;
-    if(getPreviewMode()==ADM_PREVIEW_NONE)
+    if(ADM_PREVIEW_NONE == admPreview::getPreviewMode())
         fromDisplayBuffer=true;
     ADMImage *image;
     image=NULL;
@@ -627,7 +627,7 @@
 {
     bool result=true;
     bool fromDisplayBuffer=false;
-    if(getPreviewMode()==ADM_PREVIEW_NONE)
+    if(ADM_PREVIEW_NONE == admPreview::getPreviewMode())
         fromDisplayBuffer=true;
     ADMImage *image;
     image=NULL;

avidemux_2.7.8.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/gui_savenew.cpp Changed

@@ -115,9 +115,11 @@
             ADM_warning("Too much audio tracks, limiting to %d\n",ADM_MAX_AUDIO_STREAM);
             nbAudioTracks=ADM_MAX_AUDIO_STREAM;
         }
-        fileName=std::string(out);
-        logFileName=fileName;
-        logFileName+=std::string(".stats");
+        fileName = out;
+        logFileName = out;
+        logFileName += ".";
+        logFileName += videoEncoder6_GetCurrentEncoderName();
+        logFileName += ".stats";
         muxer=NULL;
         chain=NULL;
         audio=NULL;
@@ -206,7 +208,9 @@
             return NULL;
         }
         muxer->createUI(videoDuration);
-        muxer->getEncoding()->setPhasis("Pass 1"); // don't make it translatable here, this is done in the encoding dialog
+        muxer->getEncoding()->setFileName(logFileName.c_str()); // just being honest, the muxer will update it later
+        muxer->getEncoding()->setLogFileName(logFileName.c_str()); // needed for cleanup afterwards
+        muxer->getEncoding()->setPhase(ADM_ENC_PHASE_FIRST_PASS,NULL);
 
         ADMBitstream bitstream;
         uint8_t *buffer=new uint8_t[BUFFER_SIZE];
@@ -507,13 +511,12 @@
         }
     if(false==setupAudio())
     {
-        if(video) delete video;
-        if(muxer) delete muxer;
+        delete video;
+        video=NULL;
+        delete muxer;
         muxer=NULL;
         return false;
     }
-   
-   
     if(!muxer->open(fileName.c_str(),video,nbAudioTracks,audioAccess))
     {
         GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Muxer"),QT_TRANSLATE_NOOP("adm","Cannot open "));
@@ -523,9 +526,9 @@
         if(false==muxer->close())
             ret=false;
     }
-
-    if(video)
-        delete video;
+    delete muxer;
+    muxer=NULL;
+    delete video;
     video=NULL;
     for(int i=0;i<nbAudioTracks;i++)
     {

avidemux_2.7.8.tar.gz/avidemux/common/main.cpp -> avidemux_2.8.0.tar.gz/avidemux/common/main.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/osxInstaller/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/osxInstaller/CMakeLists.txt Changed

@@ -1,14 +1,27 @@
-#
-
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.6)
+project("AvidemuxBundle")
 MESSAGE(STATUS  "* Start *")
-#
-set(BU_CHMOD_BUNDLE_ITEMS ON)
-SET(BU_COPY_FULL_FRAMEWORK_CONTENTS ON)
-#
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../cmake" "${CMAKE_MODULE_PATH}")
-include(DeployQt5)
-include(admCheckQt5)
+
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_SOURCE_DIR}/../../cmake" "${CMAKE_MODULE_PATH}")
+
+include(admCheckQt)
+
+IF(ENABLE_QT6)
+        MESSAGE(STATUS  "* Checking Qt6 *")
+ELSE(ENABLE_QT6)
+        IF(ENABLE_QT5)
+                MESSAGE(STATUS "* Checking Qt5 *")
+        ELSE(ENABLE_QT5)
+                MESSAGE(FATAL_ERROR "Unsupported Qt version requested")
+        ENDIF(ENABLE_QT5)
+ENDIF(ENABLE_QT6)
+
+checkQt()
+
+IF(NOT QT_FOUND)
+        MESSAGE(FATAL_ERROR "Qt not found")
+ENDIF(NOT QT_FOUND)
+
 include(avidemuxVersion)
 
 #
@@ -16,28 +29,19 @@
 SET(BUNDLE "${CMAKE_BINARY_DIR}/${BUNDLE_NAME}")
 SET(RESOURCES  "${BUNDLE}/Contents/Resources")
 SET(ORIGINAL  "${CMAKE_BINARY_DIR}/../Avidemux${AVIDEMUX_MAJOR_MINOR}.app")
-
-#
-
-macro(makeLink src dest pwd)
-  MESSAGE(STATUS " Creating symlink")
-  MESSAGE( STATUS " COMMAND ln -sf ${src} ${dest} COMMENT mklink ${src} -> ${dest}, pwd=${pwd}")
-  execute_process( COMMAND ln -sf ${src} ${dest} 
-                   WORKING_DIRECTORY ${pwd})
-endmacro()
-
-MESSAGE(STATUS  "* Checking QT5 *")
-#
-checkQt5()
 #
 # Copy the skeleton, other files will be pulled automatically
 #
 FILE(MAKE_DIRECTORY "${BUNDLE}")
 FILE(MAKE_DIRECTORY "${BUNDLE}/Contents")
 FILE(MAKE_DIRECTORY "${BUNDLE}/Contents/MacOS")
-FILE(MAKE_DIRECTORY "${BUNDLE}/Contents/Resources/")
+FILE(MAKE_DIRECTORY "${BUNDLE}/Contents/Resources")
 # 
 LIST(APPEND bundleDirs  "${BUNDLE}/Contents/Resources/lib")
+IF(ENABLE_QT6)
+    # A gross hack to work around the failure to resolve @loader_path for libbrotli.
+    LIST(APPEND bundleDirs "/usr/local/lib")
+ENDIF(ENABLE_QT6)
 #
 
 #
@@ -49,14 +53,21 @@
 FILE(COPY  "${ORIGINAL}/Contents/Info.plist"                          DESTINATION "${BUNDLE}/Contents/")
 FILE(COPY  "${ORIGINAL}/Contents/Resources/lib"                       DESTINATION "${BUNDLE}/Contents/Resources/")
 
+include(linkMacro)
 
 makeLink("Resources/lib"  "." ${BUNDLE}/Contents/)
 #
 MESSAGE(STATUS "* Copying plugins *")
 #
-FILE(COPY  "${QT_PLUGINS_DIR}/platforms" DESTINATION "${CMAKE_BINARY_DIR}/${BUNDLE_NAME}/Contents/PlugIns/")
+FILE(COPY "${QT_PLUGINS_DIR}/platforms" DESTINATION "${BUNDLE}/Contents/PlugIns/" DIRECTORY_PERMISSIONS
+    OWNER_WRITE OWNER_READ OWNER_EXECUTE
+    GROUP_WRITE GROUP_READ GROUP_EXECUTE
+    WORLD_WRITE WORLD_READ WORLD_EXECUTE)
 IF(EXISTS "${QT_PLUGINS_DIR}/styles")
-        FILE(COPY "${QT_PLUGINS_DIR}/styles" DESTINATION "${CMAKE_BINARY_DIR}/${BUNDLE_NAME}/Contents/PlugIns/")
+    FILE(COPY "${QT_PLUGINS_DIR}/styles" DESTINATION "${BUNDLE}/Contents/PlugIns/" DIRECTORY_PERMISSIONS
+        OWNER_WRITE OWNER_READ OWNER_EXECUTE
+        GROUP_WRITE GROUP_READ GROUP_EXECUTE
+        WORLD_WRITE WORLD_READ WORLD_EXECUTE)
 ENDIF(EXISTS "${QT_PLUGINS_DIR}/styles")
 # Update Qt plugins
 #
@@ -87,20 +98,6 @@
 LIST(APPEND all ${myPlugins})
 LIST(APPEND all ${all_adm_plugin})
 MESSAGE(STATUS "Plugin to fix : ${all}")
-FIXUP_BUNDLE("${BUNDLE}" "${all}" "${bundleDirs}" IGNORE_ITEM "python3;python3.7m;python3.7;Python")
-FILE(GLOB lbs "${BUNDLE}/Contents/MacOS/libADM_core*")
-IF(lbs)
-    MESSAGE(STATUS "Libs are in ${BUNDLE}/Contents/MacOS")
-    SET(LIBS_LOCATION "MacOS")
-ELSE(lbs)
-    MESSAGE(STATUS "Libs are in ${BUNDLE}/Contents/Frameworks")
-    SET(LIBS_LOCATION "Frameworks")
-ENDIF(lbs)
-# Now we can move the old libs
-MESSAGE(STATUS " * Cleanup * ")
-FILE(REMOVE_RECURSE  "${BUNDLE}/Contents/lib")
-FILE(REMOVE_RECURSE  "${BUNDLE}/Contents/Resources/lib")
-makeLink("MacOS"  "lib" ${BUNDLE}/Contents/)
 
 # Create Qt.conf
 SET(QT_CONF "${BUNDLE}/Contents/Resources/qt.conf")
@@ -113,7 +110,7 @@
 FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 
 
 # Entice macOS to return correct system language (QTBUG-72491)
-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt5/i18n/avidemux_*.qm")
+FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt${ADM_QT_VERSION}/i18n/avidemux_*.qm")
 FOREACH(lang ${ListOfTranslationFiles})
     STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")
     STRING(REPLACE ".qm" "" lang "${lang}")
@@ -121,52 +118,22 @@
     FILE(MAKE_DIRECTORY "${BUNDLE}/Contents/Resources/${lang}.lproj")
 ENDFOREACH(lang ${ListOfTranslationFiles})
 
-# Partially relink libADM_dm_vapoursynth.dylib
-# Using default link location because versioned paths from VAPOURSYNTHSCRIPT_LDFLAGS
-# would result in each minor VapourSynth upgrade breaking the demuxer.
-FILE(GLOB dmvs "${BUNDLE}/Contents/MacOS/ADM_plugins6/demuxers/libADM_dm_vapoursynth.dylib")
-IF(dmvs)
-    SET(HOMEBREW_PREFIX "/usr/local")
-    MESSAGE(STATUS "Relinking ${dmvs}")
-    EXECUTE_PROCESS(COMMAND install_name_tool -change "@executable_path/../${LIBS_LOCATION}/libvapoursynth.dylib"
-        "${HOMEBREW_PREFIX}/lib/libvapoursynth.dylib" "${dmvs}")
-    EXECUTE_PROCESS(COMMAND install_name_tool -change "@executable_path/../${LIBS_LOCATION}/libvapoursynth-script.0.dylib"
-        "${HOMEBREW_PREFIX}/lib/libvapoursynth-script.0.dylib" "${dmvs}")
-ENDIF(dmvs)
-
-# Remove Python and libvapoursynth*, the former can't be relinked and we end up using external versions anyway.
-FILE(GLOB pyth "${BUNDLE}/Contents/Frameworks/Python.framework")
-IF(pyth)
-        MESSAGE(STATUS "Removing Python")
-        FILE(REMOVE_RECURSE "${pyth}")
-ENDIF(pyth)
-FILE(GLOB vs "${BUNDLE}/Contents/${LIBS_LOCATION}/libvapoursynth*" "${BUNDLE}/Contents/${LIBS_LOCATION}/libzimg*")
-FOREACH(v ${vs})
-        MESSAGE(STATUS "Removing ${v}")
-        FILE(REMOVE "${v}")
-ENDFOREACH(v ${vs})
-
-# Remove the copies of Qt lib in framework, we only keep "5"
-FILE(GLOB  frameworks "${BUNDLE}/Contents/Frameworks/*")
-MESSAGE(STATUS "Frameworks to clean : ${frameworks}")
-FOREACH(frame ${frameworks})
-        MESSAGE(STATUS "    Cleaning ${frame}")
-        FILE(REMOVE_RECURSE  "${frame}/Headers")
-        FILE(GLOB  qtop      "${frame}/Qt*")
-        FOREACH(q ${qtop})
-                MESSAGE(STATUS "  >${q}")
-                FILE(REMOVE    "${q}")
-        ENDFOREACH(q ${qtop})
-        FILE(REMOVE_RECURSE  "${frame}/Versions/Current")
-        FILE(REMOVE_RECURSE  "${frame}/Versions/5/Headers")
-        # Create symlinks ?
-ENDFOREACH(frame ${frameworks})
+# Fixup bundle
+CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/cmake/admFixupBundle.cmake.in" "${CMAKE_BINARY_DIR}/admFixupBundle.cmake" @ONLY)
+INSTALL(SCRIPT "${CMAKE_BINARY_DIR}/admFixupBundle.cmake" COMPONENT Runtime)
 
 #
 MESSAGE(STATUS "* Creating dmg *")
 # Call cpack to create the dmg using the dragndrop installer
 IF(NOT DMG_BASENAME)
         SET(DMG_BASENAME "Avidemux ${AVIDEMUX_VERSION}")
+        IF(ENABLE_QT6)
+                SET(DMG_BASENAME "${DMG_BASENAME} Qt6")
+        ELSE(ENABLE_QT6)
+                IF(ENABLE_QT5)
+                        SET(DMG_BASENAME "${DMG_BASENAME} Qt5")
+                ENDIF(ENABLE_QT5)
+        ENDIF(ENABLE_QT6)
         IF(NOT RELEASE AND BUILD_REV)
                 SET(DMG_BASENAME "${DMG_BASENAME} ${BUILD_REV}")
         ENDIF(NOT RELEASE AND BUILD_REV)
@@ -181,10 +148,11 @@
 SET(CPACK_DMG_FORMAT        "UDBZ")
 SET(CPACK_DMG_VOLUME_NAME   "${CPACK_PACKAGE_FILE_NAME}")
 SET(CPACK_BINARY_DRAGNDROP  ON)
-SET(CPACK_PACKAGE_ICON      "${CMAKE_CURRENT_SOURCE_DIR}/avidemux_dmg.icns")
-INSTALL(DIRECTORY ${BUNDLE} DESTINATION .
-	         USE_SOURCE_PERMISSIONS)
-#
+SET(CPACK_PACKAGE_ICON      "${CMAKE_SOURCE_DIR}/avidemux_dmg.icns")
+
+SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
+INSTALL(DIRECTORY "${BUNDLE}" DESTINATION . COMPONENT Runtime USE_SOURCE_PERMISSIONS)
+
 include(CPack)
 
 MESSAGE(STATUS "* All done *")

avidemux_2.8.0.tar.gz/avidemux/osxInstaller/cmake Added

avidemux_2.8.0.tar.gz/avidemux/osxInstaller/cmake/admFixupBundle.cmake.in Added

@@ -0,0 +1,62 @@
+SET(CMAKE_MODULE_PATH @CMAKE_MODULE_PATH@)
+include(linkMacro)
+include(BundleUtilities)
+SET(BU_CHMOD_BUNDLE_ITEMS TRUE)
+
+FIXUP_BUNDLE("@BUNDLE@" "@all@" "@bundleDirs@" IGNORE_ITEM "python3;python3.7m;python3.7;Python;")
+
+FILE(GLOB lbs "@BUNDLE@/Contents/MacOS/libADM_core*")
+IF(lbs)
+    MESSAGE(STATUS "Libs are in @BUNDLE@/Contents/MacOS")
+    SET(LIBS_LOCATION "MacOS")
+ELSE(lbs)
+    MESSAGE(STATUS "Libs are in @BUNDLE@/Contents/Frameworks")
+    SET(LIBS_LOCATION "Frameworks")
+ENDIF(lbs)
+# Now we can move the old libs
+MESSAGE(STATUS " * Cleanup * ")
+FILE(REMOVE_RECURSE "@BUNDLE@/Contents/lib")
+FILE(REMOVE_RECURSE "@BUNDLE@/Contents/Resources/lib")
+
+makeLink("MacOS" "lib" "@BUNDLE@/Contents/")
+
+# Partially relink libADM_dm_vapoursynth.dylib
+# Using default link location because versioned paths from VAPOURSYNTHSCRIPT_LDFLAGS
+# would result in each minor VapourSynth upgrade breaking the demuxer.
+FILE(GLOB dmvs "@BUNDLE@/Contents/MacOS/ADM_plugins6/demuxers/libADM_dm_vapoursynth.dylib")
+IF(dmvs)
+    SET(HOMEBREW_PREFIX "/usr/local")
+    MESSAGE(STATUS "Relinking ${dmvs}")
+    EXECUTE_PROCESS(COMMAND install_name_tool -change "@executable_path/../${LIBS_LOCATION}/libvapoursynth.dylib"
+        "${HOMEBREW_PREFIX}/lib/libvapoursynth.dylib" "${dmvs}")
+    EXECUTE_PROCESS(COMMAND install_name_tool -change "@executable_path/../${LIBS_LOCATION}/libvapoursynth-script.0.dylib"
+        "${HOMEBREW_PREFIX}/lib/libvapoursynth-script.0.dylib" "${dmvs}")
+ENDIF(dmvs)
+
+# Remove Python and libvapoursynth*, the former can't be relinked and we end up using external versions anyway.
+FILE(GLOB pyth "@BUNDLE@/Contents/Frameworks/Python.framework")
+IF(pyth)
+        MESSAGE(STATUS "Removing Python")
+        FILE(REMOVE_RECURSE "${pyth}")
+ENDIF(pyth)
+FILE(GLOB vs "@BUNDLE@/Contents/${LIBS_LOCATION}/libvapoursynth*" "@BUNDLE@/Contents/${LIBS_LOCATION}/libzimg*")
+FOREACH(v ${vs})
+        MESSAGE(STATUS "Removing ${v}")
+        FILE(REMOVE "${v}")
+ENDFOREACH(v ${vs})
+
+# Remove the copies of Qt lib in framework, we only keep "5"
+FILE(GLOB  frameworks "@BUNDLE@/Contents/Frameworks/*")
+MESSAGE(STATUS "Frameworks to clean : ${frameworks}")
+FOREACH(frame ${frameworks})
+        MESSAGE(STATUS "    Cleaning ${frame}")
+        FILE(REMOVE_RECURSE  "${frame}/Headers")
+        FILE(GLOB  qtop      "${frame}/Qt*")
+        FOREACH(q ${qtop})
+                MESSAGE(STATUS "  >${q}")
+                FILE(REMOVE    "${q}")
+        ENDFOREACH(q ${qtop})
+        FILE(REMOVE_RECURSE  "${frame}/Versions/Current")
+        FILE(REMOVE_RECURSE  "${frame}/Versions/@ADM_QT_VERSION@/Headers")
+        # Create symlinks ?
+ENDFOREACH(frame ${frameworks})
\ No newline at end of file

avidemux_2.8.0.tar.gz/avidemux/osxInstaller/cmake/linkMacro.cmake Added

avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/include/ADM_QSettings.h Added

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h Changed

@@ -40,6 +40,7 @@
 #include "ADM_coreVideoFilter.h"
 #include "ADM_imageResizer.h"
 #define ADM_FLY_SLIDER_MAX 1000
+#define ADM_FLYRGB_ALGO_CHANGE_THRESHOLD_RESOLUTION 720
 
 enum ResizeMethod 
 {
@@ -48,6 +49,28 @@
     RESIZE_LAST = 2        // Resize image after filter has been applied (slower for RGB)
 };
 
+enum class ControlOption
+{
+    None = 0,
+    PeekOriginalBtn = 1 << 0,
+    UserWidgetAfterControls = 1 << 1,
+    UserWidgetBeforePeekBtn = 1 << 2,
+    UserWidgetAfterPeekBtn = 1 << 3
+};
+
+inline ControlOption operator|(ControlOption a, ControlOption b)
+{
+    return static_cast<ControlOption>(static_cast<int>(a) | static_cast<int>(b));
+}
+inline ControlOption operator+(ControlOption a, ControlOption b)
+{
+    return static_cast<ControlOption>(static_cast<int>(a) + static_cast<int>(b));
+}
+inline int operator&(ControlOption a, ControlOption b)
+{
+    return (static_cast<int>(a) & static_cast<int>(b));
+}
+
 class ADM_flyDialog;
 
 class QHBoxLayout;
@@ -67,6 +90,7 @@
         ~ADM_QCanvas();
         void paintEvent(QPaintEvent *ev);
         void changeSize(uint32_t w, uint32_t h);
+        void getDisplaySize(uint32_t *w, uint32_t *h);
 };
 
 class flyControl;
@@ -86,6 +110,7 @@
           uint64_t      lastPts;
           double        _computedZoom;
           int           _usedWidth, _usedHeight;
+          int           _oldViewWidth, _oldViewHeight;
           int           _frameIncrement; // time between image in ms
           Clock         _clock;
           int           _nextRdv;
@@ -98,6 +123,7 @@
           flyControl  *_control;
           std::vector<QWidget *> buttonList; // useful for manipulating tab order
           QDialog     *_parent;
+          bool         _bypassFilter;
 
 
 
@@ -116,9 +142,9 @@
           virtual bool       sameImage(void);
                   uint64_t   getCurrentPts();
           ADM_coreVideoFilter *getUnderlyingFilter() {return _in;}
-                  bool        addControl(QHBoxLayout *layout);
+                  bool        addControl(QHBoxLayout *layout, ControlOption controlOptions = ControlOption::None, QWidget * userWidget = NULL);
 protected:
-  virtual ADM_colorspace     toRgbColor(void);
+  virtual ADM_pixelFormat     toRgbPixFrmt(void);
           void               updateZoom(void);
           void               EndConstructor(void);
           uint8_t            cleanup(void);  
@@ -161,6 +187,8 @@
         virtual void backOneMinute(void);
         virtual void fwdOneMinute(void);
         virtual void play(bool status);
+        virtual void peekOriginalPressed(void);
+        virtual void peekOriginalReleased(void);
         virtual void timeout(void);
         virtual void adjustCanvasPosition(void);
         virtual void fitCanvasIntoView(uint32_t width, uint32_t height);
@@ -192,6 +220,9 @@
 class ADM_UIQT46_EXPORT ADM_flyDialogRgb: public  ADM_flyDialog
 {
   Q_OBJECT
+protected:
+                    ADMColorScaler_algo _algo;
+                    uint64_t           _scaledPts;
 public:
                     ADM_byteBuffer     _rgbByteBuffer;
                     ADM_byteBuffer     _rgbByteBufferOut;

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/CMakeLists.txt Changed

@@ -1,40 +1,77 @@
-include(admOpenGl)
-SET(ADM_LIB ADM_UI${QT_LIBRARY_EXTENSION}6)
-
-ADM_QT_WRAP_CPP(${ADM_LIB}_source
-        T_bitrate.h  T_button.h  T_dialogFactory.h  T_filesel.h  T_menu.h  T_slider.h
-        T_threadCount.h  T_timeStamp.h  T_toggle.h  T_notch.h
-        ../include/DIA_flyDialogQt4.h
-)
-
-SET(${ADM_LIB}_T
-        T_bitrate.cpp  T_button.cpp  T_dialogFactory.cpp  T_filesel.cpp  T_menu.cpp
-        T_slider.cpp  T_threadCount.cpp  T_timeStamp.cpp  T_toggle.cpp  T_notch.cpp
-        DIA_flyDialog.cpp
-        T_QCanvas.cpp
-        T_qtFactory.cpp
-        T_RubberControl.cpp
-        T_QSlider.cpp
-)
-if(USE_OPENGL)
-        INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}//ADM_openGL/include/)
-        SET(${ADM_LIB}_T ${${ADM_LIB}_T} T_openGL.cpp)
-endif(USE_OPENGL)
-
-SET(${ADM_LIB}_SRCS
-        FAC_bar.cpp    FAC_frame.cpp  FAC_integer.cpp  FAC_aspectRatio.cpp
-        FAC_float.cpp  FAC_hex.cpp    FAC_readOnlyText.cpp  toolkit.cpp
-        FAC_matrix.cpp  DIA_none.cpp  ${${ADM_LIB}_source}  ${${ADM_LIB}_T})
-
-IF(USE_CUSTOM_TIME_DISPLAY_FONT)
-        ADD_DEFINITIONS("-DUSE_CUSTOM_TIME_DISPLAY_FONT")
-ENDIF(USE_CUSTOM_TIME_DISPLAY_FONT)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
-ADD_LIBRARY(${ADM_LIB} SHARED ${${ADM_LIB}_SRCS})
-SET_TARGET_PROPERTIES(${ADM_LIB} PROPERTIES CXX_VISIBILITY_PRESET hidden)
-SET_TARGET_PROPERTIES(${ADM_LIB} PROPERTIES VISIBLITY_INLINES_HIDDEN True)
-ADM_OPEN_GL(${ADM_LIB})
-TARGET_LINK_LIBRARIES(${ADM_LIB} ADM_core6 ADM_coreUI6 ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ADM_render6_${QT_LIBRARY_EXTENSION} ADM_coreVideoFilter6 ${GL_LIBS})
-ADM_INSTALL_LIB( ${ADM_LIB} )
+include(admOpenGl)
+SET(ADM_LIB ADM_UI${QT_LIBRARY_EXTENSION}6)
+
+ADM_QT_WRAP_CPP(${ADM_LIB}_source
+    T_bitrate.h
+    T_button.h
+    T_dialogFactory.h
+    T_floatResettable.h
+    T_filesel.h
+    T_menu.h
+    T_notch.h
+    T_slider.h
+    T_threadCount.h
+    T_timeStamp.h
+    T_toggle.h
+    ../include/DIA_flyDialogQt4.h
+)
+
+SET(${ADM_LIB}_T
+    DIA_flyDialog.cpp
+    T_bitrate.cpp
+    T_button.cpp
+    T_dialogFactory.cpp
+    T_filesel.cpp
+    T_floatResettable.cpp
+    T_menu.cpp
+    T_notch.cpp
+    T_QCanvas.cpp
+    T_QSlider.cpp
+    T_qtFactory.cpp
+    T_RubberControl.cpp
+    T_slider.cpp
+    T_threadCount.cpp
+    T_timeStamp.cpp
+    T_toggle.cpp
+)
+
+if(USE_OPENGL)
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ADM_openGL/include)
+    SET(${ADM_LIB}_T ${${ADM_LIB}_T} T_openGL.cpp)
+endif(USE_OPENGL)
+
+SET(${ADM_LIB}_SRCS
+    DIA_none.cpp
+    FAC_aspectRatio.cpp
+    FAC_bar.cpp
+    FAC_float.cpp
+    FAC_frame.cpp
+    FAC_hex.cpp
+    FAC_integer.cpp
+    FAC_matrix.cpp
+    FAC_readOnlyText.cpp
+    toolkit.cpp
+    ${${ADM_LIB}_source}
+    ${${ADM_LIB}_T}
+)
+
+IF(USE_CUSTOM_TIME_DISPLAY_FONT)
+    ADD_DEFINITIONS("-DUSE_CUSTOM_TIME_DISPLAY_FONT")
+ENDIF(USE_CUSTOM_TIME_DISPLAY_FONT)
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
+ADD_LIBRARY(${ADM_LIB} SHARED ${${ADM_LIB}_SRCS})
+SET_TARGET_PROPERTIES(${ADM_LIB} PROPERTIES CXX_VISIBILITY_PRESET hidden)
+SET_TARGET_PROPERTIES(${ADM_LIB} PROPERTIES VISIBLITY_INLINES_HIDDEN True)
+ADM_OPEN_GL(${ADM_LIB})
+TARGET_LINK_LIBRARIES(${ADM_LIB}
+    ADM_core6
+    ADM_coreUI6
+    ${QT_QTGUI_LIBRARY}
+    ${QT_QTCORE_LIBRARY}
+    ADM_render6_${QT_LIBRARY_EXTENSION}
+    ADM_coreVideoFilter6
+    ${GL_LIBS}
+)
+ADM_INSTALL_LIB(${ADM_LIB})

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Changed

@@ -35,7 +35,7 @@
 class flyControl
 {
 public:
-        flyControl(QHBoxLayout *horizontalLayout_4)
+        flyControl(QHBoxLayout *horizontalLayout_4, ControlOption controlOptions, QWidget * userWidget)
         {
             
             pushButton_back1mn = new QPushButton();
@@ -82,10 +82,46 @@
 
             horizontalLayout_4->addWidget(currentTime);
             horizontalLayout_4->addWidget(labelDuration);
-            //
+
+            if (controlOptions & ControlOption::UserWidgetAfterControls)
+            {
+                ADM_assert(userWidget != NULL);
+                horizontalLayout_4->addWidget(userWidget);
+                userWidget = NULL;
+            }
+
             QSpacerItem  *horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
             horizontalLayout_4->addItem(horizontalSpacer_4);
 
+            if (controlOptions & ControlOption::UserWidgetBeforePeekBtn)
+            {
+                ADM_assert(userWidget != NULL);
+                horizontalLayout_4->addWidget(userWidget);
+                userWidget = NULL;
+            }
+            
+            if (controlOptions & ControlOption::PeekOriginalBtn)
+            {
+                pushButton_peekOriginal = new QPushButton();
+                pushButton_peekOriginal->setObjectName(QString("pushButton_peekOriginal"));
+                pushButton_peekOriginal->setAutoRepeat(false);
+                pushButton_peekOriginal->setText(QApplication::translate("seekablePreviewDialog", "Peek Original", 0));
+                pushButton_peekOriginal->setToolTip(QApplication::translate("seekablePreviewDialog", "Show unprocessed input", 0));
+
+                horizontalLayout_4->addWidget(pushButton_peekOriginal);
+            }
+            else
+                pushButton_peekOriginal = NULL;
+            
+            if (controlOptions & ControlOption::UserWidgetAfterPeekBtn)
+            {
+                ADM_assert(userWidget != NULL);
+                horizontalLayout_4->addWidget(userWidget);
+                userWidget = NULL;
+            }
+
+            ADM_assert(userWidget == NULL);	// should have been added to layout
+
             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));
@@ -113,6 +149,7 @@
         QPushButton *pushButton_fwd1mn;
         QLineEdit   *currentTime;
         QLabel      *labelDuration;
+        QPushButton *pushButton_peekOriginal;
 };
 
 /**
@@ -120,9 +157,11 @@
 */
 void ADM_flyDialog::updateZoom(void)
 {
-        _rgbByteBufferDisplay.clean();
-        _rgbByteBufferDisplay.setSize(ADM_IMAGE_ALIGN(_zoomW * 4) * _zoomH);
-        resetScaler();
+    uint32_t displayW, displayH;
+    _canvas->getDisplaySize(&displayW, &displayH);
+    _rgbByteBufferDisplay.clean();
+    _rgbByteBufferDisplay.setSize(ADM_IMAGE_ALIGN(displayW * 4) * displayH);
+    resetScaler();
 }
 /**
  * 
@@ -152,8 +191,8 @@
         _zoom = 1;
         _zoomW = _w;
         _zoomH = _h;
-        updateZoom();
         postInit (true);
+        updateZoom();
         sliderChanged();
         return;
     }
@@ -182,8 +221,8 @@
     _zoom = new_zoom;
     _zoomW = new_zoomW;
     _zoomH = new_zoomH;
-    updateZoom();
     postInit (true);
+    updateZoom();
     sliderChanged();
 }
 
@@ -195,14 +234,14 @@
 {
 #define DEL1(x)    if(x) {delete [] x;x=NULL;}
 #define DEL2(x)    if(x) {delete  x;x=NULL;}
-	DEL2(_yuvBuffer);
-	_rgbByteBufferDisplay.clean();
-        if(_control)
-        {
-            delete _control;
-            _control=NULL;
-        }
-	return 1;
+    DEL2(_yuvBuffer);
+    _rgbByteBufferDisplay.clean();
+    if(_control)
+    {
+        delete _control;
+        _control=NULL;
+    }
+    return 1;
 }
 /**
     \fn ~ADM_flyDialog
@@ -210,7 +249,7 @@
 */
 ADM_flyDialog::~ADM_flyDialog(void)
 {
-  cleanup(); 
+    cleanup(); 
 }
 
 /**
@@ -218,8 +257,8 @@
 */
 bool    ADM_flyDialog::goToTime(uint64_t tme)
 {
-     _in->goToTime(tme);
-     return nextImageInternal();
+    _in->goToTime(tme);
+    return nextImageInternal();
 }
 
 /**
@@ -228,10 +267,10 @@
 */
 uint8_t    ADM_flyDialog::sliderChanged(void)
 {
-  uint32_t fn= sliderGet();
-  uint32_t frameNumber;
-  uint32_t len,flags;
-  
+    uint32_t fn= sliderGet();
+    uint32_t frameNumber;
+    uint32_t len,flags;
+
     ADM_assert(_yuvBuffer);
     ADM_assert(_in);
 
@@ -244,34 +283,51 @@
     
 }
 /**
-    \fn toRgbColor
+    \fn toRgbPixFrmt
 */
-ADM_colorspace ADM_flyDialog::toRgbColor(void)
+ADM_pixelFormat ADM_flyDialog::toRgbPixFrmt(void)
 {
-    if(isRgbInverted()) return ADM_COLOR_BGR32A;
-    return ADM_COLOR_RGB32A;
+    if(isRgbInverted()) return ADM_PIXFRMT_BGR32A;
+    return ADM_PIXFRMT_RGB32A;
 }
 /**
  * 
  * @param frame
  * @return 
  */
-bool        ADM_flyDialog::addControl(QHBoxLayout *horizontalLayout_4)
-{
-        _parent->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
-        _control=new flyControl(horizontalLayout_4);
-        QObject::connect(_control->pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
-        QObject::connect(_control->pushButton_back1mn ,SIGNAL(clicked()),this,SLOT(backOneMinute()));
-        QObject::connect(_control->pushButton_fwd1mn ,SIGNAL(clicked()),this,SLOT(fwdOneMinute()));
-        QObject::connect(_control->pushButton_play ,SIGNAL(toggled(bool )),this,SLOT(play(bool)));
+bool        ADM_flyDialog::addControl(QHBoxLayout *horizontalLayout_4, ControlOption controlOptions, QWidget * userWidget)
+{
+    _parent->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
+    _control=new flyControl(horizontalLayout_4, controlOptions, userWidget);
+    _parent->adjustSize(); // force currentTime size calculation
+    _control->currentTime->setTextMargins(0,0,0,0); // counteract Adwaita messing with text margins
+
+    QObject::connect(_control->pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
+    QObject::connect(_control->pushButton_back1mn ,SIGNAL(clicked()),this,SLOT(backOneMinute()));
+    QObject::connect(_control->pushButton_fwd1mn ,SIGNAL(clicked()),this,SLOT(fwdOneMinute()));
+    QObject::connect(_control->pushButton_play ,SIGNAL(toggled(bool )),this,SLOT(play(bool)));
+    if (controlOptions & ControlOption::PeekOriginalBtn)
+    {
+        QObject::connect(_control->pushButton_peekOriginal ,SIGNAL(pressed()),this,SLOT(peekOriginalPressed()));
+        QObject::connect(_control->pushButton_peekOriginal ,SIGNAL(released()),this,SLOT(peekOriginalReleased()));
+    }
+
 
-        buttonList.push_back(_control->pushButton_back1mn);
-        buttonList.push_back(_control->pushButton_play);
-        buttonList.push_back(_control->pushButton_next);
-        buttonList.push_back(_control->pushButton_fwd1mn);
-        buttonList.push_back(_control->currentTime);
+    buttonList.push_back(_control->pushButton_back1mn);
+    buttonList.push_back(_control->pushButton_play);
+    buttonList.push_back(_control->pushButton_next);
+    buttonList.push_back(_control->pushButton_fwd1mn);
+    buttonList.push_back(_control->currentTime);
+    if ((controlOptions & ControlOption::UserWidgetAfterControls) && (userWidget != NULL))
+        buttonList.push_back(userWidget);
+    if ((controlOptions & ControlOption::UserWidgetBeforePeekBtn) && (userWidget != NULL))
+        buttonList.push_back(userWidget);
+    if (controlOptions & ControlOption::PeekOriginalBtn)
+        buttonList.push_back(_control->pushButton_peekOriginal);
+    if ((controlOptions & ControlOption::UserWidgetAfterPeekBtn) && (userWidget != NULL))
+        buttonList.push_back(userWidget);
 
-        return true;
+    return true;
 }
 
 /**
@@ -294,8 +350,8 @@
     uint32_t frameNumber;
     if(!_in->getNextFrame(&frameNumber,_yuvBuffer))
     {
-      ADM_warning("[FlyDialog] Cannot get frame %u\n",frameNumber); 
-      return 0;
+        ADM_warning("[FlyDialog] Cannot get frame %u\n",frameNumber); 
+        return 0;
     }
     lastPts=_yuvBuffer->Pts;
     setCurrentPts(lastPts);
@@ -342,12 +398,12 @@
 bool ADM_flyDialog::initializeSize()
 {
     _canvas->resize(1,1);
-    QSize qsize= _canvas->parentWidget()->parentWidget()->size();
+    QSize qsize= _canvas->parentWidget()->parentWidget()->frameSize();
     //_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
-    
+    _usedHeight = qsize.height();
+
      if (_resizeMethod != RESIZE_NONE) 
     {
         _zoom = calcZoomFactor();
@@ -378,26 +434,24 @@
  */
 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;
-		
+    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;
 }
 
 //************************************
@@ -408,13 +462,13 @@
                                 ADM_QCanvas *canvas, ADM_QSlider *slider,
                                 ResizeMethod resizeMethod) : ADM_flyDialog(parent,width,height,in,canvas,slider,resizeMethod)
 {
-       _control=NULL;
-        _yuvBufferOut=new ADMImageDefault(_w,_h);
-        yuvToRgb=NULL;  
-        initializeSize();
-        updateZoom();
-        postInit(false);
-        _nextRdv=0;
+    _control=NULL;
+    _yuvBufferOut=new ADMImageDefault(_w,_h);
+    yuvToRgb=NULL;  
+    initializeSize();
+    postInit(false);
+    updateZoom();
+    _nextRdv=0;
 }
 void ADM_flyDialogYuv::resetScaler(void)
 {
@@ -424,12 +478,15 @@
         yuvToRgb=NULL;
     }
     
+    uint32_t displayW, displayH;
+    _canvas->getDisplaySize(&displayW, &displayH);
+    
     yuvToRgb=new ADMColorScalerFull(ADM_CS_BICUBIC, 
                             _w,
                             _h,
-                            _zoomW,
-                            _zoomH,
-                            ADM_COLOR_YV12,toRgbColor());
+                            displayW,
+                            displayH,
+                            ADM_PIXFRMT_YV12,toRgbPixFrmt());
 }
 /**
  * 
@@ -452,9 +509,14 @@
 }
 bool ADM_flyDialogYuv::process(void)
 {
-         processYuv(_yuvBuffer,_yuvBufferOut);
+    if (_bypassFilter)
+    {
+        yuvToRgb->convertImage(_yuvBuffer,_rgbByteBufferDisplay.at(0));
+    } else {
+        processYuv(_yuvBuffer,_yuvBufferOut);
         yuvToRgb->convertImage(_yuvBufferOut,_rgbByteBufferDisplay.at(0));
-        return true;
+    }
+    return true;
 }
 //*****************************************
 ADM_flyDialogRgb::ADM_flyDialogRgb(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
@@ -463,25 +525,35 @@
 {
     uint32_t size = ADM_IMAGE_ALIGN(_w*4);
     size*=_h;
+    _scaledPts = ADM_NO_PTS;
     _rgbByteBuffer.setSize(size);
     _rgbByteBufferOut.setSize(size);
-     yuv2rgb =new ADMColorScalerSimple(_w,_h,ADM_COLOR_YV12,
-                toRgbColor());
+    _algo = ((_h > ADM_FLYRGB_ALGO_CHANGE_THRESHOLD_RESOLUTION) ? ADM_CS_FAST_BILINEAR : ADM_CS_BICUBIC);
+     yuv2rgb =  new ADMColorScalerFull(_algo, 
+                            _w,
+                            _h,
+                            _w,
+                            _h,
+                            ADM_PIXFRMT_YV12,toRgbPixFrmt());
     rgb2rgb=NULL;
     initializeSize();
-    updateZoom();
     postInit(false);
+    updateZoom();
 
 }
 void ADM_flyDialogRgb::resetScaler(void)
 {
     if(rgb2rgb) delete rgb2rgb;
-    rgb2rgb=new ADMColorScalerFull(ADM_CS_BICUBIC, 
+
+    uint32_t displayW, displayH;
+    _canvas->getDisplaySize(&displayW, &displayH);
+    
+    rgb2rgb=new ADMColorScalerFull(_algo, 
                             _w,
                             _h,
-                            _zoomW,
-                            _zoomH,
-                            ADM_COLOR_RGB32A,ADM_COLOR_RGB32A);
+                            displayW,
+                            displayH,
+                            ADM_PIXFRMT_RGB32A,ADM_PIXFRMT_RGB32A);
 }
 /**
  * 
@@ -498,14 +570,23 @@
 }
 bool ADM_flyDialogRgb::process(void)
 {
-    yuv2rgb->convertImage(_yuvBuffer,_rgbByteBuffer.at(0));
-    if (_resizeMethod != RESIZE_NONE)
-    {
-        processRgb(_rgbByteBuffer.at(0),_rgbByteBufferOut.at(0));
-        rgb2rgb->convert(_rgbByteBufferOut.at(0), _rgbByteBufferDisplay.at(0));
-    }else
+    if (_bypassFilter)
     {
-        processRgb(_rgbByteBuffer.at(0),_rgbByteBufferDisplay.at(0));
+        yuv2rgb->convertImage(_yuvBuffer,_rgbByteBufferDisplay.at(0));
+    } else {
+        if (_scaledPts != lastPts)
+        {
+            yuv2rgb->convertImage(_yuvBuffer,_rgbByteBuffer.at(0));
+            _scaledPts = lastPts;
+        }
+        if (_resizeMethod != RESIZE_NONE)
+        {
+            processRgb(_rgbByteBuffer.at(0),_rgbByteBufferOut.at(0));
+            rgb2rgb->convert(_rgbByteBufferOut.at(0), _rgbByteBufferDisplay.at(0));
+        }else
+        {
+            processRgb(_rgbByteBuffer.at(0),_rgbByteBufferDisplay.at(0));
+        }
     }
     return true;
 }
@@ -520,8 +601,8 @@
 
 FlyDialogEventFilter::FlyDialogEventFilter(ADM_flyDialog *flyDialog)
 {
-	recomputed = false;
-	this->flyDialog = flyDialog;
+    recomputed = false;
+    this->flyDialog = flyDialog;
 }
 /**
     \fn    eventFilter
@@ -530,19 +611,19 @@
 
 bool FlyDialogEventFilter::eventFilter(QObject *obj, QEvent *event)
 {
-	if (event->type() == QEvent::Show && !recomputed)
-	{
-		recomputed = true;
-		QWidget* parent = (QWidget*)obj;
-		uint32_t screenWidth, screenHeight;
+    if (event->type() == QEvent::Show && !recomputed)
+    {
+        recomputed = true;
+        QWidget* parent = (QWidget*)obj;
+        uint32_t screenWidth, screenHeight;
 
-		UI_getPhysicalScreenSize(parent, &screenWidth, &screenHeight);
-		flyDialog->recomputeSize();
-		QCoreApplication::processEvents();
-		parent->move((((int)screenWidth) - parent->frameSize().width()) / 2, (((int)screenHeight) - parent->frameSize().height()) / 2);
-	}
+        UI_getPhysicalScreenSize(parent, &screenWidth, &screenHeight);
+        flyDialog->recomputeSize();
+        QCoreApplication::processEvents();
+        parent->move((((int)screenWidth) - parent->frameSize().width()) / 2, (((int)screenHeight) - parent->frameSize().height()) / 2);
+    }
 
-	return QObject::eventFilter(obj, event);
+    return QObject::eventFilter(obj, event);
 }
 /**
     \fn    ADM_flyDialog
@@ -569,7 +650,12 @@
     _zoomChangeCount = 0;        
     _yuvBuffer=new ADMImageDefault(_w,_h);
     _usedWidth= _usedHeight=0;
-    lastPts=0;
+    _oldViewWidth = _oldViewHeight = 0;
+    lastPts= _in->getInfo()->markerA;
+    setCurrentPts(lastPts);
+    _in->goToTime(lastPts);
+    updateSlider();
+    _bypassFilter=false;
 
     QGraphicsScene *sc=new QGraphicsScene(this);
     sc->setBackgroundBrush(QBrush(Qt::darkGray, Qt::SolidPattern));
@@ -597,21 +683,21 @@
 
 void ADM_flyDialog::postInit(uint8_t reInit)
 {
-	QWidget *graphicsView = ((ADM_QCanvas*)_canvas)->parentWidget();
-	ADM_QSlider  *slider=(ADM_QSlider *)_slider;
+    QWidget *graphicsView = _canvas->parentWidget();
+    ADM_QSlider  *slider=(ADM_QSlider *)_slider;
 
-	if (reInit)
-	{
-		FlyDialogEventFilter *eventFilter = new FlyDialogEventFilter(this);
+    if (reInit)
+    {
+        FlyDialogEventFilter *eventFilter = new FlyDialogEventFilter(this);
 
-		if (slider)
-			slider->setMaximum(ADM_FLY_SLIDER_MAX);
+        if (slider)
+            slider->setMaximum(ADM_FLY_SLIDER_MAX);
 
-		graphicsView->parentWidget()->installEventFilter(eventFilter);
-	}
+        graphicsView->parentWidget()->installEventFilter(eventFilter);
+    }
 
-	((ADM_QCanvas*)_canvas)->changeSize(_zoomW, _zoomH);
-	graphicsView->setMinimumSize(_zoomW, _zoomH);
+    _canvas->changeSize(_zoomW, _zoomH);
+    graphicsView->setMinimumSize(_zoomW, _zoomH);
 }
 
 /**
@@ -642,27 +728,37 @@
     double ar = (double)_w / _h;
     double viewAr = (double)width / height;
 
-    if(viewAr != ar)
+    uint32_t tmpZoomW = 0;
+    uint32_t tmpZoomH = 0;
+    bool skip = false;
+    if(viewAr > ar)
     {
-        uint32_t tmpZoomW = 0;
-        uint32_t tmpZoomH = 0;
-        if(viewAr > ar)
-        {
-            tmpZoomW = (uint32_t)((double)height * ar);
-            tmpZoomH = height;
-        }else
-        {
-            tmpZoomW = width;
-            tmpZoomH = (uint32_t)((double)width / ar);
-        }
-        _resizeMethod = RESIZE_AUTO;
-        _zoomW = tmpZoomW&0xfffffffe;
-        _zoomH = tmpZoomH&0xfffffffe;
-        _zoom = (float)_zoomW / _w;
-        updateZoom();
-        _canvas->changeSize(_zoomW, _zoomH);
-        sameImage();
+        tmpZoomW = (uint32_t)((double)height * ar);
+        tmpZoomH = height;
+        if(_oldViewHeight &&
+           _oldViewHeight == height &&
+           _oldViewHeight == _canvas->height())
+            skip = true;
+    }else
+    {
+        tmpZoomW = width;
+        tmpZoomH = (uint32_t)((double)width / ar);
+        if(_oldViewWidth &&
+           _oldViewWidth == width &&
+           _oldViewWidth == _canvas->width())
+            skip = true;
     }
+    _oldViewWidth = width;
+    _oldViewHeight = height;
+    if(skip) return;
+
+    _resizeMethod = RESIZE_AUTO;
+    _zoomW = tmpZoomW;
+    _zoomH = tmpZoomH;
+    _zoom = (float)_zoomW / _w;
+    _canvas->changeSize(_zoomW, _zoomH);
+    updateZoom();
+    sameImage();
 }
 
 /**
@@ -695,15 +791,15 @@
 
 uint8_t  ADM_flyDialog::display(uint8_t *rgbData)
 {
-   ADM_QCanvas *view=(ADM_QCanvas *)_canvas;
-   ADM_assert(view);
-   view->dataBuffer=rgbData;
-   if(!rgbData)
-   {
-      ADM_info("flyDialog: No rgbuffer ??\n"); 
-   } 
-   view->repaint();
-  return 1; 
+    ADM_QCanvas *view=_canvas;
+    ADM_assert(view);
+    view->dataBuffer=rgbData;
+    if(!rgbData)
+    {
+        ADM_info("flyDialog: No rgbuffer ??\n"); 
+    } 
+    view->repaint();
+    return 1; 
 }
 /**
     \fn    sliderGet
@@ -712,9 +808,9 @@
 
 uint32_t ADM_flyDialog::sliderGet(void)
 {
-  ADM_QSlider  *slide=(ADM_QSlider *)_slider;
-  ADM_assert(slide);
-  return slide->value();
+    ADM_QSlider  *slide=(ADM_QSlider *)_slider;
+    ADM_assert(slide);
+    return slide->value();
   
 }
 /**
@@ -724,11 +820,11 @@
 
 uint8_t     ADM_flyDialog::sliderSet(uint32_t value)
 {
-  ADM_QSlider  *slide=(ADM_QSlider *)_slider;
-  ADM_assert(slide);
-  if(value>ADM_FLY_SLIDER_MAX) value=ADM_FLY_SLIDER_MAX;
-  slide->setValue(value);
-  return 1; 
+    ADM_QSlider  *slide=(ADM_QSlider *)_slider;
+    ADM_assert(slide);
+    if(value>ADM_FLY_SLIDER_MAX) value=ADM_FLY_SLIDER_MAX;
+    slide->setValue(value);
+    return 1; 
 }
 
 /**
@@ -804,6 +900,28 @@
     }
     
 }
+/**
+ * 
+ */
+void ADM_flyDialog::peekOriginalPressed(void)
+{
+    if (!_bypassFilter)
+    {
+        _bypassFilter = true;
+        this->sameImage();
+    }
+}
+/**
+ * 
+ */
+void ADM_flyDialog::peekOriginalReleased(void)
+{
+    if (_bypassFilter)
+    {
+        _bypassFilter = false;
+        this->sameImage();
+    }
+}
 
 /**
     \fn timeout

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_QCanvas.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_QCanvas.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_bitrate.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_bitrate.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp Changed

@@ -12,6 +12,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QSpacerItem>
@@ -77,10 +78,8 @@
 {
   factoryCookie *cookie=new factoryCookie(title);
 
-  ADM_assert(title);
-  ADM_assert(nb);
-  ADM_assert(elems);
-  
+    if(!nb) return cookie;
+
     int currentLayout = 0;
     int  v=0;
     for(int i=0;i<nb;i++)
@@ -124,6 +123,9 @@
  */
 bool  qt4DiaFactoryFinish(void *finish)
 {
+    if(!finish)
+        return false;
+
   bool  r=false;
   factoryCookie *cookie=(factoryCookie *)  finish;
   QSpacerItem *spacer = new QSpacerItem(20, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
@@ -183,11 +185,7 @@
 void  *qt4DiaFactoryTabsPrepare(const char *title,uint32_t nb,diaElemTabs **tabs)
 {
     factoryCookie *cookie=new factoryCookie(title);
-  
-    ADM_assert(title);
-    ADM_assert(nb);
-    ADM_assert(tabs);
-  
+
     cookie->layout  = new QGridLayout();
     cookie->tabWidget = new QTabWidget();
     
@@ -208,6 +206,8 @@
   */ 
 bool qt4DiaFactoryTabsFinish(void *f)
 {
+    if(!f) return false;
+
     bool r=false;
     factoryCookie *cookie=(factoryCookie *)f;
     
@@ -217,9 +217,9 @@
     buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     QSpacerItem *spacer = new QSpacerItem(20, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
     cookie->vboxlayout->addLayout(cookie->layout);
-    cookie->vboxlayout->addWidget(cookie->tabWidget,0,0);
+    cookie->vboxlayout->addWidget(cookie->tabWidget,0);
     cookie->vboxlayout->addItem(spacer);
-    cookie->vboxlayout->addWidget(buttonBox,1,0);
+    cookie->vboxlayout->addWidget(buttonBox,1);
 
      cookie->dialog->setLayout(cookie->vboxlayout);
 
@@ -342,6 +342,8 @@
 extern DELETE_DIA_ELEM_T    qt4DestroyBar;
 extern CREATE_FLOAT_T       qt4CreateFloat;
 extern DELETE_DIA_ELEM_T    qt4DestroyFloat;
+extern CREATE_FLOAT_RESETTABLE_T qt4CreateFloatResettable;
+extern DELETE_DIA_ELEM_T    qt4DestroyFloatResettable;
 extern CREATE_FRAME_T       qt4CreateFrame;
 extern DELETE_DIA_ELEM_T    qt4DestroyFrame;
 extern CREATE_HEX_T         qt4CreateHex;
@@ -403,6 +405,9 @@
         // Float
         &qt4CreateFloat,
         &qt4DestroyFloat,
+        // Float resettable
+        &qt4CreateFloatResettable,
+        &qt4DestroyFloatResettable,
         // Integer
         &qt4CreateInteger,
         &qt4DestroyInteger,

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_dialogFactory.h Changed

avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_floatResettable.cpp Added

@@ -0,0 +1,200 @@
+/***************************************************************************
+  T_floatResettable.cpp
+  Handle dialog factory element : float with reset button
+  (C) 2006 Mean 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 "T_floatResettable.h"
+#include "ADM_default.h"
+#include "ADM_dialogFactoryQt4.h"
+
+extern const char *shortkey(const char *);
+
+namespace ADM_Qt4Factory
+{
+
+class diaElemFloatResettable : public diaElem,QtFactoryUtils
+{
+protected:
+    ELEM_TYPE_FLOAT min,max,reset;
+    int decimals;
+
+public:
+    diaElemFloatResettable(ELEM_TYPE_FLOAT *value, const char *toggleTitle,
+        ELEM_TYPE_FLOAT min, ELEM_TYPE_FLOAT max, ELEM_TYPE_FLOAT reset,
+        const char *tip = NULL, int decimals = 2);
+    virtual ~diaElemFloatResettable();
+    void setMe(void *dialog, void *opaque,uint32_t line);
+    void getMe(void);
+    void enable(uint32_t onoff);
+    int getRequiredLayout(void);
+};
+
+diaElemFloatResettable::diaElemFloatResettable(ELEM_TYPE_FLOAT *value, const char *toggleTitle,
+    ELEM_TYPE_FLOAT min, ELEM_TYPE_FLOAT max, ELEM_TYPE_FLOAT reset,
+    const char *tip, int decimals) : diaElem(ELEM_TOGGLE), QtFactoryUtils(toggleTitle)
+{
+    param = (void *)value;
+    paramTitle = shortkey(toggleTitle);
+    this->min = min;
+    this->max = max;
+    this->reset = reset;
+    this->tip = tip;
+    this->decimals = decimals;
+}
+
+diaElemFloatResettable::~diaElemFloatResettable()
+{
+    ADM_QDoubleSpinboxResettable *bx = (ADM_QDoubleSpinboxResettable *)myWidget;
+    delete bx;
+    myWidget = NULL;
+    ADM_dealloc(paramTitle);
+    paramTitle = NULL;
+}
+
+void diaElemFloatResettable::setMe(void *dialog, void *opaque, uint32_t line)
+{
+    QGridLayout *grid = (QGridLayout *)opaque;
+    QWidget *parent = (QWidget *)dialog;
+    ELEM_TYPE_FLOAT *val = (ELEM_TYPE_FLOAT *)param;
+    void *ptr = (void *) this;
+    ADM_QDoubleSpinboxResettable *bx = new ADM_QDoubleSpinboxResettable(parent, grid, ptr, paramTitle, tip, line, decimals, min, max, reset, *val);
+    myWidget = (void *)bx;
+}
+
+void diaElemFloatResettable::getMe(void)
+{
+    ADM_QDoubleSpinboxResettable *bx = (ADM_QDoubleSpinboxResettable *)myWidget;
+    if(!bx) return;
+    double val = bx->readout();
+    if(val > max) val = max;
+    if(val < min) val = min;
+    *(ELEM_TYPE_FLOAT *)param = val;
+}
+
+void diaElemFloatResettable::enable(uint32_t onoff) 
+{
+    ADM_QDoubleSpinboxResettable *bx = (ADM_QDoubleSpinboxResettable *)myWidget;
+    if(!bx) return;
+    bx->enable(!!onoff);
+}
+
+int diaElemFloatResettable::getRequiredLayout(void) { return FAC_QT_GRIDLAYOUT; }
+
+//********************************************************************
+
+/**
+    \fn ctor
+*/
+ADM_QDoubleSpinboxResettable::ADM_QDoubleSpinboxResettable(
+        QWidget *parent, QGridLayout *grid, void *elem,
+        const char *title, const char *tip, int line, int dec,
+        double min, double max, double rst, double current) : QWidget(parent)
+{
+    cookie = elem;
+
+    ADM_assert(max >= min);
+    ADM_assert(rst >= min);
+    ADM_assert(rst <= max);
+
+    if(current > max) current = max;
+    if(current < min) current = min;
+
+    _rst = rst;
+
+    box = new QDoubleSpinBox(parent);
+    box->setMinimum(min);
+    box->setMaximum(max);
+    box->setDecimals(dec);
+    box->setSingleStep(0.1);
+    box->setValue(current);
+    if(tip)
+        box->setToolTip(QString::fromUtf8(tip));
+
+    text = new QLabel(title,parent);
+    text->setBuddy(box);
+
+    QSpacerItem *spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+    button = new QPushButton(QString::fromUtf8(QT_TRANSLATE_NOOP("adm","Reset")), parent);
+    button->setEnabled(current != _rst);
+
+    QObject::connect(box, SIGNAL(valueChanged(double)), this, SLOT(valueChangedSlot(double)));
+    QObject::connect(button, SIGNAL(clicked(bool)), this, SLOT(reset(bool)));
+
+    QHBoxLayout *hboxLayout = new QHBoxLayout();
+    hboxLayout->addWidget(box);
+    hboxLayout->addWidget(button);
+    hboxLayout->addItem(spacer);
+
+    grid->addWidget(text,line,0);
+    grid->addLayout(hboxLayout,line,1);
+}
+
+/**
+    \fn dtor
+*/
+ADM_QDoubleSpinboxResettable::~ADM_QDoubleSpinboxResettable()
+{
+    diaElem *elem = (diaElem *)cookie;
+    elem->myWidget = NULL; // avoid crash from double delete FIXME
+}
+
+/**
+    \fn reset
+*/
+void ADM_QDoubleSpinboxResettable::reset(bool checked)
+{
+    UNUSED_ARG(checked);
+    box->setValue(_rst);
+}
+
+/**
+    \fn valueChangedSlot
+*/
+void ADM_QDoubleSpinboxResettable::valueChangedSlot(double v)
+{
+    if(box->isEnabled())
+        button->setEnabled(v != _rst);
+}
+
+/**
+    \fn enable
+*/
+void ADM_QDoubleSpinboxResettable::enable(bool onoff)
+{
+    text->setEnabled(onoff);
+    box->setEnabled(onoff);
+    button->setEnabled(onoff ? box->value() != _rst : false);
+}
+
+/**
+    \fn readout
+*/
+double ADM_QDoubleSpinboxResettable::readout(void)
+{
+    return box->value();
+}
+
+} // End of namespace
+//****************************Hoook*****************
+
+diaElem *qt4CreateFloatResettable(ELEM_TYPE_FLOAT *initialValue, const char *title,
+    ELEM_TYPE_FLOAT min, ELEM_TYPE_FLOAT max, ELEM_TYPE_FLOAT reset, const char *tip, int decimals)
+{
+    return new ADM_Qt4Factory::diaElemFloatResettable(initialValue,title,min,max,reset,tip,decimals);
+}
+void qt4DestroyFloatResettable(diaElem *e)
+{
+    ADM_Qt4Factory::diaElemFloatResettable *a=(ADM_Qt4Factory::diaElemFloatResettable *)e;
+    delete a;
+}

avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_floatResettable.h Added

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_menu.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_menu.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_timeStamp.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_timeStamp.cpp Changed

@@ -13,6 +13,13 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QApplication>
+#include <QClipboard>
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+    #include <QStringRef>
+#else
+    #include <QStringView>
+#endif
 #include "ADM_default.h"
 #include "ADM_vidMisc.h"
 #include "T_timeStamp.h"
@@ -66,6 +73,8 @@
 */
 void ADM_QTimeStamp::updateRange(int i)
 {
+    UNUSED_ARG(i);
+
     uint32_t hh1,mm1,ss1,msec1;
     uint32_t hh2,mm2,ss2,msec2;
     ms2time(_min,&hh1,&mm1,&ss1,&msec1);
@@ -172,6 +181,8 @@
 */
 ADM_QTimeStamp::ADM_QTimeStamp(QString title, QWidget *dialog, QGridLayout *grid, uint32_t min, uint32_t max, uint32_t time, uint32_t line)
 {
+    timeValidator = NULL;
+
     myTWidget=new myTimeWidget;
     myTWidget->hours=new fixedNumDigitsSpinBox(dialog);
     myTWidget->minutes=new fixedNumDigitsSpinBox(dialog);
@@ -200,14 +211,7 @@
     _max=max;
     updateRange(0);
 
-    uint32_t hh,mm,ss,msec;
-    ms2time(time,&hh,&mm,&ss,&msec);
-
-    myTWidget->hours->setValue(hh);
-    myTWidget->minutes->setValue(mm);
-    myTWidget->seconds->setValue(ss);
-    myTWidget->mseconds->setValue(msec);
-
+    setTime(time);
     setSelectionAndBuddy(text);
 
     QObject::connect(myTWidget->hours, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
@@ -215,6 +219,11 @@
     QObject::connect(myTWidget->seconds, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
     QObject::connect(myTWidget->mseconds, SIGNAL(valueChanged(int)), this, SLOT(updateRange(int)));
 
+    myTWidget->hours->installEventFilter(this);
+    myTWidget->minutes->installEventFilter(this);
+    myTWidget->seconds->installEventFilter(this);
+    myTWidget->mseconds->installEventFilter(this);
+
     QHBoxLayout *hboxLayout = new QHBoxLayout();
     QSpacerItem *spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
@@ -236,6 +245,145 @@
 }
 
 /**
+    \fn dtor
+*/
+ADM_QTimeStamp::~ADM_QTimeStamp()
+{
+    delete myTWidget;
+    myTWidget = NULL;
+}
+
+/**
+    \fn eventFilter
+*/
+bool ADM_QTimeStamp::eventFilter(QObject* watched, QEvent* event)
+{
+    QKeyEvent *keyEvent;
+    if(event->type() == QEvent::KeyPress)
+    {
+        keyEvent = (QKeyEvent*)event;
+        if(keyEvent->key() == Qt::Key_V)
+        {
+            if(keyEvent->modifiers() & Qt::ControlModifier)
+            {
+                QClipboard *clipboard = QApplication::clipboard();
+                QString txt = clipboard->text();
+                if(txt.size() == 12) // dd:dd:dd.ddd
+                {
+                    int pos;
+                    uint32_t ms = 0;
+                    if(!timeValidator)
+                    {
+#if QT_VERSION < QT_VERSION_CHECK(5,1,0)
+                        QRegExp
+#else
+                        QRegularExpression
+#endif
+                            timeRegExp("^[0-9]{2}:[0-5][0-9]:[0-5][0-9]\\.[0-9]{3}$");
+
+                        timeValidator = new
+#if QT_VERSION < QT_VERSION_CHECK(5,1,0)
+                            QRegExpValidator(timeRegExp, this);
+#else
+                            QRegularExpressionValidator(timeRegExp, this);
+#endif
+                    }
+                    if(QValidator::Acceptable == timeValidator->validate(txt,pos))
+                    {
+                        bool success = false;
+                        int mult = 3600 * 1000;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+                        QStringRef *ref = NULL;
+#else
+                        QStringView *view = NULL;
+#endif
+                        for(int i=0; i<4; i++)
+                        {
+                            int val = 0;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+                            ref = new QStringRef(&txt, i*3, (i < 3) ? 2 : 3);
+    #if QT_VERSION < QT_VERSION_CHECK(5,1,0)
+                            success = true;
+                            for(int j=0; j < ref->length(); j++)
+                            {
+                                int d = ref->at(j).digitValue();
+                                if(d < 0)
+                                {
+                                    success = false;
+                                    break;
+                                }
+                                val *= 10;
+                                val += d;
+                            }
+    #else
+                            val = ref->toInt(&success);
+    #endif
+                            delete ref;
+                            ref = NULL;
+#else
+                            view = new QStringView(txt);
+                            val = view->sliced(i*3, (i < 3) ? 2 : 3).toInt(&success);
+                            delete view;
+                            view = NULL;
+#endif
+                            if(!success) break;
+                            if(val < 0)
+                            {
+                                success = false;
+                                break;
+                            }
+                            if(i < 3)
+                            {
+                                val *= mult;
+                                ms += val;
+                                mult /= 60;
+                                continue;
+                            }
+                            ms += val;
+                        }
+                        if(success && ms >= _min && ms <= _max)
+                        {
+                            setTime(ms);
+                            updateRange(0);
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return QObject::eventFilter(watched, event);
+}
+
+/**
+    \fn block
+*/
+void ADM_QTimeStamp::blockChanges(bool block)
+{
+#define BLOCK(x) myTWidget->x->blockSignals(block);
+    BLOCK(hours)
+    BLOCK(minutes)
+    BLOCK(seconds)
+    BLOCK(mseconds)
+}
+
+/**
+    \fn setTime
+*/
+void ADM_QTimeStamp::setTime(uint32_t time)
+{
+    uint32_t hh,mm,ss,msec;
+    ms2time(time,&hh,&mm,&ss,&msec);
+
+    blockChanges(true);
+    myTWidget->hours->setValue(hh);
+    myTWidget->minutes->setValue(mm);
+    myTWidget->seconds->setValue(ss);
+    myTWidget->mseconds->setValue(msec);
+    blockChanges(false);
+}
+
+/**
     \fn getTime
 */
 uint32_t ADM_QTimeStamp::getTime(void)

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/T_timeStamp.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/T_timeStamp.h Changed

@@ -4,6 +4,12 @@
 #include <QSpinBox>
 #include <QLabel>
 #include <QGridLayout>
+#if QT_VERSION < QT_VERSION_CHECK(5,1,0)
+    #include <QRegExpValidator>
+#else
+    #include <QRegularExpressionValidator>
+#endif
+#include <QKeyEvent>
 
 #include "DIA_factory.h"
 #include "ADM_dialogFactoryQt4.h"
@@ -51,14 +57,27 @@
     uint32_t        _min;
     uint32_t        _max;
     myTimeWidget    *myTWidget;
+#if QT_VERSION < QT_VERSION_CHECK(5,1,0)
+    QRegExpValidator
+#else
+    QRegularExpressionValidator
+#endif
+                    *timeValidator;
+
     void            setSelectionAndBuddy(QLabel *label);
+    void            setTime(uint32_t millisec);
+    void            blockChanges(bool block);
 
 public:
                     ADM_QTimeStamp(QString title, QWidget *dialog, QGridLayout *grid, uint32_t min, uint32_t max, uint32_t time, uint32_t line);
+    virtual         ~ADM_QTimeStamp();
     uint32_t        getTime(void);
 
 public slots:
     void            updateRange(int i);
+
+private:
+    bool            eventFilter(QObject* watched, QEvent* event);
 };
 } // end of namespace
 #endif

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_UIs/src/toolkit.cpp Changed

@@ -1,8 +1,13 @@
 #include <QtCore/QStack>
 #include <QApplication>
-#include <QDesktopWidget>
+#if QT_VERSION < QT_VERSION_CHECK(5,11,0)
+#   include <QDesktopWidget>
+#else
+#   include <QScreen>
+#endif
 
 #include "ADM_toolkitQt.h"
+#include "ADM_QSettings.h"
 #include "ADM_assert.h"
 #include "ADM_default.h"
 
@@ -13,7 +18,7 @@
     if (widgetStack.count())
     {
         Qt::WindowFlags flags = dialog->windowFlags();
-#if defined(__APPLE__) // && QT_VERSION == QT_VERSION_CHECK(5,10,1)
+#if defined(__APPLE__) && QT_VERSION == QT_VERSION_CHECK(5,10,1)
         //ADM_info("Working around Qt bug introduced in 5.10.1 resulting in non-resizable dialogs with Cocoa\n");
 
         // Work around a presumable Qt bug which allows application-modal parents of application-modal dialogs to receive focus.
@@ -26,13 +31,7 @@
         dialog->setWindowFlags(flags);
         dialog->setWindowModality(Qt::ApplicationModal);
 #else
-        bool reparent = false;
-        bool isDialog = false;
-        if (dialog->parentWidget() != widgetStack.top())
-            reparent = true;
-        if (flags & Qt::Dialog)
-            isDialog = true;
-        if (reparent || !isDialog)
+        if (dialog->parentWidget() != widgetStack.top() || (flags & Qt::Dialog) != Qt::Dialog)
         {
             ADM_info("reparenting widget %s\n",dialog->objectName().toUtf8().constData());
             dialog->setParent(widgetStack.top(), Qt::Dialog);
@@ -58,8 +57,11 @@
 
 uint8_t UI_getPhysicalScreenSize(void* window, uint32_t *w,uint32_t *h)
 {
+#if QT_VERSION < QT_VERSION_CHECK(5,11,0)
 	QRect qrect = QApplication::desktop()->availableGeometry();
-
+#else
+    QRect qrect = QApplication::primaryScreen()->availableGeometry();
+#endif
 	*w = (uint32_t)qrect.width();
 	*h = (uint32_t)qrect.height();
     return 1;
@@ -100,3 +102,15 @@
         return r;
 		
 }
+
+/**
+ * \fn qtSettingsCreate
+ * \brief Returns a pointer to QSettings object, the caller is responsible for deleting it after use.
+ */
+QSettings *qtSettingsCreate(void)
+{
+    QString path = ADM_getBaseDir();
+    path += "QtSettings.ini";
+    QSettings *settings = new QSettings(path, QSettings::IniFormat);
+    return settings;
+}

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_jobs/src/ADM_runOneJob.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_jobs/src/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTrackClass.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTrackClass.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp Changed

@@ -68,6 +68,8 @@
                             this,SLOT(enabledStateChanged(int)));
             QObject::connect( window->inputs[i],SIGNAL(currentIndexChanged(int)),
                             this,SLOT(inputChanged(int)));
+            QObject::connect( window->codec[i],SIGNAL(currentIndexChanged(int)),
+                            this,SLOT(codecChanged(int)));
 /*
             QObject::connect( window->languages[i],SIGNAL(currentIndexChanged(int)),
                             this,SLOT(languagesClicked(int)));   
@@ -102,7 +104,7 @@
         int dex=-1;
         QObject *ptr=sender();
 
-        for(int i=0;i<NB_MENU;i++) if(ptr==window->inputs[i]) dex=i;
+        for(int i=0;i<NB_MENU;i++) if(ptr==window->inputs[i]) {dex=i;break;}
         if(dex==-1)
         {
             ADM_warning("Cannot find originating input\n");
@@ -197,7 +199,7 @@
         int dex=-1;
         QObject *ptr=sender();
 
-        for(int i=0;i<NB_MENU;i++) if(ptr==window->enabled[i]) dex=i;
+        for(int i=0;i<NB_MENU;i++) if(ptr==window->enabled[i]) {dex=i;break;}
         if(dex==-1)
         {
             ADM_warning("No track found matching that enabling\n");
@@ -221,7 +223,7 @@
 {
  QObject *ptr=sender();
         int dex=-1;
-        for(int i=0;i<NB_MENU;i++) if(ptr==window->codecConf[i]) dex=i;
+        for(int i=0;i<NB_MENU;i++) if(ptr==window->codecConf[i]) {dex=i;break;}
         if(dex==-1)
         {
             ADM_warning("No track found matching that codec\n");
@@ -248,7 +250,7 @@
 {
         QObject *ptr=sender();
         int dex=-1;
-        for(int i=0;i<NB_MENU;i++) if(ptr==window->filters[i]) dex=i;
+        for(int i=0;i<NB_MENU;i++) if(ptr==window->filters[i]) {dex=i;break;}
         if(dex==-1)
         {
             ADM_warning("No track found matching that filter\n");
@@ -391,10 +393,12 @@
 #define ONOFF(x)  window->x[i]->setEnabled(true)
     window->enabled[i]->setCheckState(Qt::Checked);
     ONOFF(inputs);
+    ONOFF(languages);
     ONOFF(codec);
+#undef ONOFF
+#define ONOFF(x) window->x[i]->setEnabled(window->codec[i]->currentIndex() > 0)
     ONOFF(codecConf);
     ONOFF(filters);
-    ONOFF(languages);
 }
 /**
     \fn disable
@@ -458,22 +462,23 @@
         if(hdr)
         {
             int bitrate=hdr->byterate;
-            QString sBitrate;
-            QString sChan;
+            QString sBitrate,sChan;
             switch(hdr->channels)
             {
-                case 1: sChan=QString("Mono");break;
-                case 2: sChan=QString("Stereo");break;
-                default: sChan.setNum(hdr->channels);sChan+=QString(" chan");break;
+                case 1: sChan="Mono";break;
+                case 2: sChan="Stereo";break;
+                default: sChan.setNum(hdr->channels);sChan+=" chan";break;
             }
             bitrate*=8;
             bitrate/=1000;
             sBitrate.setNum(bitrate);
-            str+=QString(" (")+QString(getStrFromAudioCodec(hdr->encoding))+QString(",");
-            str+=sChan+QString(",");
-            str+=sBitrate+QString("kbps)");
-            
-         
+            str += " (";
+            str += getStrFromAudioCodec(hdr->encoding);
+            str += ", ";
+            str += sChan;
+            str += ", ";
+            str += sBitrate;
+            str += " kbps)";
         }
         window->inputs[dex]->addItem(str); 
     }
@@ -526,12 +531,37 @@
         int selected=active.atEditable(dex)->encoderIndex;
         enable(dex);
         window->codec[dex]->setCurrentIndex(selected);
-    }
-    else    
+        window->codecConf[dex]->setEnabled(selected > 0); // not copy
+        window->filters[dex]->setEnabled(selected > 0);
+    }else
         disable(dex);
     window->inputs[dex]->blockSignals(false);
 }
 /**
+    \fn codecChanged
+*/
+void audioTrackQt4::codecChanged(int ix)
+{
+    int dex = -1;
+    QObject *ptr = sender();
+
+    for(int i=0;i<NB_MENU;i++)
+    {
+        if(ptr == window->codec[i])
+        {
+            dex=i;
+            break;
+        }
+    }
+    if(dex == -1)
+    {
+        ADM_warning("Cannot find originating codec combobox\n");
+        return;
+    }
+    window->codecConf[dex]->setEnabled(ix > 0);
+    window->filters[dex]->setEnabled(ix > 0);
+}
+/**
         \fn createEncoding
 */
 namespace ADM_Qt4CoreUIToolkit

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp Changed

@@ -108,12 +108,18 @@
 #endif
 }
 
+void DIA_encodingQt4::deleteStatsChanged(int state)
+{
+    deleteStats=!!state;
+}
+
 static char stringMe[80];
 
 DIA_encodingQt4::DIA_encodingQt4(uint64_t duration) : DIA_encodingBase(duration)
 {
         stopRequest=false;
         stayOpen=false;
+        multiPass=false;
         firstPass=false;
         UI_getTaskBarProgress()->enable();
         ui=new Ui_encodingDialog;
@@ -133,8 +139,14 @@
         }
         ui->checkBoxShutdown->setVisible(false);
 #endif
+
+        if(!prefs->get(DEFAULT_DELETE_FIRST_PASS_LOG_FILES,&deleteStats))
+            deleteStats = false;
+        ui->checkBoxDeleteStats->setChecked(deleteStats);
+
 	connect(ui->checkBoxShutdown, SIGNAL(stateChanged(int)), this, SLOT(shutdownChanged(int)));
 	connect(ui->checkBoxKeepOpen, SIGNAL(stateChanged(int)), this, SLOT(keepOpenChanged(int)));
+	connect(ui->checkBoxDeleteStats, SIGNAL(stateChanged(int)), this, SLOT(deleteStatsChanged(int)));
 	connect(ui->pushButton1, SIGNAL(pressed()), this, SLOT(useTrayButtonPressed()));
 	connect(ui->pushButton2, SIGNAL(pressed()), this, SLOT(pauseButtonPressed()));
 	connect(ui->comboBoxPriority, SIGNAL(currentIndexChanged(int)), this, SLOT(priorityChanged(int)));
@@ -199,27 +211,78 @@
     }
 }
 /**
-    \fn setPhasis(const char *n)
-    \brief Display parameters as phasis
+    \fn setPhase
+    \brief Setup dialog for given phase, show its description
 */
-
-void DIA_encodingQt4::setPhasis(const char *n)
+void DIA_encodingQt4::setPhase(ADM_ENC_PHASE_TYPE phase, const char *n)
 {
     ADM_assert(ui);
-    if(!strcmp(n,"Pass 1"))
+    firstPass = false;
+    const char *description = n;
+    switch(phase)
     {
-        firstPass=true;
-        ui->tabWidget->setTabEnabled(1, false); // disable the "Advanced" tab
-        this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","First Pass")));
-        WRITEM(labelPhasis,QT_TRANSLATE_NOOP("qencoding","Pass 1"));
-    }else
+        case ADM_ENC_PHASE_FIRST_PASS:
+        {
+            multiPass = firstPass = true;
+            if(!description)
+                description = QT_TRANSLATE_NOOP("qencoding","First Pass");
+            break;
+        }
+        case ADM_ENC_PHASE_LAST_PASS:
+        {
+            if(!description)
+                description = multiPass ?
+                    QT_TRANSLATE_NOOP("qencoding","Second Pass") :
+                    QT_TRANSLATE_NOOP("qencoding","Encoding...");
+            break;
+        }
+        case ADM_ENC_PHASE_OTHER:
+            break;
+        default:
+        {
+            ADM_warning("Invalid encoding phase value %d ignored.\n",(int)phase);
+            break;
+        }
+    }
+    ui->tabWidget->setTabEnabled(1, !firstPass); // disable the "Advanced" tab during the first pass
+    WRITEM(labelPhase,description);
+    ui->checkBoxDeleteStats->setVisible(multiPass);
+    QCoreApplication::processEvents();
+}
+
+/**
+    \fn setFileName
+*/
+void DIA_encodingQt4::setFileName(const char *n)
+{
+    ui->lineEditFN->clear();
+    if(!n)
     {
-        firstPass=false;
-        this->setWindowTitle(QString::fromUtf8(QT_TRANSLATE_NOOP("qencoding","Encoding...")));
-        ui->tabWidget->setTabEnabled(1, true);
-        WRITEM(labelPhasis,n);
+        outputFileName.clear();
+        ui->labelFileName->setVisible(false);
+        ui->lineEditFN->setVisible(false);
+        return;
     }
+    outputFileName = n;
+    ui->labelFileName->setVisible(true);
+    ui->lineEditFN->setVisible(true);
+    ui->lineEditFN->insert(QString::fromUtf8(outputFileName.c_str()));
+    ui->lineEditFN->setCursorPosition(0);
 }
+
+/**
+    \fn setLogFileName
+*/
+void DIA_encodingQt4::setLogFileName(const char *n)
+{
+    if(!n)
+    {
+        logFileName.clear();
+        return;
+    }
+    logFileName = n;
+}
+
 /**
     \fn    setFrameCount
     \brief display the # of processed frames
@@ -412,6 +475,24 @@
     return false;
 }
 
+static bool tryDeleteLogFile(bool single, std::string fname)
+{
+    if(!ADM_fileExist(fname.c_str()))
+        return false;
+    if(single)
+    {
+        ADM_warning("Single pass operation, not deleting old first pass log file \"%s\"\n",fname.c_str());
+        return false;
+    }
+    if(ADM_eraseFile(fname.c_str()))
+    {
+        ADM_info("Deleting first pass log file \"%s\"\n",fname.c_str());
+        return true;
+    }
+    ADM_warning("Could not delete first pass log file \"%s\"\n",fname.c_str());
+    return false;
+}
+
 /**
     \fn keepOpen
     \brief Allow user to read the muxing stats calmly
@@ -440,6 +521,16 @@
             QCoreApplication::processEvents();
         }
     }
+
+    if (deleteStats && !logFileName.empty())
+    {
+        // try to delete first pass log files
+        tryDeleteLogFile(!multiPass,logFileName);
+        // libx264 creates an additional log file with extension .mbtree appended
+        tryDeleteLogFile(!multiPass,logFileName + ".mbtree");
+        // libx265 creates an additional log file with extension .cutree appended
+        tryDeleteLogFile(!multiPass,logFileName + ".cutree");
+    }
 }
 
 /**

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_processing.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.cpp Changed

@@ -35,55 +35,81 @@
     const char *s;
 
     text[0] = 0;
-    listOfValues.clear();
+    gotExtraData = false;
+    gotAudio = false;
+    firstTime = true;
     if (!avifileinfo)
         return;
 
-#define FILLTEXT(a,b,c) {snprintf(text,MXL,b,c); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
-#define FILLTEXT4(a,b,c,d) {snprintf(text,MXL,b,c,d); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
-#define FILLTEXT5(a,b,c,d,e) {snprintf(text,MXL,b,c,d,e); listOfValues.push_back(QString::fromUtf8(text)); ui.a->setText(QString::fromUtf8(text));}
-#define SET_YES(a,b) ui.a->setText(QString::fromUtf8(yesno[b]))
-#define FILLQT_TRANSLATE_NOOP(a,q) listOfValues.push_back(QString::fromUtf8(text)); ui.q->setText(QString::fromUtf8(text));
+#define FILL(a) ui.a->setText(QString::fromUtf8(text));
+#define FILLTEXT(a,b,c) { snprintf(text,MXL,b,c); FILL(a) }
+#define FILLTEXT4(a,b,c,d) { snprintf(text,MXL,b,c,d); FILL(a) }
+#define FILLTEXT5(a,b,c,d,e) { snprintf(text,MXL,b,c,d,e); FILL(a) }
+//#define SET_YES(a,b) ui.a->setText(QString::fromUtf8(yesno[b]))
 
     //------------------------------------
 
-    FILLTEXT(label4CC, "%s", fourCC::tostring(avifileinfo->fcc));
+    FILLTEXT(label4CCValue, "%s", fourCC::tostring(avifileinfo->fcc))
 
-    FILLTEXT4(labeImageSize,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height);
+    FILLTEXT4(labelImageSizeValue,QT_TRANSLATE_NOOP("qprops","%" PRIu32" x %" PRIu32), avifileinfo->width,avifileinfo->height)
 
     war=video_body->getPARWidth();
     har=video_body->getPARHeight();
     getAspectRatioFromAR(war,har, &s);
-    FILLTEXT5(LabelAspectRatio,QT_TRANSLATE_NOOP("qprops","%s (%u:%u)"), s,war,har);
 
-    FILLTEXT(labelFrameRate, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F);
+    FILLTEXT5(labelAspectRatioValue, QT_TRANSLATE_NOOP("qprops","%s (%u:%u)"), s, war, har)
+
+    FILLTEXT(labelFrameRateValue, QT_TRANSLATE_NOOP("qprops","%2.3f fps"), (float) avifileinfo->fps1000 / 1000.F)
+
+    if (avifileinfo->bitrate < 0)
+    {
+        FILLTEXT(labelVideoBitrateValue, "%s", QT_TRANSLATE_NOOP("qprops","n/a"))
+    }
+    else
+    {
+        FILLTEXT(labelVideoBitrateValue, QT_TRANSLATE_NOOP("qprops","%d kbps"), avifileinfo->bitrate)
+    }
 
     uint64_t duration=video_body->getVideoDuration();
     ms2time(duration/1000,&hh,&mm,&ss,&ms);
     snprintf(text, MXL, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
-    listOfValues.push_back(text);
-    ui.labelVideoDuration->setText(text);
 
-    uint32_t extraLen;
+    FILL(labelVideoDurationValue)
+
+    uint32_t extraLen = 0;
     uint8_t *extraData;
     video_body->getExtraHeaderData(&extraLen,&extraData);
-    FILLTEXT(LabelExtraDataSize,"%02d",extraLen);
+
+    FILLTEXT(labelExtraDataSizeValue,"%d",extraLen)
 
     if(extraLen)
     {
         int capped=extraLen;
-        if(capped>10) capped=10;
+#define EXTRADATA_CAP 64
+        if(capped > EXTRADATA_CAP) capped = EXTRADATA_CAP;
+        int missing = extraLen - capped;
         QString string;
-        char smallx[10];
+        char smallx[4];
         for(int i=0;i<capped;i++)
         {
             snprintf(smallx,4,"%02X ",extraData[i]);
-            string+=QString(smallx);
+            string += smallx;
         }
-        listOfValues.push_back(string);
-        ui.LabelExtraData->setText(string);
+        if(missing)
+        {
+            char hint[32];
+            snprintf(hint, 32, QT_TRANSLATE_NOOP("qprops","(+%d bytes)"), missing);
+            string += hint;
+        }
+        ui.lineEditExtraData->insert(string);
+        ui.lineEditExtraData->setCursorPosition(0);
+        gotExtraData = true;
     }else
-        ui.LabelExtraData->clear();
+    {
+        ui.lineEditExtraData->clear();
+    }
+    ui.labelExtraData->setEnabled(gotExtraData);
+    ui.lineEditExtraData->setVisible(gotExtraData);
 
     //------------------------------------
     WAVHeader *wavinfo=NULL;
@@ -93,6 +119,7 @@
         wavinfo=st->getInfo();
     if(wavinfo)
     {
+        gotAudio = true;
         int nbActive=video_body->getNumberOfActiveAudioTracks();
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
         QString titleAudio=QCoreApplication::translate("qprops","Audio (%n active track(s))",NULL,nbActive);
@@ -100,10 +127,10 @@
         QString titleAudio=QCoreApplication::translate("qprops","Audio (%n active track(s))",NULL,QCoreApplication::UnicodeUTF8,nbActive);
 #endif
         ui.groupBoxAudio->setTitle(titleAudio);
-        listOfValues.push_back(titleAudio);
 
         snprintf(text, MXL, "%s", getStrFromAudioCodec(wavinfo->encoding));
-        FILLQT_TRANSLATE_NOOP("qprops",labelACodec);
+
+        FILL(labelACodecName)
 
         uint32_t channels=wavinfo->channels;
         uint32_t frequency=wavinfo->frequency;
@@ -141,32 +168,112 @@
                 break;
         }
 
-        FILLQT_TRANSLATE_NOOP("qprops",labelChannels);
+        FILL(labelChannelsValue)
 
-        FILLTEXT4(labelBitrate, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate, wavinfo->byterate * 8 / 1000);
+        FILLTEXT4(labelAudioBitrateValue, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Bps / %" PRIu32" kbps"), wavinfo->byterate, wavinfo->byterate * 8 / 1000)
 
-        FILLTEXT(labelVBR,"%s","n/a");
+        FILLTEXT(labelVBRDetected,"%s","n/a")
 
-        FILLTEXT(labelFrequency, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), frequency);
+        FILLTEXT(labelFrequencyValue, QT_TRANSLATE_NOOP("qprops","%" PRIu32" Hz"), frequency)
 
         ms2time(duration/1000,&hh,&mm,&ss,&ms);
         sprintf(text, QT_TRANSLATE_NOOP("qprops","%02d:%02d:%02d.%03d"), hh, mm, ss, ms);
-        FILLQT_TRANSLATE_NOOP("qprops",labelAudioDuration);
+
+        FILL(labelAudioDurationValue)
+
         ui.labelAudioDuration->setEnabled(!!duration);
 
 //                SET_YES(labelVBR,currentaudiostream->isVBR());
     } else
     {
         ui.groupBoxAudio->setEnabled(false);
+#define CLEAR(x) ui.x->clear();
+        CLEAR(labelACodecName)
+        CLEAR(labelChannelsValue)
+        CLEAR(labelAudioBitrateValue)
+        CLEAR(labelVBRDetected)
+        CLEAR(labelFrequencyValue)
+        CLEAR(labelAudioDurationValue)
+#undef CLEAR
     }
 
     connect(ui.pushButton_c2c,SIGNAL(clicked()),this,SLOT(propsCopyToClipboard()));
+
+    adjustSize(); // squeeze out all the air
+}
+/**
+    \fn showEvent
+    \brief Align the columns in the video and audio group boxes.
+*/
+void propWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+
+    if(!firstTime) return;
+    firstTime = false;
+
+    int cmp,w = 0;
+
+#define MAXME(x) if(ui.x->isVisible()) { cmp = ui.x->width(); if(cmp > w) w = cmp; }
+
+    MAXME(label4CC)
+    MAXME(labelImageSize)
+    MAXME(labelAspectRatio)
+    MAXME(labelFrameRate)
+    MAXME(labelVideoBitrate)
+    MAXME(labelVideoDuration)
+    MAXME(labelACodec)
+    MAXME(labelChannels)
+    MAXME(labelAudioBitrate)
+    MAXME(labelVBR)
+    MAXME(labelFrequency)
+    MAXME(labelAudioDuration)
+
+    ui.label4CC->setMinimumWidth(w);
+    ui.labelACodec->setMinimumWidth(w);
+    // We don't force minimum width for the left column in the video extradata
+    // group box to give more space to QLineEdit displaying extradata hexdump,
+    // unless we have no extradata.
+    if(!gotExtraData)
+    {
+        ui.labelExtraDataSize->setMinimumWidth(w);
+        // When QLineEdit is hidden, the copy to clipboard button gets the focus.
+        // Move focus back to the OK button.
+        ui.pushButton_ok->setFocus(Qt::OtherFocusReason);
+    }
+
+    w = 0;
+
+    MAXME(label4CCValue)
+    MAXME(labelImageSizeValue)
+    MAXME(labelAspectRatioValue)
+    MAXME(labelFrameRateValue)
+    MAXME(labelVideoBitrateValue)
+    MAXME(labelVideoDurationValue)
+    MAXME(labelACodecName)
+    MAXME(labelChannelsValue)
+    MAXME(labelAudioBitrateValue)
+    MAXME(labelVBRDetected)
+    MAXME(labelFrequencyValue)
+    MAXME(labelAudioDurationValue)
+
+    ui.label4CCValue->setMinimumWidth(w);
+    ui.labelExtraDataSizeValue->setMinimumWidth(w);
+    ui.labelACodecName->setMinimumWidth(w);
+
+    // work around dialog window not resized properly at least on macOS
+    resize(sizeHint());
 }
 
-#define ADDCATEGORY(a) props += QString("\n=====================================================\n")\
-                               +QString::fromUtf8(a)\
-                               +QString("\n=====================================================\n");
-#define ADDNAMEVALUE(a,b) props += QString::fromUtf8(a)+QString("\t")+QString(b)+QString("\n");
+#define ADDCATEGORY(a) props += "\n=====================================================\n" \
+                             +  ui.a->title() \
+                             +  "\n=====================================================\n";
+#define ADDNAMEVALUE(a,b) { \
+    int l = ui.a->text().size(); \
+    props += ui.a->text(); \
+    do { props += "\t"; l += 8; } while(l < 24); /* assuming tab width of 8 characters */ \
+    props += ui.b->text() + "\n"; \
+}
 
 /**
     \fn propsCopyToClipboard
@@ -174,56 +281,36 @@
 */
 void propWindow::propsCopyToClipboard(void)
 {
-    if(listOfValues.size()<6) // something went wrong and the list is not sufficiently populated
-        return;
-
     QString props;
-    props = QString();
 
-    ADDCATEGORY(QT_TRANSLATE_NOOP("qprops","Video"))
+    ADDCATEGORY(groupBoxVideo)
 
-    ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Codec 4CC:\t"),listOfValues.at(0))
+    ADDNAMEVALUE(label4CC,label4CCValue)
+    ADDNAMEVALUE(labelImageSize,labelImageSizeValue)
+    ADDNAMEVALUE(labelAspectRatio,labelAspectRatioValue)
 
-    ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Image Size:\t"),listOfValues.at(1))
+    ADDNAMEVALUE(labelFrameRate,labelFrameRateValue)
+    ADDNAMEVALUE(labelVideoBitrate,labelVideoBitrateValue)
+    ADDNAMEVALUE(labelVideoDuration,labelVideoDurationValue)
 
-    ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Aspect Ratio:\t"),listOfValues.at(2))
+    ADDCATEGORY(groupBoxExtradata)
 
-    ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Frame Rate:\t"),listOfValues.at(3))
+    ADDNAMEVALUE(labelExtraDataSize,labelExtraDataSizeValue)
 
-    ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Total Duration:\t"),listOfValues.at(4))
+    if(gotExtraData)
+        ADDNAMEVALUE(labelExtraData,lineEditExtraData)
 
-    ADDCATEGORY(QT_TRANSLATE_NOOP("qprops","Extra Video Properties"))
+    ADDCATEGORY(groupBoxAudio)
 
-    ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","ExtraDataSize:\t"),listOfValues.at(5))
-
-    bool hasExtraData=false;
-    if((QString)listOfValues.at(5) != QString("00"))
+    if(gotAudio)
     {
-        hasExtraData=true;
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Extra data:\t"),listOfValues.at(6))
-    }
-
-    QString aud;
-    if(listOfValues.size() == 13+hasExtraData)
-        aud=listOfValues.at(6+hasExtraData);
-    else
-        aud=QString::fromUtf8(QT_TRANSLATE_NOOP("qprops","Audio"));
-
-    ADDCATEGORY(aud.toUtf8().constData())
-
-    if(listOfValues.size() == 13+hasExtraData)
-    {
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Codec:\t\t"),listOfValues.at(7+hasExtraData))
-
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Channels:\t"),listOfValues.at(8+hasExtraData))
-
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Bitrate:\t"),listOfValues.at(9+hasExtraData))
-
-        //ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Variable Bitrate"),listOfValues.at(10+hasExtraData))
-
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Frequency:\t"),listOfValues.at(11+hasExtraData))
+        ADDNAMEVALUE(labelACodec,labelACodecName)
+        ADDNAMEVALUE(labelChannels,labelChannelsValue)
+        ADDNAMEVALUE(labelAudioBitrate,labelAudioBitrateValue)
 
-        ADDNAMEVALUE(QT_TRANSLATE_NOOP("qprops","Total Duration:\t"),listOfValues.at(12+hasExtraData))
+        //ADDNAMEVALUE(labelVBR,labelVBRDetected)
+        ADDNAMEVALUE(labelFrequency,labelFrequencyValue)
+        ADDNAMEVALUE(labelAudioDuration,labelAudioDurationValue)
     }else
     {
         props += QT_TRANSLATE_NOOP("qprops","No Audio");

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_props.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_working.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>520</width>
-    <height>317</height>
+    <width>502</width>
+    <height>344</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -44,10 +44,17 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <layout class="QGridLayout" name="gridLayout">
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_26">
+         <item row="0" column="1">
+          <widget class="QLabel" name="labelPhase">
            <property name="text">
-            <string>Time Remaining:</string>
+            <string>None</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Phase:</string>
            </property>
           </widget>
          </item>
@@ -61,13 +68,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QLabel" name="labelPhasis">
-           <property name="text">
-            <string>None</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="1">
           <widget class="QLabel" name="labelETA">
            <property name="text">
@@ -75,32 +75,16 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_2">
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_26">
            <property name="text">
-            <string>Phase:</string>
+            <string>Time Remaining:</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
-        <spacer name="verticalSpacer1">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>8</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
         <layout class="QHBoxLayout" name="horizontalLayout1">
          <item>
           <widget class="QCheckBox" name="checkBoxShutdown">
@@ -188,6 +172,54 @@
         </layout>
        </item>
        <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QCheckBox" name="checkBoxDeleteStats">
+           <property name="text">
+            <string>Delete first pass log files</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QLabel" name="labelFileName">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Output File:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEditFN">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
         <spacer name="verticalSpacer2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/props.ui -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/props.ui Changed

@@ -6,16 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>291</width>
-    <height>451</height>
+    <width>360</width>
+    <height>535</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Properties</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBox">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBoxVideo">
      <property name="title">
       <string>Video</string>
      </property>
@@ -39,82 +39,96 @@
        <number>6</number>
       </property>
       <item row="3" column="1">
-       <widget class="QLabel" name="labelFrameRate">
+       <widget class="QLabel" name="labelFrameRateValue">
         <property name="text">
-         <string>TextLabel</string>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelAspectRatio">
         <property name="text">
-         <string>Frame Rate:</string>
+         <string>Aspect Ratio:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="QLabel" name="labelVideoDuration">
+      <item row="1" column="1">
+       <widget class="QLabel" name="labelImageSizeValue">
         <property name="text">
-         <string>TextLabel</string>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_5">
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelImageSize">
+        <property name="text">
+         <string>Image Size:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="labelVideoDuration">
         <property name="text">
          <string>Total Duration:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="LabelAspectRatio">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label4CC">
         <property name="text">
-         <string>TextLabel</string>
+         <string>Codec 4CC:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_6">
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelFrameRate">
         <property name="text">
-         <string>Aspect Ratio:</string>
+         <string>Frame Rate:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="labeImageSize">
+      <item row="2" column="1">
+       <widget class="QLabel" name="labelAspectRatioValue">
         <property name="text">
-         <string>TextLabel</string>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label">
+      <item row="5" column="1">
+       <widget class="QLabel" name="labelVideoDurationValue">
         <property name="text">
-         <string>Image Size:</string>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="label4CC">
+       <widget class="QLabel" name="label4CCValue">
         <property name="text">
-         <string>TextLabel</string>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+      <item row="4" column="0">
+       <widget class="QLabel" name="labelVideoBitrate">
         <property name="text">
-         <string>Codec 4CC:</string>
+         <string>Average Bitrate:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLabel" name="labelVideoBitrateValue">
+        <property name="text">
+         <string>n/a</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBox_2">
+   <item>
+    <widget class="QGroupBox" name="groupBoxExtradata">
      <property name="title">
-      <string>Extra Video Properties</string>
+      <string>Video Codec Extradata</string>
      </property>
      <layout class="QGridLayout">
       <property name="leftMargin">
@@ -133,37 +147,37 @@
        <number>6</number>
       </property>
       <item row="0" column="1">
-       <widget class="QLabel" name="LabelExtraDataSize">
+       <widget class="QLabel" name="labelExtraDataSizeValue">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="QLabel" name="label_9">
+       <widget class="QLabel" name="labelExtraDataSize">
         <property name="text">
-         <string>ExtraDataSize:</string>
+         <string>Size:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="LabelExtraData">
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelExtraData">
         <property name="text">
-         <string/>
+         <string>Extradata:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Extra data :</string>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="lineEditExtraData">
+        <property name="readOnly">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3">
+   <item>
     <widget class="QGroupBox" name="groupBoxAudio">
      <property name="title">
       <string>Audio</string>
@@ -188,84 +202,84 @@
        <number>6</number>
       </property>
       <item row="5" column="1">
-       <widget class="QLabel" name="labelAudioDuration">
+       <widget class="QLabel" name="labelAudioDurationValue">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0">
-       <widget class="QLabel" name="label_13">
+       <widget class="QLabel" name="labelAudioDuration">
         <property name="text">
          <string>Total Duration:</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0">
-       <widget class="QLabel" name="label_11">
+       <widget class="QLabel" name="labelFrequency">
         <property name="text">
          <string>Frequency:</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="QLabel" name="labelFrequency">
+       <widget class="QLabel" name="labelFrequencyValue">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="label_14">
+       <widget class="QLabel" name="labelVBR">
         <property name="text">
          <string>Variable Bitrate:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QLabel" name="labelVBR">
+       <widget class="QLabel" name="labelVBRDetected">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QLabel" name="labelBitrate">
+       <widget class="QLabel" name="labelAudioBitrateValue">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_15">
+       <widget class="QLabel" name="labelAudioBitrate">
         <property name="text">
          <string>Bitrate:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLabel" name="labelChannels">
+       <widget class="QLabel" name="labelChannelsValue">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_10">
+       <widget class="QLabel" name="labelChannels">
         <property name="text">
          <string>Channels:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="labelACodec">
+       <widget class="QLabel" name="labelACodecName">
         <property name="text">
-         <string/>
+         <string>n/a</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="QLabel" name="label_12">
+       <widget class="QLabel" name="labelACodec">
         <property name="text">
          <string>Codec:</string>
         </property>
@@ -274,7 +288,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QPushButton" name="pushButton_c2c">

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp Changed

@@ -191,6 +191,11 @@
         fg = pal.color(QPalette::Text);
         bg = pal.color(QPalette::Base);
     }
+
+    bool disabled = index.data(DisabledRole).toBool();
+    if (disabled)
+        fg = pal.color(QPalette::Disabled, QPalette::WindowText);
+
     painter->fillRect(option.rect, bg);
     pen.setColor(fg);
     painter->setPen(pen);
@@ -198,6 +203,7 @@
     QString filterNameText = index.data(FilterNameRole).toString();
     QString descText = index.data(DescriptionRole).toString();
 
+
     QFont filterNameFont = QApplication::font();
     QFont descFont = QApplication::font();
     int fontSize = descFont.pointSize();
@@ -268,12 +274,23 @@
      ADM_info("Rank : %d\n",itag);
      ADM_coreVideoFilter     *filter=ADM_vf_getInstance(itag);
      ADM_assert(filter);
+    bool                      enabled = ADM_vf_getEnabled(itag);
+    uint32_t                  instanceTag=ADM_vf_getTag(itag);
+    const char               *name= ADM_vf_getDisplayNameFromTag(instanceTag);
     if (previewDialog)
     {
             delete previewDialog;
             previewDialog=NULL;
     }
-    previewDialog = new Ui_seekablePreviewWindow(this, filter, 0);
+
+    QString title = QT_TRANSLATE_NOOP("qmainfilter","Preview");
+    title += QString(" / ");
+    if (!enabled)
+        title += QT_TRANSLATE_NOOP("qmainfilter","DISABLED ");
+    title += QString::fromUtf8(name);
+
+    previewDialog = new Ui_seekablePreviewWindow(this, filter);
+    previewDialog->setWindowTitle(title);
     previewDialog->setModal(true);
     connect(previewDialog, SIGNAL(accepted()), this, SLOT(closePreview()));
     connect(previewDialog, SIGNAL(rejected()), this, SLOT(closePreview()));
@@ -291,6 +308,7 @@
     {
         if(previewDialog->seekablePreview)
         {
+            previewDialog->blockSignals(true); // we crash when this slot is invoked more than once
             previewDialog->seekablePreview->play(false);
             previewDialog->seekablePreview->goToTime(0);
         }
@@ -343,7 +361,19 @@
         }
    }
 }
-
+/**
+    \fn duplicate
+*/
+void filtermainWindow::duplicate()
+{
+    int filterIndex=getTagForActiveSelection();
+    if(-1==filterIndex)
+        return;
+    ADM_vf_duplicateFilterAtIndex(video_body, filterIndex);
+    buildActiveFilterList ();
+    if(nb_active_filter)
+        setSelected(nb_active_filter-1);
+}
 /**
     \fn removeAction
     \brief active filter context menu item
@@ -368,7 +398,10 @@
     buildActiveFilterList ();
     if(nb_active_filter)
     {
-          setSelected(nb_active_filter-1);
+        if (itag < nb_active_filter)
+            setSelected(itag);
+        else
+            setSelected(nb_active_filter-1);
     }
 }
 /**
@@ -381,6 +414,14 @@
 }
 
 /**
+    \fn duplicateAction
+    \brief active filter context menu item
+*/
+void filtermainWindow::duplicateAction(void)
+{
+    duplicate();
+}
+/**
  * \fn getTagForActiveSelection
  */
 int filtermainWindow::getTagForActiveSelection()
@@ -420,10 +461,28 @@
     int itag=getTagForActiveSelection();
     if(-1==itag)
         return;
+    if(0==itag) // already at the top
+        return;
     ADM_vf_moveFilterUp(itag);
     buildActiveFilterList ();
     setSelected(itag-1);
 }
+
+/**
+ * 
+ */
+void filtermainWindow::togglePartial()
+{
+    int filterIndex=getTagForActiveSelection();
+    if(-1==filterIndex)
+        return;
+    uint32_t tag=ADM_vf_getTag(filterIndex);
+    if (tag == VF_PARTIAL_FILTER)
+        absolvePartial();
+    else
+        makePartial();
+        
+}
 /**
  * 
  */
@@ -448,11 +507,50 @@
         buildActiveFilterList ();
         setSelected(filterIndex);
     }else
-      {
+    {
         ADM_info("CANCEL \n");
-      }
+    }
+}
+/**
+ * 
+ */
+void filtermainWindow::absolvePartial()
+{
+    ADM_info("Absolve Partial\n");
+    int filterIndex=getTagForActiveSelection();
+    if(-1==filterIndex)
+        return;
+    ADM_info("Absolve Partial %d\n",filterIndex);
+    // Check we can partialize it...
+    uint32_t tag=ADM_vf_getTag(filterIndex);
+    if(tag!=VF_PARTIAL_FILTER)
+    {
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("qmainfilter","Partial"),QT_TRANSLATE_NOOP("qmainfilter","This filter is not partial"));
+        return;
+    }
+    // Get info about that filter..
+    if(ADM_vf_absolvePartialized(filterIndex))
+    {
+        ADM_info("Absolving partialized done, rebuilding \n");
+        buildActiveFilterList ();
+        setSelected(filterIndex);
+    }else
+    {
+        ADM_info("CANCEL \n");
+    }
+}
+/**
+ * 
+ */
+void filtermainWindow::toggleEnabled()
+{
+    int filterIndex=getTagForActiveSelection();
+    if(-1==filterIndex)
+        return;
+    ADM_vf_toggleFilterEnabledAtIndex(filterIndex);
+    buildActiveFilterList ();
+    setSelected(filterIndex);
 }
-
 /**
         \fn     down( bool b)
         \brief  Move selected filter one place down
@@ -560,6 +658,7 @@
     {
         uint32_t                instanceTag=ADM_vf_getTag(i);
         ADM_coreVideoFilter     *instance=ADM_vf_getInstance(i);
+        bool                    enabled = ADM_vf_getEnabled(i);
         const char *name= ADM_vf_getDisplayNameFromTag(instanceTag);
         const char *conf=instance->getConfiguration();
         printf("%d %s\n",i,name);
@@ -570,6 +669,7 @@
         QListWidgetItem *item=new QListWidgetItem(NULL,activeList,ACTIVE_FILTER_BASE+i);
         item->setData(FilterItemDelegate::FilterNameRole, s1);
         item->setData(FilterItemDelegate::DescriptionRole, s2);
+        item->setData(FilterItemDelegate::DisabledRole, !enabled);
         printf("Active item :%p\n",item);
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
         activeList->addItem(item);
@@ -581,25 +681,54 @@
 */
 void filtermainWindow::activeListContextMenu(const QPoint &pos)
 {
-    QMenu *cm=new QMenu();
+    if(!nb_active_filter)
+        return;
+    if(!activeList->currentItem())
+        return;
+
+    QMenu *cm=new QMenu(this);
 
     QAction *up = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move up")),cm);
     QAction *down = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Move down")),cm);
     QAction *configure = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Configure")),cm);
+    QAction *duplicate = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Duplicate")),cm);
     QAction *remove = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Remove")),cm);
     QAction *partial = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Make partial")),cm);
+    QAction *enabled = new QAction(QString(QT_TRANSLATE_NOOP("qmainfilter","Enable/Disable")),cm);
+
+    up->setShortcut(shortcutMoveUp);
+    down->setShortcut(shortcutMoveDown);
+    configure->setShortcut(shortcutConfigure);
+    duplicate->setShortcut(shortcutDuplicate);
+    remove->setShortcut(shortcutRemove);
+    partial->setShortcut(shortcutTogglePartial);
+    enabled->setShortcut(shortcutToggleEnabled);
+
+#if defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    up->setShortcutVisibleInContextMenu(true);
+    down->setShortcutVisibleInContextMenu(true);
+    configure->setShortcutVisibleInContextMenu(true);
+    duplicate->setShortcutVisibleInContextMenu(true);
+    remove->setShortcutVisibleInContextMenu(true);
+    partial->setShortcutVisibleInContextMenu(true);
+    enabled->setShortcutVisibleInContextMenu(true);
+#endif
 
     cm->addAction(up);
     cm->addAction(down);
     cm->addAction(configure);
+    cm->addAction(duplicate);
     cm->addAction(remove);
     cm->addAction(partial);
+    cm->addAction(enabled);
 
     connect(up,SIGNAL(triggered()),this,SLOT(moveUp()));
     connect(down,SIGNAL(triggered()),this,SLOT(moveDown()));
     connect(configure,SIGNAL(triggered()),this,SLOT(configureAction()));
+    connect(duplicate,SIGNAL(triggered()),this,SLOT(duplicateAction()));
     connect(remove,SIGNAL(triggered()),this,SLOT(removeAction()));
-    connect(partial,SIGNAL(triggered()),this,SLOT(makePartial()));
+    connect(partial,SIGNAL(triggered()),this,SLOT(togglePartial()));
+    connect(enabled,SIGNAL(triggered()),this,SLOT(toggleEnabled()));
 
     updateContextMenu(cm);
     cm->exec(activeList->viewport()->mapToGlobal(pos));
@@ -620,6 +749,7 @@
     bool canMoveUp=true;
     bool canMoveDown=true;
     bool canPartialize=true;
+    bool partialized=false;
     QListWidgetItem *item=activeList->currentItem();
     if(!item)
         return;
@@ -629,6 +759,7 @@
     itag -= ACTIVE_FILTER_BASE;
     uint32_t tag=ADM_vf_getTag(itag);
     canPartialize=ADM_vf_canBePartialized(tag);
+    partialized=(tag==VF_PARTIAL_FILTER);
 
     int row=item->listWidget()->row(item);
     if(!row)
@@ -636,9 +767,29 @@
     if(row==nb_active_filter-1)
         canMoveDown=false;
 
-    contextMenu->actions().at(0)->setEnabled(canMoveUp);
-    contextMenu->actions().at(1)->setEnabled(canMoveDown);
-    contextMenu->actions().at(4)->setEnabled(canPartialize);
+    const char *textEnable = ADM_vf_getEnabled(itag) ?
+        QT_TRANSLATE_NOOP("qmainfilter","Disable") :
+        QT_TRANSLATE_NOOP("qmainfilter","Enable");
+    
+    const char *textPartial = partialized ? 
+        QT_TRANSLATE_NOOP("qmainfilter","Make global") :
+        QT_TRANSLATE_NOOP("qmainfilter","Make partial");
+
+    for(int i = 0; i < contextMenu->actions().size(); i++)
+    {
+        QAction *a = contextMenu->actions().at(i);
+
+        if(a->shortcut() == shortcutTogglePartial)
+            a->setText(QString::fromUtf8(textPartial));
+
+#define MATCHME(x,y) if(a->shortcut() == shortcut##x) { a->setEnabled(y); continue; }
+        MATCHME(MoveUp,canMoveUp)
+        MATCHME(MoveDown,canMoveDown)
+        MATCHME(TogglePartial,canPartialize||partialized)
+
+        if(a->shortcut() == shortcutToggleEnabled)
+            a->setText(QString::fromUtf8(textEnable));
+    }
 }
 
 /**
@@ -670,6 +821,8 @@
                 this,SLOT(filterFamilyClick(QListWidgetItem *)));
     connect(ui.listFilterCategory,SIGNAL(itemClicked(QListWidgetItem *)),
                 this,SLOT(filterFamilyClick(QListWidgetItem *)));
+    connect(ui.listFilterCategory,SIGNAL(currentRowChanged(int)),
+                this,SLOT(filterFamilyClick(int)));
 
     connect(activeList,SIGNAL(itemDoubleClicked(QListWidgetItem *)),this,SLOT(activeDoubleClick(QListWidgetItem *)));
     connect(availableList,SIGNAL(itemDoubleClicked(QListWidgetItem *)),this,SLOT(allDoubleClick(QListWidgetItem *)));
@@ -677,6 +830,7 @@
     connect(ui.buttonClose, SIGNAL(clicked(bool)), this, SLOT(accept()));
     connect(ui.pushButtonPreview, SIGNAL(clicked(bool)), this, SLOT(preview(bool)));
 
+    ADM_vf_rebuildBridge(video_body);
     displayFamily(0);
     buildActiveFilterList();
     setSelected(nb_active_filter - 1);
@@ -699,7 +853,7 @@
 #else
     keycode = Qt::Key_Delete;
 #endif
-    QKeySequence seq(keycode);
+    shortcutRemove = QKeySequence(keycode);
     bool alt = false;
     prefs->get(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,&alt);
     if(alt)
@@ -709,13 +863,47 @@
         if(sc.size())
         {
             QString qs = QString::fromUtf8(sc.c_str());
-            seq = QKeySequence::fromString(qs);
+            shortcutRemove = QKeySequence::fromString(qs);
         }
     }
-    rem->setShortcut(seq);
+    rem->setShortcut(shortcutRemove);
     addAction(rem);
     connect(rem,SIGNAL(triggered(bool)),this,SLOT(remove(bool)));
 
+    // TODO make configurable
+    shortcutMoveUp = QKeySequence(Qt::ShiftModifier | Qt::Key_Up);
+    shortcutMoveDown = QKeySequence(Qt::ShiftModifier | Qt::Key_Down);
+    shortcutConfigure = QKeySequence(Qt::Key_Return);
+    shortcutDuplicate = QKeySequence(Qt::ControlModifier | Qt::Key_D);
+    shortcutTogglePartial = QKeySequence(Qt::ShiftModifier | Qt::Key_P);
+    shortcutToggleEnabled = QKeySequence(Qt::ShiftModifier | Qt::Key_D);
+
+    QAction *movup = new QAction(this);
+    movup->setShortcut(shortcutMoveUp);
+    addAction(movup);
+    connect(movup,SIGNAL(triggered()),this,SLOT(moveUp()));
+
+    QAction *movdw = new QAction(this);
+    movdw->setShortcut(shortcutMoveDown);
+    addAction(movdw);
+    connect(movdw,SIGNAL(triggered()),this,SLOT(moveDown()));
+
+    QAction *dupl = new QAction(this);
+    dupl->setShortcut(shortcutDuplicate);
+    addAction(dupl);
+    connect(dupl,SIGNAL(triggered()),this,SLOT(duplicate()));
+
+    QAction *mkpartl = new QAction(this);
+    mkpartl->setShortcut(shortcutTogglePartial);
+    addAction(mkpartl);
+    connect(mkpartl,SIGNAL(triggered()),this,SLOT(togglePartial()));
+
+    QAction *tglenbl = new QAction(this);
+    tglenbl->setShortcut(shortcutToggleEnabled);
+    addAction(tglenbl);
+    connect(tglenbl,SIGNAL(triggered()),this,SLOT(toggleEnabled()));
+
+
     activeList->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(activeList,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(activeListContextMenu(const QPoint &)));
 
@@ -727,7 +915,7 @@
 #define HINT_LENGTH 256
     char hint[HINT_LENGTH];
     hint[0] = '\0';
-    QKeySequence acc(Qt::ControlModifier + Qt::Key_Return);
+    QKeySequence acc(Qt::ControlModifier | Qt::Key_Return);
     snprintf(hint,
         HINT_LENGTH,
         QT_TRANSLATE_NOOP("qmainfilter","Press %s to accept the dialog"),
@@ -780,6 +968,32 @@
                 accept();
             return true;
         }
+        if(keyEvent->key() == Qt::Key_Left)
+        {
+            if(ui.listWidgetAvailable->hasFocus())
+            {
+                ui.listFilterCategory->setFocus();
+                return true;
+            }
+            if(ui.listWidgetActive->hasFocus())
+            {
+                ui.listWidgetAvailable->setFocus();
+                return true;
+            }
+        }
+        if(keyEvent->key() == Qt::Key_Right)
+        {
+            if(ui.listFilterCategory->hasFocus())
+            {
+                ui.listWidgetAvailable->setFocus();
+                return true;
+            }
+            if(ui.listWidgetAvailable->hasFocus())
+            {
+                ui.listWidgetActive->setFocus();
+                return true;
+            }
+        }
     }
     return QObject::eventFilter(watched, event);
 }

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.h Changed

@@ -56,7 +56,7 @@
 
 public:
     FilterItemDelegate(QWidget *parent = 0);
-    enum datarole { FilterNameRole = Qt::UserRole, DescriptionRole };
+    enum datarole { FilterNameRole = Qt::UserRole, DescriptionRole, DisabledRole };
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
     QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
     static int padding;
@@ -85,7 +85,11 @@
     void add(bool b);
     void moveUp();
     void moveDown();
+    void togglePartial();
     void makePartial();
+    void absolvePartial();
+    void toggleEnabled();
+    void duplicate();
     void remove(bool b);
     void configure(bool b);
     void activeDoubleClick( QListWidgetItem  *item);
@@ -98,6 +102,7 @@
     void addSlot(void);
     void removeAction(void);
     void configureAction(void);
+    void duplicateAction(void);
     void activeListContextMenu(const QPoint &pos);
     // reorder active filters using drag-n-drop
     void rowsMovedSlot(void);
@@ -110,5 +115,14 @@
     void updateContextMenu(QMenu *contextMenu);
     bool eventFilter(QObject* watched, QEvent* event);
     uint64_t originalTime;
+private:
+    QKeySequence shortcutMoveUp;
+    QKeySequence shortcutMoveDown;
+    QKeySequence shortcutConfigure;
+    QKeySequence shortcutDuplicate;
+    QKeySequence shortcutRemove;
+    QKeySequence shortcutTogglePartial;
+    QKeySequence shortcutToggleEnabled;
+
 };

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/filter.qrc -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/filter.qrc Changed

@@ -1,6 +1,5 @@
 <RCC>
   <qresource prefix="/new/prefix1">
-    <file>../../../common/ADM_icons/videoFilter/gl.png</file>
     <file>../../../common/ADM_icons/videoFilter/up.png</file>
     <file>../../../common/ADM_icons/videoFilter/add.png</file>
     <file>../../../common/ADM_icons/videoFilter/cd.png</file>
@@ -12,13 +11,15 @@
     <file>../../../common/ADM_icons/videoFilter/filesaveas.png</file>
     <file>../../../common/ADM_icons/videoFilter/remove.png</file>
     <file>../../../common/ADM_icons/videoFilter/thumbnail.png</file>
-    <file>../../../common/ADM_icons/videoFilter/1.png</file>
-    <file>../../../common/ADM_icons/videoFilter/2.png</file>
-    <file>../../../common/ADM_icons/videoFilter/3.png</file>
-    <file>../../../common/ADM_icons/videoFilter/4.png</file>
-    <file>../../../common/ADM_icons/videoFilter/5.png</file>
-    <file>../../../common/ADM_icons/videoFilter/6.png</file>
-    <file>../../../common/ADM_icons/videoFilter/7.png</file>
-    <file>../../../common/ADM_icons/videoFilter/8.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-transform.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-transition.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-interlacing.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-colors.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-noise.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-sharpness.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-subtitles.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-opengl.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-artistic.png</file>
+    <file>../../../common/ADM_icons/videoFilter/filter-category-misc.png</file>
   </qresource>
 </RCC>

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/mainfilter.ui -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/mainfilter.ui Changed

@@ -109,7 +109,16 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/1.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/1.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-transform.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-transform.png</iconset>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Transition</string>
+        </property>
+        <property name="icon">
+         <iconset resource="filter.qrc">
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-transition.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-transition.png</iconset>
         </property>
        </item>
        <item>
@@ -118,7 +127,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/2.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/2.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-interlacing.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-interlacing.png</iconset>
         </property>
        </item>
        <item>
@@ -127,7 +136,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/4.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/4.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-colors.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-colors.png</iconset>
         </property>
        </item>
        <item>
@@ -136,7 +145,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/5.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/5.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-noise.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-noise.png</iconset>
         </property>
        </item>
        <item>
@@ -145,7 +154,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/3.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/3.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-sharpness.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-sharpness.png</iconset>
         </property>
        </item>
        <item>
@@ -154,7 +163,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/7.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/7.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-subtitles.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-subtitles.png</iconset>
         </property>
        </item>
        <item>
@@ -163,7 +172,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/gl.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/gl.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-opengl.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-opengl.png</iconset>
         </property>
        </item>
        <item>
@@ -172,7 +181,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/8.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/8.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-artistic.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-artistic.png</iconset>
         </property>
        </item>
        <item>
@@ -181,7 +190,7 @@
         </property>
         <property name="icon">
          <iconset resource="filter.qrc">
-          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/6.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/6.png</iconset>
+          <normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-misc.png</normaloff>:/new/prefix1/common/ADM_icons/videoFilter/filter-category-misc.png</iconset>
         </property>
        </item>
       </widget>

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.cpp Changed

@@ -19,18 +19,58 @@
 #include <QWheelEvent>
 #include "ADM_mwNavSlider.h"
 #include "ADM_assert.h"
+#include "ADM_default.h"
 /**
     \fn ADM_QSlider
 */
 ADM_mwNavSlider::ADM_mwNavSlider(QWidget *parent) : ADM_QSlider(parent)
 {
     totalDuration= markerATime= markerBTime =0;
+    segments = NULL;
+    numOfSegments = 0;
+}
+/**
+    \fn dtor
+*/
+ADM_mwNavSlider::~ADM_mwNavSlider()
+{
+    if (segments)
+        delete [] segments;
+    segments = NULL;
 }
 /**
     \fn paintEvent
 */
 void ADM_mwNavSlider::paintEvent(QPaintEvent *event)
 {
+    if (segments && (numOfSegments > 0) && (totalDuration > 0LL))
+    {
+        int pos, prevpos;
+        prevpos = -1;
+        QPainter painter(this);
+        for (uint32_t i=0; i<numOfSegments; i++)
+        {
+            if (i==0)    // do not draw at the start position
+                continue;
+            if (segments[i] == ADM_NO_PTS)
+                continue;
+            pos = (int)(((double)segments[i] * width()) / (double)totalDuration);
+            if(pos < 1) pos = 1;
+            if(pos > width() - 1) pos = width() - 1;
+            if (pos == prevpos)
+                painter.setPen(Qt::darkMagenta);
+            else
+                painter.setPen(Qt::red);
+            prevpos = pos;
+
+            if(layoutDirection() == Qt::LeftToRight)
+                painter.drawLine(pos, 1, pos, height() - 3);
+            else
+                painter.drawLine(width() - pos, 1, width() - pos, height() - 3);
+        }
+        painter.end();
+    }
+
     QSlider::paintEvent(event);
 
     uint64_t a = markerATime, b = markerBTime;
@@ -99,6 +139,18 @@
     totalDuration = duration;
     repaint();
 }
+/**
+    \fn setSegments
+*/
+void ADM_mwNavSlider::setSegments(uint32_t numOfSegs, uint64_t * segPts)
+{
+    if (segments)
+        delete [] segments;
+    segments = new uint64_t[numOfSegs];
+    for (uint32_t i=0; i<numOfSegs; i++)
+        segments[i] = segPts[i];
+    numOfSegments = numOfSegs;
+}
 /*
     \fn wheelEvent
  */

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/ADM_mwNavSlider.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -20,6 +20,11 @@
 #include <QGraphicsView>
 #include <QtCore/QDir>
 #include <QMessageBox>
+#if QT_VERSION < QT_VERSION_CHECK(5,11,0)
+#   include <QDesktopWidget>
+#else
+#   include <QScreen>
+#endif
 #include <QClipboard>
 #ifdef USE_CUSTOM_TIME_DISPLAY_FONT
 #   include <QFontDatabase>
@@ -34,6 +39,7 @@
 #include "Q_gui2.h"
 #include "ADM_default.h"
 #include "ADM_toolkitQt.h"
+#include "ADM_QSettings.h"
 
 #include "DIA_fileSel.h"
 #include "ADM_vidMisc.h"
@@ -97,6 +103,7 @@
 int SliderIsShifted=0;
 static void setupMenus(void);
 static int shiftKeyHeld=0;
+static int ctrlKeyHeld=0;
 static ADM_mwNavSlider *slider=NULL;
 static int _upd_in_progres=0;
 bool     ADM_ve6_getEncoderInfo(int filter, const char **name, uint32_t *major,uint32_t *minor,uint32_t *patch);
@@ -123,6 +130,9 @@
 
 static bool needsResizing=false;
 
+static QAction *findAction(std::vector<MenuEntry> *list, Action action);
+static QAction *findActionInToolBar(QToolBar *tb, Action action);
+
 #define WIDGET(x)  (((MainWindow *)QuiMainWindows)->ui.x)
 
 #define CONNECT(object,zzz) connect( (ui.object),SIGNAL(triggered()),this,SLOT(buttonPressed()));
@@ -213,7 +223,10 @@
         { 
             default:
             case dragState_Normal:
-                sendAction(ACT_Scale);
+                if (!dragWhilePlay && ctrlKeyHeld)
+                    sendAction(ACT_FineScale);
+                else
+                    sendAction(ACT_Scale);
                 break;
             case dragState_Active:
                 dragTimer.stop();
@@ -224,7 +237,10 @@
               break;            
           }
     else
-         sendAction(ACT_Scale);
+        if (!dragWhilePlay && ctrlKeyHeld)
+            sendAction(ACT_FineScale);
+        else
+            sendAction(ACT_Scale);
 }
 
 /**
@@ -261,7 +277,10 @@
             break;            
         case dragState_HoldOff:
             dragState=dragState_Active;
-            sendAction(ACT_Scale);
+            if (!dragWhilePlay && ctrlKeyHeld)
+                sendAction(ACT_FineScale);
+            else
+                sendAction(ACT_Scale);
             break;
     }
 }
@@ -282,7 +301,12 @@
     SliderIsShifted = 0;
     dragTimer.stop();
     dragState=dragState_Normal;
-    sendAction(ACT_Scale);
+    if (!dragWhilePlay && ctrlKeyHeld)
+        sendAction(ACT_FineScale);
+    else
+        sendAction(ACT_Scale);
+    if (dragWhilePlay)
+        sendAction(ACT_PlayAvi); // resume playback
 }
 /**
  * \fn sliderPressed
@@ -291,6 +315,7 @@
 {
     if(playing)
         sendAction(ACT_PlayAvi); // stop playback
+    dragWhilePlay=playing;
     dragTimer.stop();
     dragState=dragState_Active;
 //  ADM_info("Pressed\n");
@@ -302,20 +327,73 @@
 { 
     if(way>0)
     {
-        sendAction(ACT_NextKFrame);
+        if (ctrlKeyHeld)
+            sendAction(ACT_NextFrame);
+        else
+            sendAction(ACT_NextKFrame);
         return;
     }
     if(way<0)
-        sendAction(ACT_PreviousKFrame);
-    
+    {
+        if (ctrlKeyHeld)
+            sendAction(ACT_PreviousFrame);
+        else
+            sendAction(ACT_PreviousKFrame);
+    }
 }
-
+/**
+ * \fn thumbSlider_valueEmitted
+ * \brief Slot to handle signals from the thumb slider.
+ */
 void MainWindow::thumbSlider_valueEmitted(int value)
 {
-        if (value > 0)
-                nextIntraFrame();
-        else
-                previousIntraFrame();
+    if (!avifileinfo)
+    {
+        if (value)
+            thumbSlider->reset();
+        return;
+    }
+
+    if (playing)
+    {
+        if (admPreview::getPreviewMode() != ADM_PREVIEW_NONE)
+            return;
+        sendAction(ACT_PlayAvi); // stop playback;
+        dragWhilePlay = true;
+        return;
+    } else if (dragWhilePlay && !value)
+    {
+        dragWhilePlay = false;
+        if (admPreview::getPreviewMode() == ADM_PREVIEW_NONE)
+            sendAction(ACT_PlayAvi); // resume playback;
+        return;
+    }
+
+    if (!value) return;
+
+    bool success = true;
+    if (value > 0)
+        success = admPreview::nextKeyFrame();
+    else
+        success = admPreview::previousKeyFrame();
+    if (success)
+    {
+        uint64_t total = video_body->getVideoDuration();
+        if (total)
+        {
+            uint64_t pts = admPreview::getCurrentPts();
+            UI_setCurrentTime(pts);
+
+            double percentage = pts;
+            percentage /= total;
+            percentage *= 100;
+
+            UI_setScale(percentage);
+        }
+        return;
+    }
+    thumbSlider->reset();
+    dragWhilePlay = false;
 }
 
 void MainWindow::volumeChange( int u )
@@ -341,13 +419,17 @@
 
 void MainWindow::previewModeChangedFromMenu(bool flop)
 {
-    ui.toolBar->actions().at(5)->setChecked(flop);
+    QAction *previewFiltered = findActionInToolBar(ui.toolBar, ACT_PreviewChanged);
+    if(previewFiltered)
+        previewFiltered->setChecked(flop);
     sendAction(ACT_PreviewChanged);
 }
 
 void MainWindow::previewModeChangedFromToolbar(bool flop)
 {
-    ui.menuVideo->actions().at(3)->setChecked(flop);
+    QAction *previewFiltered = findAction(&myMenuVideo, ACT_PreviewChanged);
+    if(previewFiltered)
+        previewFiltered->setChecked(flop);
     sendAction(ACT_PreviewChanged);
 }
 
@@ -356,13 +438,6 @@
     this->setFocus(Qt::OtherFocusReason);
 }
 
-void MainWindow::currentFrameChanged(void)
-{
-//    sendAction(ACT_JumpToFrame);
-
-    this->setFocus(Qt::OtherFocusReason);
-}
-
 void MainWindow::currentTimeChanged(void)
 {
     sendAction(ACT_GotoTime);
@@ -394,6 +469,143 @@
 }
 
 /**
+    \fn busyTimerTimeout
+*/
+void MainWindow::busyTimerTimeout(void)
+{
+    if ((busyCntr == 0) && QApplication::overrideCursor())
+        QApplication::restoreOverrideCursor();
+}
+
+/**
+    \fn actionSlot
+*/
+void MainWindow::actionSlot(Action a)
+{
+    if(a==ACT_PlayAvi && avifileinfo) // ugly
+    {
+        playing = !playing;
+        setMenuItemsEnabledState();
+        playing = !playing;
+        if(busyCntr && QApplication::overrideCursor())
+            QApplication::restoreOverrideCursor();
+    }
+    if(a > ACT_STAGED_BEGIN && a < ACT_STAGED_END)
+    {
+        actionLock++;
+        HandleAction(a);
+        actionLock--;
+        if(!stagedActionSuccess)
+            return; // currently, no action requires enabling or disabling menu items
+        switch(a)
+        {
+            case ACT_SetHDRConfig:
+                a = ACT_Refresh;
+                break;
+            case ACT_SelectTime:
+                a = ACT_GotoTime;
+                break;
+            default:break;
+        }
+    }
+    if(a>ACT_NAVIGATE_BEGIN && a<ACT_NAVIGATE_END)
+    {
+        busyTimer.stop();
+        busyCntr++;
+        if (!QApplication::overrideCursor())
+            QApplication::setOverrideCursor(Qt::WaitCursor);
+    }
+    actionLock++;
+    HandleAction(a);
+    actionLock--;
+    setMenuItemsEnabledState();
+    if(a>ACT_NAVIGATE_BEGIN && a<ACT_NAVIGATE_END)
+    {
+        busyCntr--;
+        if (busyCntr==0)
+            busyTimer.start(100);
+    }
+}
+
+/**
+    \fn sendAction
+*/
+void MainWindow::sendAction(Action a)
+{
+    if (((a>=ACT_Back1Second)&&(a<=ACT_Forward1Mn) || (a==ACT_GotoMarkA) || (a==ACT_GotoMarkB)) && (playing || (navigateWhilePlayingState != 0)))
+        navigateWhilePlaying(a);
+    else
+    if (((a==ACT_PreviousFrame)||(a==ACT_PreviousKFrame)) && (playing || (navigateWhilePlayingState != 0)))
+        navigateWhilePlaying(ACT_SeekBackward);
+    else
+    if (((a==ACT_NextFrame)||(a==ACT_NextKFrame)) && (playing || (navigateWhilePlayingState != 0)))
+        navigateWhilePlaying(ACT_SeekForward);
+    else
+    if(a>ACT_NAVIGATE_BEGIN && a<ACT_NAVIGATE_END && a!=ACT_Scale)
+    {
+        if (actionLock<=NAVIGATION_ACTION_LOCK_THRESHOLD)
+            emit actionSignal(a);
+    } else {
+        //printf("Sending internal event %d\n",(int)a);
+        emit actionSignal(a);
+    }
+}
+
+/**
+    \fn navigateWhilePlaying
+*/
+void MainWindow::navigateWhilePlaying(Action a)
+{
+    if (navigateWhilePlayingState != 0)
+    {
+        navigateWhilePlayingPendingAction = a;
+        return;
+    }
+    emit actionSignal(ACT_PlayAvi);
+    printf("navigateWhilePlaying\n");
+    navigateWhilePlayingState = 1;
+    navigateWhilePlayingAction = a;
+    navigateWhilePlayingPendingAction = ACT_INVALID;
+    navigateWhilePlayingTimer.stop();
+    navigateWhilePlayingTimer.start(10);
+}
+
+/**
+ * \fn navigateWhilePlayingTimerTimeout
+ */
+void MainWindow::navigateWhilePlayingTimerTimeout(void)
+{
+    switch(navigateWhilePlayingState)
+    {
+        case 1:
+            if (!playing)   // wait for stop
+            {
+                navigateWhilePlayingState++;
+                emit actionSignal(navigateWhilePlayingAction);
+            }
+            break;
+        case 2:
+            if (actionLock == 0)    // wait for action to completed
+            {
+                if (navigateWhilePlayingPendingAction != ACT_INVALID)
+                {
+                    navigateWhilePlayingAction = navigateWhilePlayingPendingAction;
+                    navigateWhilePlayingState = 1;
+                    navigateWhilePlayingPendingAction = ACT_INVALID;
+                    break;
+                }
+                navigateWhilePlayingState = 0;
+                navigateWhilePlayingTimer.stop();
+                emit actionSignal(ACT_PlayAvi);
+            }
+            break;
+        default:
+            navigateWhilePlayingState = 0;
+            navigateWhilePlayingTimer.stop();
+            break;
+    }
+}
+/**
     \fn ctor
 */
 MainWindow::MainWindow(const vector<IScriptEngine*>& scriptEngines) : _scriptEngines(scriptEngines), QMainWindow()
@@ -402,8 +614,13 @@
     qtRegisterDialog(this);
     ui.setupUi(this);
     dragState=dragState_Normal;
+    navigateWhilePlayingState=0;
     recentFiles = NULL;
     recentProjects = NULL;
+    displayZoom = NULL;
+    actionLock = 0;
+    busyCntr = 0;
+    busyTimer.setSingleShot(true);
 
 #if defined(__APPLE__) && defined(USE_SDL)
     //ui.actionAbout_avidemux->setMenuRole(QAction::NoRole);
@@ -442,6 +659,8 @@
         connect( qslider,SIGNAL(sliderAction(int)),this,SLOT(sliderWheel(int)));
         
         connect( &dragTimer, SIGNAL(timeout()), this, SLOT(dragTimerTimeout()));
+        connect( &busyTimer, SIGNAL(timeout()), this, SLOT(busyTimerTimeout()));
+        connect( &navigateWhilePlayingTimer, SIGNAL(timeout()), this, SLOT(navigateWhilePlayingTimerTimeout()));
     
 
    // Thumb slider
@@ -513,9 +732,22 @@
     AUTOREPEAT_TOOLBUTTON(toolButtonPreviousIntraFrame)
     AUTOREPEAT_TOOLBUTTON(toolButtonNextIntraFrame)
 
+    ui.toolBar->addSeparator();
+
     // Crash in some cases addScriptReferencesToHelpMenu();
-    connect(ui.menuVideo->actions().at(3),SIGNAL(toggled(bool)),this,SLOT(previewModeChangedFromMenu(bool)));
-    connect(ui.toolBar->actions().at(5),SIGNAL(toggled(bool)),this,SLOT(previewModeChangedFromToolbar(bool)));
+    QAction *previewFiltered = findAction(&myMenuVideo, ACT_PreviewChanged);
+    if(previewFiltered)
+        connect(previewFiltered, SIGNAL(toggled(bool)), this, SLOT(previewModeChangedFromMenu(bool)));
+    previewFiltered = findActionInToolBar(ui.toolBar, ACT_PreviewChanged);
+    if(previewFiltered)
+        connect(previewFiltered, SIGNAL(toggled(bool)), this, SLOT(previewModeChangedFromToolbar(bool)));
+
+    // Add action to show all dock widgets and move the toolbar to its default area
+    QAction *restoreDefaults = new QAction(QT_TRANSLATE_NOOP("qgui2","Restore defaults"),this);
+    ui.menuToolbars->addSeparator();
+    ui.menuToolbars->addAction(restoreDefaults);
+
+    connect(ui.menuToolbars->actions().last(),SIGNAL(triggered(bool)),this,SLOT(restoreDefaultWidgetState(bool)));
 
     this->installEventFilter(this);
     slider->installEventFilter(this);
@@ -533,6 +765,7 @@
 
     // Hook also the toolbar
     connect(ui.toolBar,  SIGNAL(actionTriggered ( QAction *)),this,SLOT(searchToolBar(QAction *)));
+    connect(ui.toolBar,  SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(toolbarOrientationChangedSlot(Qt::Orientation)));
     //connect(ui.toolBar_2,SIGNAL(actionTriggered ( QAction *)),this,SLOT(searchToolBar(QAction *)));
 
     QWidget* dummy0 = new QWidget();
@@ -550,12 +783,14 @@
     widgetsUpdateTooltips();
 
     this->adjustSize();
+    ui.currentTime->setTextMargins(0,0,0,0); // some Qt themes mess with text margins
 
     threshold = RESIZE_THRESHOLD;
     actZoomCalled = false;
     ignoreResizeEvent = false;
     blockResizing = false;
     blockZoomChanges = true;
+    dragWhilePlay = false;
 
     QuiTaskBarProgress=createADMTaskBarProgress();
 }
@@ -601,7 +836,7 @@
 /**
     \fn findActionInToolBar
 */
-static QAction *findActionInToolBar(QToolBar *tb, Action action)
+QAction *findActionInToolBar(QToolBar *tb, Action action)
 {
     toolBarTranslate *t = toolbar;
     const char *name = NULL;
@@ -634,7 +869,7 @@
 /**
     \fn getMenuEntryForAction
 */
-static const MenuEntry *getMenuEntryForAction(std::vector<MenuEntry> *list, QAction *action)
+const MenuEntry *getMenuEntryForAction(std::vector<MenuEntry> *list, QAction *action)
 {
     for(int i=0; i < list->size(); i++)
     {
@@ -740,6 +975,12 @@
                                     case ACT_MarkB:
                                         prefs->get(KEYBOARD_SHORTCUTS_ALT_MARK_B,sc);
                                         break;
+                                    case ACT_ResetMarkerA:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARK_A,sc);
+                                        break;
+                                    case ACT_ResetMarkerB:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARK_B,sc);
+                                        break;
                                     case ACT_ResetMarkers:
                                         prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARKERS,sc);
                                         break;
@@ -844,13 +1085,10 @@
     PUSH_LOADED(File, ACT_CLOSE)
     PUSH_LOADED(File, ACT_VIDEO_PROPERTIES)
 
-    PUSH_LOADED(Edit, ACT_Cut)
     PUSH_LOADED(Edit, ACT_Copy)
-    PUSH_LOADED(Edit, ACT_Delete)
 
     PUSH_LOADED(Edit, ACT_MarkA)
     PUSH_LOADED(Edit, ACT_MarkB)
-    PUSH_LOADED(Edit, ACT_ResetMarkers)
 
     PUSH_LOADED(View, ACT_ZOOM_1_4)
     PUSH_LOADED(View, ACT_ZOOM_1_2)
@@ -881,7 +1119,13 @@
 
     for(int i=1;i<ui.menuGo->actions().size();i++)
     { // let "Play/Stop" stay enabled during playback
+        if (myMenuGo.at(i).event == ACT_GotoMarkA)
+            continue;
+        if (myMenuGo.at(i).event == ACT_GotoMarkB)
+            continue;
         ActionsDisabledOnPlayback.push_back(ui.menuGo->actions().at(i));
+        if (myMenuGo.at(i).event == ACT_SelectTime)
+            break;
     }
 
     PUSH_FULL_MENU_PLAYBACK(menuFile,1)
@@ -949,6 +1193,8 @@
     ADD_BUTTON_LOADED(toolButtonNextIntraFrame)
     ADD_BUTTON_LOADED(toolButtonSetMarkerA)
     ADD_BUTTON_LOADED(toolButtonSetMarkerB)
+    ADD_BUTTON_LOADED(toolButtonPreviousCutPoint)
+    ADD_BUTTON_LOADED(toolButtonNextCutPoint)
     ADD_BUTTON_LOADED(toolButtonPreviousBlackFrame)
     ADD_BUTTON_LOADED(toolButtonNextBlackFrame)
     ADD_BUTTON_LOADED(toolButtonFirstFrame)
@@ -962,12 +1208,14 @@
     ADD_BUTTON_PLAYBACK(toolButtonNextIntraFrame)
     ADD_BUTTON_PLAYBACK(toolButtonSetMarkerA)
     ADD_BUTTON_PLAYBACK(toolButtonSetMarkerB)
+    ADD_BUTTON_PLAYBACK(toolButtonPreviousCutPoint)
+    ADD_BUTTON_PLAYBACK(toolButtonNextCutPoint)
     ADD_BUTTON_PLAYBACK(toolButtonPreviousBlackFrame)
     ADD_BUTTON_PLAYBACK(toolButtonNextBlackFrame)
     ADD_BUTTON_PLAYBACK(toolButtonFirstFrame)
     ADD_BUTTON_PLAYBACK(toolButtonLastFrame)
-    ADD_BUTTON_PLAYBACK(toolButtonBackOneMinute)
-    ADD_BUTTON_PLAYBACK(toolButtonForwardOneMinute)
+    //ADD_BUTTON_PLAYBACK(toolButtonBackOneMinute)
+    //ADD_BUTTON_PLAYBACK(toolButtonForwardOneMinute)
 
 #define ADD_PUSHBUTTON_LOADED(x)    PushButtonsAvailableWhenFileLoaded.push_back(ui.x);
 #define ADD_PUSHBUTTON_PLAYBACK(x)    PushButtonsDisabledOnPlayback.push_back(ui.x);
@@ -994,7 +1242,7 @@
 */
 void MainWindow::setMenuItemsEnabledState(void)
 {
-    if(playing) // this actually doesn't work as it should
+    if(playing || (navigateWhilePlayingState != 0)) // this actually doesn't work as it should
     {
         int n=ActionsDisabledOnPlayback.size();
         for(int i=0;i<n;i++)
@@ -1014,14 +1262,14 @@
         ui.checkBox_TimeShift->setEnabled(false);
         ui.spinBox_TimeValue->setEnabled(false);
 
-        if(getPreviewMode()!=ADM_PREVIEW_NONE)
+        if(ADM_PREVIEW_NONE != admPreview::getPreviewMode())
             slider->setEnabled(false);
 
         return;
     }
 
-    bool vid, undo, redo, paste, restore;
-    vid=undo=redo=paste=restore=false;
+    bool vid, undo, redo, paste, resetA, resetB;
+    vid = undo = redo = paste = resetA = resetB = false;
     if(avifileinfo)
         vid=true; // a video is loaded
 
@@ -1044,18 +1292,22 @@
     {
         undo=video_body->canUndo();
         redo=video_body->canRedo();
+        if(video_body->getMarkerAPts())
+            resetA = true;
+        if(video_body->getMarkerBPts() != video_body->getVideoDuration())
+            resetB = true;
         paste=!video_body->clipboardEmpty();
     }
     ENABLE(Edit, ACT_Undo, undo)
     ENABLE(Edit, ACT_Redo, redo)
-    if(!vid || (!undo && !redo)) // if no edits have been performed, disable "Reset Edit" menu item
-    {
-        restore=A_checkSavedSession(false);
-        ENABLE(Edit, ACT_ResetSegments, false)
-    }else
-    {
-        ENABLE(Edit, ACT_ResetSegments, true)
-    }
+    ENABLE(Edit, ACT_ResetSegments, vid)
+    // TODO: Detect that segment layout matches the default one and disable "Reset Edit" then too.
+    ENABLE(Edit, ACT_ResetMarkerA, resetA)
+    ENABLE(Edit, ACT_ResetMarkerB, resetB)
+    ENABLE(Edit, ACT_ResetMarkers, (resetA || resetB))
+
+    ENABLE(Edit, ACT_Cut, (resetA || resetB))
+    ENABLE(Edit, ACT_Delete, (resetA || resetB))
     ENABLE(Edit, ACT_Paste, paste)
 
     n=ActionsAlwaysAvailable.size();
@@ -1071,7 +1323,7 @@
     if(recentProjects && recentProjects->actions().size())
         haveRecentItems=true;
     ENABLE(Recent, ACT_CLEAR_RECENT, haveRecentItems)
-    ENABLE(Recent, ACT_RESTORE_SESSION, restore)
+    ENABLE(Recent, ACT_RESTORE_SESSION, A_checkSavedSession(false))
 
     ui.selectionDuration->setEnabled(vid);
     slider->setEnabled(vid);
@@ -1106,6 +1358,7 @@
                    // VideoToolbox decoder always downloads decoded image immediately
         b=true;
     ENABLE(Video, ACT_SetPostProcessing, b)
+    ENABLE(Video, ACT_SetHDRConfig, b)
 
     b=false;
     if(ui.comboBoxVideo->currentIndex())
@@ -1172,6 +1425,23 @@
         q = findAction(&myMenuGo, ACT_NextKFrame);
         if(q)
             q->setShortcut(swpud ? Qt::Key_Down : Qt::Key_Up);
+
+        q = findAction(&myMenuGo, ACT_PrevCutPoint);
+        if(q)
+            q->setShortcut(Qt::SHIFT | (swpud ? Qt::Key_Up : Qt::Key_Down));
+
+        q = findAction(&myMenuGo, ACT_NextCutPoint);
+        if(q)
+            q->setShortcut(Qt::SHIFT | (swpud ? Qt::Key_Down : Qt::Key_Up));
+        
+        q = findAction(&myMenuGo, ACT_Back1Mn);
+        if(q)
+            q->setShortcut(Qt::CTRL | (swpud ? Qt::Key_Up : Qt::Key_Down));
+
+        q = findAction(&myMenuGo, ACT_Forward1Mn);
+        if(q)
+            q->setShortcut(Qt::CTRL | (swpud ? Qt::Key_Down : Qt::Key_Up));
+        
     }
 
     std::vector<MenuEntry *> defaultShortcuts;
@@ -1189,6 +1459,8 @@
             case ACT_Delete:
             case ACT_MarkA:
             case ACT_MarkB:
+            case ACT_ResetMarkerA:
+            case ACT_ResetMarkerB:
             case ACT_ResetMarkers:
                 defaultShortcuts.push_back(m);
                 break;
@@ -1201,7 +1473,7 @@
         MenuEntry *m = &myMenuGo[i];
         if(m->type != MENU_ACTION)
             continue;
-        if(m->event == ACT_GotoTime)
+        if(m->event == ACT_SelectTime)
             break;
         switch(m->event)
         {
@@ -1233,6 +1505,12 @@
                 case ACT_MarkB:
                     prefs->get(KEYBOARD_SHORTCUTS_ALT_MARK_B,sc);
                     break;
+                case ACT_ResetMarkerA:
+                    prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARK_A,sc);
+                    break;
+                case ACT_ResetMarkerB:
+                    prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARK_B,sc);
+                    break;
                 case ACT_ResetMarkers:
                     prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARKERS,sc);
                     break;
@@ -1325,6 +1603,14 @@
     tt += SHORTCUT(ACT_MarkB,Edit)
     ui.toolButtonSetMarkerB->setToolTip(tt);
 
+    tt = QString(QT_TRANSLATE_NOOP("qgui2","Go to previous cut point"));
+    tt += SHORTCUT(ACT_PrevCutPoint,Go)
+    ui.toolButtonPreviousCutPoint->setToolTip(tt);
+
+    tt = QString(QT_TRANSLATE_NOOP("qgui2","Go to next cut point"));
+    tt += SHORTCUT(ACT_NextCutPoint,Go)
+    ui.toolButtonNextCutPoint->setToolTip(tt);
+
     // go to black frame tooltips are static, the actions don't have shortcuts
 
     tt = QString(QT_TRANSLATE_NOOP("qgui2","Go to first frame"));
@@ -1366,6 +1652,28 @@
 }
 
 /**
+    \fn     restoreDefaultWidgetState
+    \brief  Show all dock widgets and move toolbar to the default area
+*/
+void MainWindow::restoreDefaultWidgetState(bool b)
+{
+    ui.codecWidget->setVisible(true);
+    ui.navigationWidget->setVisible(true);
+    ui.selectionWidget->setVisible(true);
+    ui.volumeWidget->setVisible(true);
+    ui.audioMetreWidget->setVisible(true);
+    ui.toolBar->setVisible(true);
+
+    syncToolbarsMenu();
+    updateZoomIndicator();
+
+    addToolBar(ui.toolBar);
+
+    if(!playing)
+        setZoomToFit();
+}
+
+/**
  * \fn checkChanged
  * \brief the checkbox protecting timeshift value has changed
  * @param state
@@ -1488,6 +1796,13 @@
                             else
                                 sendAction(ACT_Back1Mn);
                         }else
+                        if (keyEvent->modifiers() & Qt::ShiftModifier)
+                        {
+                            if(!swpud)
+                                sendAction(ACT_NextCutPoint);
+                            else
+                                sendAction(ACT_PrevCutPoint);
+                        }else
                         {
                             if(!swpud)
                                 sendAction(ACT_NextKFrame);
@@ -1503,6 +1818,13 @@
                             else
                                 sendAction(ACT_Forward1Mn);
                         }else
+                        if (keyEvent->modifiers() & Qt::ShiftModifier)
+                        {
+                            if(!swpud)
+                                sendAction(ACT_PrevCutPoint);
+                            else
+                                sendAction(ACT_NextCutPoint);
+                        }else
                         {
                             if(!swpud)
                                 sendAction(ACT_PreviousKFrame);
@@ -1517,6 +1839,9 @@
                     case Qt::Key_Shift:
                         shiftKeyHeld = 1;
                         break;
+                    case Qt::Key_Control:
+                        ctrlKeyHeld = 1;
+                        break;
 
                     case Qt::Key_PageUp:
                                                 if (keyEvent->modifiers() & Qt::ControlModifier)
@@ -1534,7 +1859,7 @@
                         break;
                 }
             }
-            /* else */ if (keyEvent->key() == Qt::Key_Space)
+            /* else */ if (keyEvent->key() == Qt::Key_Space && avifileinfo)
             {
                 sendAction(ACT_PlayAvi);
                 return true;
@@ -1560,8 +1885,14 @@
 
             if (keyEvent->key() == Qt::Key_Shift)
                 shiftKeyHeld = 0;
+            
+            if (keyEvent->key() == Qt::Key_Control)
+                ctrlKeyHeld = 0;
 
             break;
+        case QEvent::ShortcutOverride:
+                ctrlKeyHeld = 0;
+            break;
         case QEvent::User:
             this->openFiles(((FileDropEvent*)event)->files);
             break;
@@ -1705,6 +2036,7 @@
         admPreview::setMainDimension(w,h,zoom);
         actZoomCalled = false;
         admPreview::samePicture(); // required at least for VDPAU
+        updateZoomIndicator();
         blockResizing = false;
 
         return true;
@@ -1713,6 +2045,62 @@
 }
 
 /**
+ *  \fn updateZoomIndicator
+ *  \brief Display zoom level in the toolbar.
+ */
+void MainWindow::updateZoomIndicator(void)
+{
+    if(!avifileinfo || ui.toolBar->orientation() == Qt::Vertical)
+    {
+        if(displayZoom)
+            displayZoom->setVisible(false);
+        return;
+    }
+    if(false == ui.toolBar->isVisible())
+        return;
+    float percent = admPreview::getCurrentZoom();
+    if(percent < 0)
+        return;
+    percent *= 100;
+    percent += 0.49;
+
+    QString s = QString::fromUtf8(QT_TRANSLATE_NOOP("qgui2","Zoom: "));
+
+#define ZLEN 64
+    char text[ZLEN];
+    snprintf(text,ZLEN,"%d%%",(int)percent); // Is this viable for RTL locales?
+    text[ZLEN-1] = 0;
+
+    if(!displayZoom)
+    {
+        QLabel *z = new QLabel(s + text);
+        // Try to prevent zoom display from becoming hidden by setting
+        // a sufficient minimum width as no extension popup is created
+        // for added widgets when toolbar is detached.
+        QFontMetrics fm = z->fontMetrics();
+        z->setMinimumWidth(1.15 * fm.boundingRect(s + "00000%").width()); // assumed worst case
+        // Make sure there is some space between separator and text.
+        z->setIndent(fm.boundingRect("0").width());
+        displayZoom = ui.toolBar->addWidget(z);
+    }else
+    {
+        QLabel *z = (QLabel *)ui.toolBar->widgetForAction(displayZoom);
+        z->setText(s + text);
+    }
+    displayZoom->setVisible(true);
+#undef ZLEN
+}
+
+/**
+ *  \fn toolbarOrientationChangedSlot
+ */
+void MainWindow::toolbarOrientationChangedSlot(Qt::Orientation orientation)
+{
+    UNUSED_ARG(orientation);
+    updateZoomIndicator();
+}
+
+/**
  *  \fn setZoomToFit
  *  \brief adjust zoom level to fit video into available space at current window size
  */
@@ -1810,39 +2198,32 @@
     blockResizing = block;
 }
 
-void MainWindow::previousIntraFrame(void)
-{
-    if (ui.spinBox_TimeValue->hasFocus())
-        ui.spinBox_TimeValue->stepDown();
-    else
-        sendAction(ACT_PreviousKFrame);
-}
-
-void MainWindow::nextIntraFrame(void)
+/**
+    \fn volumeWidgetOperational
+*/
+void MainWindow::volumeWidgetOperational(void)
 {
-    if (ui.spinBox_TimeValue->hasFocus())
-        ui.spinBox_TimeValue->stepUp();
-    else
-        sendAction(ACT_NextKFrame);
+    // Disable the volume widget if the audio device doesn't support setting volume
+    ui.volumeWidget->setEnabled(AVDM_hasVolumeControl());
 }
 
 /**
-    \fn volumeWidgetOperational
+    \fn syncToolbarsMenu
+    \brief Make sure only visible widgets have check marks
+           in the Toolbars submenu of the View menu.
 */
-void MainWindow::volumeWidgetOperational(void)
+void MainWindow::syncToolbarsMenu(void)
 {
-    // Hide and disable the volume widget if the audio device doesn't support setting volume
-    if(!AVDM_hasVolumeControl())
-    {
-        ui.volumeWidget->setEnabled(false);
-        ui.volumeWidget->hide();
-        ui.actionViewVolume->setChecked(false);
-    }else
-    {
-        ui.volumeWidget->setEnabled(true);
-        ui.volumeWidget->show();
-        ui.actionViewVolume->setChecked(true);
-    }
+#define EXPAND(x) ui.x ## Widget
+#define CHECKMARK(x,y) ui.menuToolbars->actions().at(x)->setChecked(EXPAND(y)->isVisible());
+    CHECKMARK(0,audioMetre)
+    CHECKMARK(1,codec)
+    CHECKMARK(2,navigation)
+    CHECKMARK(3,selection)
+    CHECKMARK(4,volume)
+    ui.menuToolbars->actions().at(5)->setChecked(ui.toolBar->isVisible());
+#undef CHECKMARK
+#undef EXPAND
 }
 
 MainWindow::~MainWindow()
@@ -1895,11 +2276,16 @@
     global_argc=nargc;
     global_argv=nargv;
     ADM_renderLibInit(&UI_Hooks);
-#if !defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+#if !defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(5,11,0) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
     // Despite HiDPI scaling being supported from Qt 5.6 on, important aspects
     // like OpenGL support were fixed only in much later versions.
+    // Enabled by default with Qt6.
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
+#if !defined(__APPLE__) && !defined(_WIN32) /* Linux */ && QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    // Fix video shown as solid black color with OpenGL display and Qt6.
+    QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+#endif
 #if defined(_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5,10,0)
     // Hide unhelpful context help buttons on Windows.
     QApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
@@ -1928,10 +2314,47 @@
 uint8_t initGUI(const vector<IScriptEngine*>& scriptEngines)
 {
     MainWindow *mw = new MainWindow(scriptEngines);
-    mw->show();
+
+    bool openglEnabled = false;
+#ifdef USE_OPENGL
+    prefs->get(FEATURES_ENABLE_OPENGL,&openglEnabled);
+    ADM_info("OpenGL enabled at build time, checking whether we should run it... %s.\n",openglEnabled? "yes" : "no");
+#else
+    ADM_info("OpenGL: Not enabled at build time.\n");
+#endif
+
+    bool vuMeterIsHidden = false;
+    bool maximize = false;
+    QSettings *qset = qtSettingsCreate();
+    if(qset)
+    {
+        qset->beginGroup("MainWindow");
+        mw->restoreState(qset->value("windowState").toByteArray());
+        maximize = qset->value("showMaximized", false).toBool();
+        qset->endGroup();
+        // Hack: allow to drop other Qt-specific settings on application restart
+        char *dropSettingsOnLaunch = getenv("ADM_QT_DROP_SETTINGS");
+        if(dropSettingsOnLaunch && !strcmp("1",dropSettingsOnLaunch))
+            qset->clear();
+        delete qset;
+        qset = NULL;
+        // Probing for OpenGL fails if VU meter is hidden, delay hiding it.
+        vuMeterIsHidden = mw->ui.audioMetreWidget->isHidden();
+        if(openglEnabled && vuMeterIsHidden)
+            mw->ui.audioMetreWidget->setVisible(true);
+    }
 
     QuiMainWindows = (QWidget*)mw;
 
+    if(maximize)
+    {
+        UI_setBlockZoomChangesFlag(false); // unblock zoom to fit
+        QuiMainWindows->showMaximized();
+    }else
+    {
+        QuiMainWindows->show();
+    }
+
     uint32_t w, h;
 
     UI_getPhysicalScreenSize(QuiMainWindows, &w,&h);
@@ -1952,22 +2375,19 @@
     UI_InitVUMeter(mw->ui.frameVU);
 
 #ifdef USE_OPENGL
-    ADM_info("OpenGL enabled at built time, checking if we should run it..\n");
-    bool enabled;
-    prefs->get(FEATURES_ENABLE_OPENGL,&enabled);
-
-    if(enabled)
+    if(openglEnabled)
     {
         ADM_info("OpenGL activated, initializing... \n");
         openGLStarted=true;
         UI_Qt4InitGl();
+        if(vuMeterIsHidden)
+            mw->ui.audioMetreWidget->setVisible(false);
     }else
     {
         ADM_info("OpenGL not activated, not initialized\n");
     }
-#else
-        ADM_info("OpenGL: Not enabled at built time.\n");
 #endif
+mw->syncToolbarsMenu();
 
     return 1;
 }
@@ -1976,12 +2396,22 @@
  */
 void UI_closeGui(void)
 {
-        if(!uiRunning) return;
-        uiRunning=false;
-        
+    if(!uiRunning) return;
+    uiRunning=false;
+
+    QSettings *qset = qtSettingsCreate();
+    if(qset)
+    {
+        qset->beginGroup("MainWindow");
+        qset->setValue("windowState", ((QMainWindow *)QuiMainWindows)->saveState());
+        qset->setValue("showMaximized", QuiMainWindows->isMaximized());
+        qset->endGroup();
+        delete qset;
+        qset = NULL;
+    }
+
     QuiMainWindows->close();
     qtUnregisterDialog(QuiMainWindows);
-        
 }
 
 void destroyGUI(void)
@@ -2020,7 +2450,11 @@
 */
 int UI_getCurrentPreview(void)
 {
-    if(WIDGET(menuVideo)->actions().at(3)->isChecked() || WIDGET(toolBar)->actions().at(5)->isChecked())
+    QAction *a = findAction(&myMenuVideo, ACT_PreviewChanged);
+    QAction *b = findActionInToolBar(WIDGET(toolBar), ACT_PreviewChanged);
+    bool filtered = (a ? a->isChecked() : false) || (b ? b->isChecked() : false);
+
+    if(filtered)
     {
         printf("Output is ON\n");
         return 1;
@@ -2035,8 +2469,12 @@
 */
 void UI_setCurrentPreview(int ne)
 {
-    WIDGET(menuVideo)->actions().at(3)->setChecked(!!ne);
-    WIDGET(toolBar)->actions().at(5)->setChecked(!!ne);
+    QAction *preview = findAction(&myMenuVideo, ACT_PreviewChanged);
+    if(preview)
+        preview->setChecked(!!ne);
+    preview = findActionInToolBar(WIDGET(toolBar), ACT_PreviewChanged);
+    if(preview)
+        preview->setChecked(!!ne);
 }
 /**
         \fn FatalFunctionQt
@@ -2270,6 +2708,12 @@
 
 void UI_setFrameType( uint32_t frametype,uint32_t qp)
 {
+    if(frametype == CLEAR_FRAME_TYPE)
+    {
+        WIDGET(label_8)->clear();
+        return;
+    }
+
     char string[100];
     char    c='?';
     const char *f="???";
@@ -2278,7 +2722,7 @@
     case AVI_KEY_FRAME: c='I';break;
     case AVI_B_FRAME: c='B';break;
     case 0: c='P';break;
-    default:c='?';break;
+    default:break;
 
     }
     switch(frametype&AVI_STRUCTURE_TYPE_MASK)
@@ -2290,7 +2734,10 @@
 
                     break;
     }
-    sprintf(string,QT_TRANSLATE_NOOP("qgui2","%c-%s (%02d)"),c,f,qp);
+    if(qp == ADM_IMAGE_UNKNOWN_QP)
+        sprintf(string,QT_TRANSLATE_NOOP("qgui2","%c-%s"),c,f);
+    else
+        sprintf(string,QT_TRANSLATE_NOOP("qgui2","%c-%s (%02d)"),c,f,qp);
     WIDGET(label_8)->setText(string);
 
 }
@@ -2335,6 +2782,14 @@
     slider->setTotalDuration(curTime);
 }
 /**
+    \fn UI_setSegments
+    \brief SEt segments boundaries
+*/
+void UI_setSegments(uint32_t numOfSegs, uint64_t * segPts)
+{
+    slider->setSegments(numOfSegs, segPts);
+}
+/**
     \fn     UI_setMarkers(uint64_t Ptsa, uint32_t Ptsb )
     \brief  Display frame # for marker A & B
 */
@@ -2461,7 +2916,7 @@
 /**
     \fn UI_setVUMeter
 */
-bool UI_setVUMeter( uint32_t volume[8])
+bool UI_setVUMeter( int32_t volume[8])
 {
     UI_vuUpdate( volume);
     return true;
@@ -2498,6 +2953,27 @@
 }
 
 /**
+    \fn UI_navigationButtonsPressed
+    \brief Allow to abstain from opening pop-up dialogs while
+           a button with auto-repeat enabled is pressed, else
+           the mouse release event gets eaten by the pop-up and
+           we keep firing the action assigned to the particular
+           button forever.
+*/
+bool UI_navigationButtonsPressed(void)
+{
+    if(WIDGET(toolButtonPreviousFrame)->isDown())
+        return true;
+    if(WIDGET(toolButtonNextFrame)->isDown())
+        return true;
+    if(WIDGET(toolButtonPreviousIntraFrame)->isDown())
+        return true;
+    if(WIDGET(toolButtonNextIntraFrame)->isDown())
+        return true;
+    return false;
+}
+
+/**
     \fn UI_hasOpengl
 */
 bool UI_hasOpenGl(void)
@@ -2549,39 +3025,42 @@
     QuiMainWindows->resize(reqw,reqh);
     ADM_info("Resizing the main window to %dx%d px\n",reqw,reqh);
 #ifdef _WIN32
-    QSize fs = QuiMainWindows->frameSize();
-    QPoint p = QuiMainWindows->pos();
-
-    uint32_t screenWidth,screenHeight;
-    UI_getPhysicalScreenSize(QuiMainWindows, &screenWidth, &screenHeight);
+    QRect fs = QuiMainWindows->frameGeometry();
+#if QT_VERSION < QT_VERSION_CHECK(5,11,0)
+    QRect space = QApplication::desktop()->availableGeometry();
+#else
+    QRect space = QApplication::primaryScreen()->availableGeometry();
+#endif
 
-    int x = p.x() + fs.width() - (int)screenWidth;
+    int x = fs.x() + fs.width() - space.x() - space.width();
     bool move=false;
     if(x > 0) // the right edge of the window doesn't fit into the screen
     {
         move = true;
-        if(x < p.x())
-            x = p.x() - x;
+        if(x < fs.x())
+            x = fs.x() - x;
         else
             x = 0;
     }else
     {
-        x = p.x();
+        x = fs.x();
     }
-    int y = p.y() + fs.height() - (int)screenHeight;
+    int y = fs.y() + fs.height() - space.y() - space.height();
     if(y > 0) // the bottom edge of the window doesn't fit into the screen
     {
         move = true;
-        if(y < p.y())
-            y = p.y() - y;
+        if(y < fs.y())
+            y = fs.y() - y;
         else
             y = 0;
     }else
     {
-        y = p.y();
+        y = fs.y();
     }
     if(move)
     {
+        if(x < space.x()) x = space.x(); // adjust for taskbar on the left side
+        if(y < space.y()) y = space.y(); // adjust for taskbar on the top
         ADM_info("Moving the main window to position (%d, %d)\n",x,y);
         QuiMainWindows->move(x,y);
     }
@@ -2611,6 +3090,16 @@
     int h = screenHeight - reqh - fheight;
     if(w < 0) w = 0;
     if(h < 0) h = 0;
+
+    // If we have to downscale anyway, leave some margin around the window.
+    // Opening a window which takes almost the entire desktop may feel intrusive.
+#define SHRINK_FACTOR 0.85
+    if(avifileinfo && !QuiMainWindows->isMaximized() && (avifileinfo->width > w || avifileinfo->height > h))
+    {
+        w = (float)w * SHRINK_FACTOR;
+        h = (float)h * SHRINK_FACTOR;
+    }
+#undef SHRINK_FACTOR
     *availWidth = w;
     *availHeight = h;
 }
@@ -2657,6 +3146,14 @@
 }
 
 /**
+    \fn UI_displayZoomLevel
+*/
+void UI_displayZoomLevel(void)
+{
+    ((MainWindow *)QuiMainWindows)->updateZoomIndicator();
+}
+
+/**
     \fn UI_setAudioTrackCount
 */
 void UI_setAudioTrackCount( int nb )

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h Changed

@@ -22,6 +22,7 @@
 
 #define ENABLE_EVENT_FILTER
 
+#define NAVIGATION_ACTION_LOCK_THRESHOLD	(4)
 /**
  * \class myQApplication
  * \brief make sure the checkCrash & friends are done after Qt init
@@ -79,9 +80,7 @@
                 void cleanup()
                 {
                   //ADM_ExitCleanup();
-                  emit quit();
                 }
-                
 };
 /**
  * \enum ADM_dragState
@@ -118,6 +117,8 @@
     void setResizeThreshold(int value);
     void setActZoomCalledFlag(bool called);
     void setZoomToFit(void);
+    void updateZoomIndicator(void);
+    void syncToolbarsMenu(void);
     static void updateCheckDone(int version, const std::string &date, const std::string &downloadLink);
     static MainWindow *mainWindowSingleton;
 
@@ -133,10 +134,14 @@
     QMenu *recentProjects;
     QAction *recentFileAction[NB_LAST_FILES];
     QAction *recentProjectAction[NB_LAST_FILES];
+    QAction *displayZoom;
     ThumbSlider *thumbSlider;
     
     bool     refreshCapEnabled;
     uint32_t refreshCapValue;
+    unsigned int actionLock;
+    unsigned int busyCntr;
+    QTimer busyTimer; 
 
     std::vector<QAction *>ActionsAvailableWhenFileLoaded;
     std::vector<QAction *>ActionsDisabledOnPlayback;
@@ -148,6 +153,10 @@
 
     ADM_dragState dragState;
     QTimer dragTimer;
+    int navigateWhilePlayingState;
+    Action navigateWhilePlayingAction;
+    Action navigateWhilePlayingPendingAction;
+    QTimer navigateWhilePlayingTimer;
     const  std::vector<IScriptEngine*>& _scriptEngines;
 
     void addScriptDirToMenu(QMenu* scriptMenu, const QString& dir, const QStringList& fileExts);
@@ -181,50 +190,37 @@
     int  threshold; // track how much the window was resized
     /* allow to copy current pts to clipboard using a keyboard shortcut for convenience */
     void currentTimeToClipboard(void);
+    bool dragWhilePlay;
 
-public slots:
-    void updateAvailableSlot(int version, std::string date, std::string url);
-    void dragTimerTimeout(void);
-    void setRefreshCap(void);
-    void actionSlot(Action a)
-    {
-        if(a==ACT_PlayAvi) // ugly
-        {
-            playing=1-playing;
-            setMenuItemsEnabledState();
-            playing=1-playing;
-        }
-        HandleAction(a);
-        setMenuItemsEnabledState();
-    }
-    void sendAction(Action a)
-    {
-        //printf("Sending internal event %d\n",(int)a);
-        emit actionSignal(a);
-    }
+private slots:
     void timeChanged(int);
+    void timeChangeFinished(void);
     void checkChanged(int);
+    void comboChanged(int z);
+
     void buttonPressed(void);
     void toolButtonPressed(bool z);
-    void setMenuItemsEnabledState(void);
 
-    void comboChanged(int z);
+    void previewModeChangedFromMenu(bool status);
+    void previewModeChangedFromToolbar(bool status);
+
+    void currentTimeChanged(void);
+
     void sliderValueChanged(int u);
     void sliderMoved(int value);
     void sliderReleased(void);
     void sliderPressed(void);
     void sliderWheel(int way);
-    void volumeChange( int u );
-    void audioToggled(bool checked);
-    void previewModeChangedFromMenu(bool status);
-    void previewModeChangedFromToolbar(bool status);
-    void previousIntraFrame(void);
-    void nextIntraFrame(void);
-    void timeChangeFinished(void);
-    void currentFrameChanged(void);
-    void currentTimeChanged(void);
 
-    void thumbSlider_valueEmitted(int value);
+    void dragTimerTimeout(void);
+    void busyTimerTimeout(void);
+    void navigateWhilePlayingTimerTimeout(void);
+    void sendAction(Action a);
+    void navigateWhilePlaying(Action a);
+    void actionSlot(Action a);
+
+    void scriptFileActionHandler(void);
+    void scriptReferenceActionHandler(void);
 
     void searchFileMenu(QAction * action);
     void searchRecentMenu(QAction * action);
@@ -237,10 +233,10 @@
     void searchGoMenu(QAction * action);
     void searchRecentFiles(QAction * action);
     void searchRecentProjects(QAction * action);
-    void searchToolBar(QAction *);
+    void searchToolBar(QAction * action);
 
-    void scriptFileActionHandler();
-    void scriptReferenceActionHandler();
+    void restoreDefaultWidgetState(bool b);
+    void toolbarOrientationChangedSlot(Qt::Orientation hv);
 
     void closeEvent(QCloseEvent *event)
     {
@@ -249,6 +245,16 @@
         sendAction(ACT_EXIT);
     }
 
+public slots:
+    void updateAvailableSlot(int version, std::string date, std::string url);
+    void setRefreshCap(void);
+    void setMenuItemsEnabledState(void);
+
+    void volumeChange(int u);
+    void audioToggled(bool checked);
+
+    void thumbSlider_valueEmitted(int value);
+
 signals:
     void actionSignal(Action a);
     void updateAvailable(int version,const std::string date,const std::string downloadLink);

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp Changed

@@ -22,6 +22,9 @@
 #include <QImage>
 #include <QPainter>
 #include <QPaintEngine>
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) && !defined(__APPLE__)
+#    include <QWindow>
+#endif
 
 /* Probably on unix/X11 ..*/
 #ifdef __APPLE__
@@ -34,7 +37,6 @@
 {
         extern void *XOpenDisplay(    char *name);
 }
-#       include <QWindow>
 #   endif
 #endif
 
@@ -136,6 +138,47 @@
         renderExposeEventFromUI();
     }
 }
+/**
+    \fn setADMSize
+*/
+void ADM_Qvideo::setADMSize(int width,int height)
+{
+    _width = width;
+    _height = height;
+#if !defined(__APPLE__) && !defined(_WIN32) && QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    // Work around an issue with Qt 6.2.1 which results in video frame displaying
+    // garbage for all subsequently loaded videos after its size was set to zero.
+    static uint8_t workaround = 0;
+#define RUNTIME_VERSION_CHECKED 1
+#define WORKAROUND_NEEDED       2
+    if(!(workaround & RUNTIME_VERSION_CHECKED))
+    {
+        char *runtimeQtVersion = ADM_strdup(qVersion()); // We need the runtime version, not the build version.
+        if(runtimeQtVersion && strlen(runtimeQtVersion) > 2)
+        {
+            char *major = runtimeQtVersion;
+            char *minor = strchr(runtimeQtVersion, '.');
+            if(minor)
+            {
+                *minor++ = 0;
+                if(!strcmp(major,"6") && strlen(minor) && atoi(minor) > 1)
+                    workaround |= WORKAROUND_NEEDED;
+            }
+        }
+        ADM_dealloc(runtimeQtVersion);
+        runtimeQtVersion = NULL;
+        workaround |= RUNTIME_VERSION_CHECKED;
+    }
+    if(workaround & WORKAROUND_NEEDED)
+    {
+        if(width < 1) width = 1;
+        if(height < 1) height = 1;
+    }
+#endif
+    hostFrame->setFixedSize(width,height);
+    setFixedSize(width,height);
+}
+
 
 void UI_QT4VideoWidget(QFrame *host)
 {
@@ -205,6 +248,13 @@
     QWidget* widget = videoWindow->parentWidget();
     xinfo->widget = videoWindow;
     xinfo->systemWindowId = 0;
+    xinfo->scalingFactor = 1.;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) && !defined(__APPLE__)
+    QWindow *window = QuiMainWindows->windowHandle();
+    if(window)
+        xinfo->scalingFactor = (double)window->devicePixelRatio();
+#endif
 
 #if defined(_WIN32)
     xinfo->display=(void *)videoWindow->winId();
@@ -218,7 +268,6 @@
     xinfo->systemWindowId= HIViewGetWindow(HIViewRef(widget->winId()));
 #   endif
 #else // linux
-    xinfo->scalingFactor = 1.;
 #   if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     const QX11Info &info=videoWindow->x11Info();
     xinfo->display=info.display();
@@ -228,9 +277,6 @@
         if(!myDisplay)
             myDisplay=XOpenDisplay(NULL);
         xinfo->display=myDisplay;
-        QWindow *window = QuiMainWindows->windowHandle();
-        if(window)
-            xinfo->scalingFactor = (double)window->devicePixelRatio();
     }
 #   endif
     xinfo->systemWindowId=videoWindow->winId();

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.cpp Changed

@@ -22,7 +22,7 @@
 	setMinimum(-100);
 	setValue(0);
 
-	timerId = count = lock = pos = 0;
+	timerId = count = lock = pos = stopping = 0;
 }
 
 void ThumbSlider::timerEvent(QTimerEvent *event)
@@ -51,6 +51,16 @@
 	lock--;
 }
 
+void ThumbSlider::stop(void)
+{
+	if (timerId)
+		killTimer(timerId);
+	setValue(0);
+	timerId = count = pos = 0;
+
+	triggerAction(SliderNoAction);
+}
+
 void ThumbSlider::paintEvent(QPaintEvent *event)
 {
 	QPainter painter;
@@ -67,6 +77,7 @@
 
 void ThumbSlider::mousePressEvent(QMouseEvent *event)
 {
+	if (stopping) return;
 	if (event->buttons() & Qt::LeftButton)
 	{
 		int value = QStyle::sliderValueFromPosition(minimum(), maximum(), event->x(), width(), false);
@@ -79,6 +90,7 @@
 
 void ThumbSlider::mouseMoveEvent(QMouseEvent *event)
 {
+	if (stopping) return;
 	if (event->buttons() & Qt::LeftButton)
 	{
 		int value = QStyle::sliderValueFromPosition(minimum(), maximum(), event->x(), width(), false);
@@ -92,11 +104,9 @@
 {
 	if (event->button() & Qt::LeftButton)
 	{
-		killTimer(timerId);
-		setValue(0);
-		timerId = count = pos = 0;
-
-		triggerAction(SliderNoAction);
+		stop();
+		stopping = 0;
+		emit valueEmitted(0);
 	}
 }
 
@@ -120,7 +130,8 @@
 	{
 		if (timerId)
 			killTimer(timerId);
-		timerId = count = 0;
+		timerId = count = stopping = 0;
+		emit valueEmitted(0);
 	}
 
 	if (value)
@@ -129,6 +140,14 @@
 		triggerAction(SliderNoAction);
 }
 
+void ThumbSlider::reset(void)
+{
+	stopping = 1;
+	stop();
+	setSliderPosition(0);
+	emit valueEmitted(0);
+}
+
 void ThumbSlider::drawBackground(QPainter *painter)
 {
 	int middle = width() / 2;

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_thumbSlider.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.cpp Changed

@@ -32,17 +32,25 @@
 static ADM_Qvumeter *vuWidget = NULL;
 
 //  #warning Assume rgb bbuffer is 32bits aligned...
-#define GREEN  0xFF00FF00
-#define YELLOW 0xFFA0C000
-#define RED    0xFFFF0000
-#define BLACK  0xFF000000
+#define GREEN   0xFF00FF00
+#define DGREEN  0xFF00BF00
+#define YELLOW  0xFFA0C000
+#define DYELLOW 0xFF789000
+#define RED     0xFFFF0000
+#define DRED    0xFFBF0000
+#define BLACK   0xFF000000
+
+#define VU_BAR_WIDTH  5
+#define VU_PEAK_WIDTH 7
+#define VU_BOTTOM_SCALE -60.0	// dBFS, must be negative
+#define VU_DECAY      1.0
 
 ADM_Qvumeter::ADM_Qvumeter(QWidget *z, int width, int height) : QWidget(z)
 {
-	this->resize(width, height);
-	z->resize(width + 2, height + 2);
+    this->resize(width, height);
+    z->resize(width + 2, height + 2);
 
-	rgbDataBuffer = new uint8_t[width * height * 4];
+    rgbDataBuffer = new uint8_t[width * height * 4];
     for(int i=0;i<88;i++)
     {
         uint8_t *ptr = rgbDataBuffer + (width * i * 4);
@@ -52,19 +60,21 @@
             *data++=BLACK;
         }
     }
+    for (int i=0; i<8; i++)
+        peaks[i].maxPos = 0;
 }
 
 ADM_Qvumeter::~ADM_Qvumeter()
 {
-	delete [] rgbDataBuffer;
+    delete [] rgbDataBuffer;
 }
 
 void ADM_Qvumeter::paintEvent(QPaintEvent *ev)
 {
-	QImage image(this->rgbDataBuffer, this->width(), this->height(), QImage::Format_RGB32);
-	QPainter painter(this);
-	painter.drawImage(QPoint(1, 1), image);
-	painter.end();
+    QImage image(this->rgbDataBuffer, this->width(), this->height(), QImage::Format_RGB32);
+    QPainter painter(this);
+    painter.drawImage(QPoint(1, 1), image);
+    painter.end();
 }
 
 /**
@@ -79,30 +89,122 @@
 }
 /**
     \fn UI_vuUpdate
-    \brief Update vumeter, input is volume per channel between 0 & 255
+    \brief Update vumeter, input is volume per channel as integer dBFS (valid range -100 to +3), mark inactive channel with +255 (> 3)
 */
-bool UI_vuUpdate(uint32_t volume[8])
+bool UI_vuUpdate(int32_t volume[8])
 {
-    // Draw lines
-    int vol;
+    int width = vuWidget->width();
+    uint8_t * basePtr = vuWidget->rgbDataBuffer;
+    
+    int headroom,overdrive;
+    float l;
+    l = -18; // headroom -18 dBFS (Digital broadcasts and ordinary digital recordings) (<84 & >= 66)
+    l -= VU_BOTTOM_SCALE;
+    l /= (3.0 - VU_BOTTOM_SCALE);
+    l *= 87.0;
+    headroom = l+0.49;
+    l = 0; // overdrive >= 0 dBFS
+    l -= VU_BOTTOM_SCALE;
+    l /= (3.0 - VU_BOTTOM_SCALE);
+    l *= 87.0;
+    overdrive = l+0.49;
+    
+    int activeChannelCount = 0;
+    int vol[8], peak[8];
+    uint32_t peakColor[8];
     for(int i=0;i<8;i++)
     {
-        vol=volume[i];
-        if(vol>63) vol=63;
-        if(vol<3) vol=3;
-        uint8_t *ptr = vuWidget->rgbDataBuffer + vuWidget->width() * (8 + 10 * i) * 4;
-        uint32_t *data=(uint32_t *)(ptr);
-        for(int j=0;j<vol;j++)
+        if (volume[i] <= 3)
         {
-            if(j<32) *data++=GREEN;
-            else if(j<50) *data++=YELLOW;
-            else *data++=RED;
+            //Decay
+            if (vuWidget->peaks[i].maxPos > 0)
+            {
+                if (vuWidget->peaks[i].maxPos > VU_DECAY)
+                    vuWidget->peaks[i].maxPos -= VU_DECAY;
+                else
+                    vuWidget->peaks[i].maxPos = 0;
+            }
+            // Map volume to display
+            // +3 -> 87
+            // VU_BOTTOM_SCALE -> 0
+            float v = volume[i];
+            v -= VU_BOTTOM_SCALE;
+            v /= (3.0 - VU_BOTTOM_SCALE);
+            v *= 87.0;
+            vol[activeChannelCount] = v+0.49;
+            if (vol[activeChannelCount] > 87)
+                vol[activeChannelCount] = 87;
+            if (vol[activeChannelCount] < 0)
+                vol[activeChannelCount] = 0;
+            if (vol[activeChannelCount] > vuWidget->peaks[i].maxPos)
+            {
+                vuWidget->peaks[i].maxPos = vol[activeChannelCount];
+                if(vol[activeChannelCount]<headroom) vuWidget->peaks[i].maxColor = GREEN;
+                else if(vol[activeChannelCount]<overdrive) vuWidget->peaks[i].maxColor = YELLOW;
+                else vuWidget->peaks[i].maxColor = RED;
+            }
+            if (vol[activeChannelCount] < 1)
+                vol[activeChannelCount] = 1;
+            peak[activeChannelCount] = vuWidget->peaks[i].maxPos;
+            peakColor[activeChannelCount] = vuWidget->peaks[i].maxColor;
+
+            activeChannelCount++;
         }
-        for(int j=vol;j<64;j++)
+        else
         {
-            *data++=BLACK;
+            vuWidget->peaks[i].maxPos = 0;
+        }
+    }
+    
+    if (activeChannelCount == 0)	// just clear
+    {
+        for(int i=0;i<88;i++)
+        {
+            uint8_t *ptr = basePtr + (width * i * 4);
+            uint32_t *data = (uint32_t *)ptr;
+            for(int j=0;j<64;j++)
+            {
+                *data++=BLACK;
+            }
+        }
+        vuWidget->update();
+        return true;
+    }
+
+    // Draw
+    for(int i=0;i<88;i++)
+    {
+        uint8_t *ptr = basePtr + (width * i * 4);
+        uint32_t *data = (uint32_t *)ptr;
+        int h = 87-i;
+        for(int j=0;j<64;j++)
+        {
+            *data=BLACK;
+            int w = 64/activeChannelCount;
+            int v = j/w;
+            int x = j%w;
+            if (v >= activeChannelCount)
+            {
+                v = activeChannelCount - 1;
+                x = 0;
+            }
+            if (peak[v] == h)
+            {
+                if ((x >= (8/activeChannelCount)) && (x < (w-(8/activeChannelCount))))
+                    *data = peakColor[v];
+            } else {
+                if (vol[v] >= h)
+                    if ((x >= (1+8/activeChannelCount)) && (x < (w-(1+8/activeChannelCount))))
+                    {
+                        if(h<headroom) *data=(i%4==3)?DGREEN:GREEN;
+                        else if(h<overdrive) *data=(i%4==3)?DYELLOW:YELLOW;
+                        else *data=(i%4==3)?DRED:RED;
+                    }
+            }
+            data++;
         }
     }
+
 #if 0
       ADM_info("VU : LEFT %"PRIu32" CENTER %"PRIu32" RIGHT %"PRIu32" REARLEFT %"PRIu32" REARRIGHT %"PRIu32"\n",
                     volume[0],volume[1],volume[2],volume[3],volume[4]);

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_vumeter.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux.qrc -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux.qrc Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_osx.qrc -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_osx.qrc Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_win32.qrc -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_win32.qrc Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_win32_custom_font.qrc -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/avidemux_win32_custom_font.qrc Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -99,7 +99,7 @@
      <x>0</x>
      <y>0</y>
      <width>858</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <property name="contextMenuPolicy">
@@ -133,6 +133,7 @@
      <addaction name="actionViewNavigation"/>
      <addaction name="actionViewSelection"/>
      <addaction name="actionViewVolume"/>
+     <addaction name="actionViewToolBar"/>
     </widget>
     <addaction name="menuToolbars"/>
    </widget>
@@ -1134,6 +1135,54 @@
           </widget>
          </item>
          <item>
+          <widget class="QToolButton" name="toolButtonPreviousCutPoint">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Go to previous cut point [SHIFT+DOWN]</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="avidemux.qrc">
+             <normaloff>:/new/prefix1/pics/prev_cut.png</normaloff>:/new/prefix1/pics/prev_cut.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="toolButtonNextCutPoint">
+           <property name="toolTip">
+            <string>Go to next cut point [SHIFT+UP]</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="avidemux.qrc">
+             <normaloff>:/new/prefix1/pics/next_cut.png</normaloff>:/new/prefix1/pics/next_cut.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>         <item>
           <widget class="QToolButton" name="toolButtonPreviousBlackFrame">
            <property name="enabled">
             <bool>false</bool>
@@ -1434,13 +1483,13 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>160</width>
+     <width>182</width>
      <height>120</height>
     </size>
    </property>
    <property name="maximumSize">
     <size>
-     <width>200</width>
+     <width>182</width>
      <height>120</height>
     </size>
    </property>
@@ -1915,6 +1964,20 @@
     <string>Ctrl+Alt+V</string>
    </property>
   </action>
+  <action name="actionViewToolBar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Toolbar</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+B</string>
+   </property>
+  </action>
   <action name="actionViewAudioMetre">
    <property name="checkable">
     <bool>true</bool>
@@ -1993,6 +2056,8 @@
   <tabstop>toolButtonNextIntraFrame</tabstop>
   <tabstop>toolButtonSetMarkerA</tabstop>
   <tabstop>toolButtonSetMarkerB</tabstop>
+  <tabstop>toolButtonPreviousCutPoint</tabstop>
+  <tabstop>toolButtonNextCutPoint</tabstop>
   <tabstop>toolButtonPreviousBlackFrame</tabstop>
   <tabstop>toolButtonNextBlackFrame</tabstop>
   <tabstop>toolButtonFirstFrame</tabstop>
@@ -2088,5 +2153,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionViewToolBar</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>toolBar</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui_none.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui_none.cpp Changed

avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics/next_cut.png Added

avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/pics/prev_cut.png Added

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_shell/Q_shell.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/ADM_userInterfaces/translator.cpp -> avidemux_2.8.0.tar.gz/avidemux/qt4/ADM_userInterfaces/translator.cpp Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux/qt4/CMakeLists.txt Changed

@@ -2,7 +2,9 @@
 
 PROJECT(Avidemux_Qt)
 
-SET(AVIDEMUX_API_VERSION 2.7)
+set(ORIGINAL_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../cmake" "${CMAKE_MODULE_PATH}")
+include(avidemuxVersion)
 
 MESSAGE("")
 MESSAGE("#########################################")
@@ -16,7 +18,7 @@
 IF(NOT FAKEROOT)
 	SET(AVIDEMUX_FAKEROOT "")
 else(NOT FAKEROOT)
-	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}/")
+	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}")
 endif(NOT FAKEROOT)
 
 
@@ -37,12 +39,11 @@
 # Set extra libs, system dependant
 #-----------------------------------
 ADM_PREBUILD()
-#
-#
+
+# Locate commonCmakeApplication.cmake
 SET(ADM_HEADER_DIR ${AVIDEMUX_FAKEROOT}${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_API_VERSION})
 SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
-# Common definitions...
-SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${CMAKE_MODULE_PATH}")
+SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${ORIGINAL_CMAKE_MODULE_PATH}")
 MESSAGE(STATUS  "Checking for avidemux include folder (i.e. CMAKE_INSTALL_PREFIX/include/avidemux/${AVIDEMUX_API_VERSION}, looking in ${ADM_HEADER_DIR}")
 if(NOT EXISTS "${ADM_HEADER_DIR}")
         MESSAGE(STATUS  "Make sure you installed all the files.\n i cannot find avidemux include folder.cmake .\nSet CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")
@@ -88,6 +89,12 @@
 ADD_DEFINITIONS(-DADM_UI_TYPE_BUILD=ADM_UI_QT4)
 SET(CONFIG_HEADER_TYPE ADM_BUILD_QT4)
 SET(UI_SUFFIX ${QT_EXTENSION})
+IF (${QT_EXTENSION} STREQUAL "qt6")
+    SET(CMAKE_CXX_STANDARD 17)
+    SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+    SET(CMAKE_CXX_EXTENSIONS OFF)
+ENDIF (${QT_EXTENSION} STREQUAL "qt6")
+
 
 CONFIGURE_FILE("${ADM_CMAKE_DIR}/config.h.cmake" "${CMAKE_BINARY_DIR}/config/${QT_EXTENSION}/config.h")
 MESSAGE(STATUS "${QT_EXTENSION} config.h generated")

avidemux_2.7.8.tar.gz/avidemux/qt4/adm_osx.cmake -> avidemux_2.8.0.tar.gz/avidemux/qt4/adm_osx.cmake Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/Ts.cmake -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/Ts.cmake Changed

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed

@@ -117,6 +117,7 @@
 ../../../avidemux_core/ADM_coreImage/include/ADM_videoFilter_iface.h \ 
 ../../../avidemux_core/ADM_coreImage/include/ADM_imageResizer.h \ 
 ../../../avidemux_core/ADM_coreImage/include/ADM_image.h \ 
+../../../avidemux_core/ADM_coreImage/include/ADM_toneMapper.h \ 
 ../../../avidemux_core/ADM_coreImage/include/ADM_print_priv.h \ 
 ../../../avidemux_core/ADM_coreUI/include/DIA_uiTypes.h \ 
 ../../../avidemux_core/ADM_coreUI/include/DIA_audioTracks.h \ 
@@ -301,6 +302,7 @@
 ../../../avidemux/qt4/ADM_UIs/src/T_filesel.h \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_slider.h \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_menu.h \ 
+../../../avidemux/qt4/ADM_UIs/src/T_floatResettable.h \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_threadCount.h \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_notch.h \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_toggle.h \ 
@@ -310,6 +312,7 @@
 ../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4_template.h \ 
 ../../../avidemux/qt4/ADM_UIs/include/ADM_UIQT46_export.h \ 
 ../../../avidemux/qt4/ADM_UIs/include/ADM_toolkitQt.h \ 
+../../../avidemux/qt4/ADM_UIs/include/ADM_QSettings.h \ 
 ../../../avidemux/qt4/ADM_UIs/include/ADM_dialogFactoryQt4.h \ 
 ../../../avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h \ 
 ../../../avidemux/qt4/ADM_UIs/include/T_openGLFilter.h \ 
@@ -428,6 +431,10 @@
 ../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_net.h \ 
 ../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy_internal.h \ 
 ../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/DIA_flyFadeInOut.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeInOut.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/logo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h \ 
@@ -448,12 +455,26 @@
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asciiView/ascii_font.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/artGrid.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/Q_artGrid.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/DIA_flyArtGrid.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/negative/negative.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/DIA_flyArtChromaKey.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/black/black.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/Q_imageStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/DIA_flyImageStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/imageStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/motest.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/motin.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilterDeint.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
@@ -462,7 +483,27 @@
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/qt4/Q_artPixelize.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/qt4/DIA_flyArtPixelize.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/artPixelize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/DIA_flyWaveletSharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/Q_waveletSharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/Q_waveletDenoise.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/DIA_flyWaveletDenoise.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/DIA_flyFadeFromImage.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/Q_artCartoon.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/DIA_flyArtCartoon.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h \ 
@@ -470,10 +511,21 @@
 ../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/decimate/dec.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/DIA_flyDeband.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/Q_deband.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/deband.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_debug.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/telecide/telec.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/Q_artChromaHold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/DIA_flyArtChromaHold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.h \ 
@@ -483,8 +535,28 @@
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/DIA_flyArtPosterize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/Q_artPosterize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/blur.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/DIA_flyBlur.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/Q_blur.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/DIA_flyColorBalance.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/DIA_flyLumaStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/Q_lumaStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/DIA_flyArtDynThreshold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/Q_artDynThreshold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mcDeint/mcdeint.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/fluxsmooth.h \ 
@@ -497,11 +569,26 @@
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/qt4/Q_artColorEffect.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/artColorEffect.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vidFadeThrough.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/DIA_flyFadeThrough.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avspipecomm.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/strnew.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/DIA_flyQuadTrans.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/Q_quadTrans.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/Q_artMirror.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/DIA_flyArtMirror.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/artMirror.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/Q_analyzer.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/DIA_flyAnalyzer.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/Q_colorTemp.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/DIA_flyColorTemp.h \ 
@@ -519,6 +606,11 @@
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/qt4/DIA_flyArtVHS.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/qt4/Q_artVHS.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/Q_zoom.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/Q_zoom.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/DIA_flyZoom.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/zoom.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/ADM_vidAsharp.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/DIA_flyAsharp.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h \ 
@@ -561,6 +653,10 @@
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_drawing.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_rasterizer.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_types.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/flip.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/DIA_flyFlip.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/Q_flip.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h \ 
@@ -600,6 +696,8 @@
 ../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h \ 
@@ -767,6 +865,7 @@
 ../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h \ 
 ../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.h \ 
 ../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.h \ 
+../../../avidemux_plugins/ADM_audioDevices/PulseAudio/ADM_devicePulse.h \ 
 ../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h \ 
 ../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.h \ 
 ../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.h \ 
@@ -896,6 +995,7 @@
 ../../../avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp \ 
 ../../../avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp \ 
+../../../avidemux_core/ADM_coreImage/src/ADM_toneMapper.cpp \ 
 ../../../avidemux_core/ADM_coreUI/src/DIA_factory.cpp \ 
 ../../../avidemux_core/ADM_coreUI/src/DIA_working.cpp \ 
 ../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp \ 
@@ -1031,6 +1131,7 @@
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_shell/qt4Shell.cpp \ 
 ../../../avidemux/qt4/ADM_userInterfaces/ADM_ocr/Q_ocr.cpp \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_dialogFactory.cpp \ 
+../../../avidemux/qt4/ADM_UIs/src/T_floatResettable.cpp \ 
 ../../../avidemux/qt4/ADM_UIs/src/FAC_integer.cpp \ 
 ../../../avidemux/qt4/ADM_UIs/src/T_menu.cpp \ 
 ../../../avidemux/qt4/ADM_UIs/src/FAC_aspectRatio.cpp \ 
@@ -1154,6 +1255,7 @@
 ../../../avidemux/common/ADM_commonUI/DIA_builtin.cpp \ 
 ../../../avidemux/common/ADM_commonUI/DIA_audioFilter.cpp \ 
 ../../../avidemux/common/ADM_commonUI/DIA_jobs_save.cpp \ 
+../../../avidemux/common/ADM_commonUI/DIA_HDRConfig.cpp \ 
 ../../../avidemux/common/ADM_commonUI/DIA_gototime.cpp \ 
 ../../../avidemux/common/ADM_commonUI/DIA_prefs.cpp \ 
 ../../../avidemux/common/ADM_commonUI/DIA_plugins.cpp \ 
@@ -1243,6 +1345,13 @@
 ../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxy.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsproxyAudio.cpp \ 
 ../../../avidemux_plugins/ADM_demuxers/AvsProxy/ADM_avsPlugin.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeInOut.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/DIA_flyFadeInOut.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/logo_desc.cpp \ 
@@ -1264,9 +1373,19 @@
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/artGrid_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/DIA_flyArtGrid.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/Q_artGrid.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/artGrid_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/negative/ADM_negative.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/negative/negative_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/negative/negative_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/DIA_flyArtChromaKey.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/rotate/rte_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/black/black_desc.cpp \ 
@@ -1275,7 +1394,15 @@
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/colorYuv_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/imageStab_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/Q_imageStab.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/DIA_flyImageStab.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/motest.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/imageStab_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/resampleFps/motin.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/testHeader.c \ 
@@ -1292,10 +1419,35 @@
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/qt4/DIA_flyArtPixelize.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/artPixelize_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/artPixelize_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/Q_waveletSharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/DIA_flyWaveletSharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/Q_waveletDenoise.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/DIA_flyWaveletDenoise.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/DIA_flyFadeFromImage.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/DIA_flyArtCartoon.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/Q_artCartoon.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp \ 
@@ -1307,6 +1459,11 @@
 ../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate_util.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lav_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/Q_deband.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/DIA_flyDeband.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/deband_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/deband_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp \ 
@@ -1314,6 +1471,15 @@
 ../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/DIA_flyArtChromaHold.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/Q_artChromaHold.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/stillimage/confStillimage_json.cpp \ 
@@ -1328,10 +1494,35 @@
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/Q_artPosterize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/DIA_flyArtPosterize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/DIA_flyBlur.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/Q_blur.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/blur_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/blur_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/swresize_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/DIA_flyColorBalance.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/DIA_flyLumaStab.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/Q_lumaStab.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/Q_artDynThreshold.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/DIA_flyArtDynThreshold.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/fade_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp \ 
@@ -1353,6 +1544,14 @@
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/artColorEffect_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/artColorEffect_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/DIA_flyFadeThrough.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vidFadeThrough.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/cdebug.cpp \ 
@@ -1362,6 +1561,19 @@
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilterparam_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/Q_quadTrans.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/DIA_flyQuadTrans.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/DIA_flyArtMirror.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/Q_artMirror.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/artMirror_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/artMirror_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/Q_analyzer.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/DIA_flyAnalyzer.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/DIA_flyColorTemp.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/Q_colorTemp.cpp \ 
@@ -1395,6 +1607,13 @@
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/artVHS_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/artVHS_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/Q_zoom.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/zoom_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/DIA_flyZoom.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/Q_zoom.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/zoom_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/DIA_flyAsharp.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp_json.cpp \ 
@@ -1447,6 +1666,11 @@
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_font.c \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_utils.c \ 
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ass_ssa_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/flip_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/DIA_flyFlip.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/Q_flip.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/flip_json.cpp \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast_json.cpp \ 
@@ -1467,6 +1691,7 @@
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpegPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_json.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ffvtenc_json.cpp \ 
@@ -1518,6 +1743,10 @@
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_desc.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffnvenc_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder_desc.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder_json.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffv1/ffv1Plugin.cpp \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ffFlv1Plugin.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Plugin.cpp \ 
@@ -1759,6 +1988,7 @@
 ../../../avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp \ 
 ../../../avidemux_plugins/ADM_audioDevices/Sdl/ADM_deviceSDL.cpp \ 
 ../../../avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp \ 
+../../../avidemux_plugins/ADM_audioDevices/PulseAudio/ADM_devicePulse.cpp \ 
 ../../../avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp \ 
 ../../../avidemux_plugins/ADM_audioDevices/Win32/ADM_deviceWin32.cpp \ 
 ../../../avidemux_plugins/ADM_audioDevices/Arts/ADM_deviceArts.cpp \ 
@@ -1833,25 +2063,49 @@
 
 FORMS = \
 ../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artPixelize/qt4/artPixelize.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artVignette/qt4/artVignette.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/qt4/artColorEffect.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/colorTemp.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artVHS/qt4/artVHS.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/qt4/artCharcoal.ui \ 
+../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui \

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ha fallat l&apos;intent d&apos;obrir %s!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -493,7 +493,7 @@
         <translation type="unfinished">Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Copiat</translation>
@@ -532,6 +532,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -567,7 +569,7 @@
         <translation type="unfinished">000000</translation>
     </message>
     <message>
-        <location line="-1437"/>
+        <location line="-1486"/>
         <source>&amp;Help</source>
         <translation type="unfinished">Aj&amp;uda</translation>
     </message>
@@ -577,7 +579,7 @@
         <translation type="unfinished">&amp;Vídeo</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation type="unfinished">&amp;Audio</translation>
     </message>
@@ -592,7 +594,7 @@
         <translation type="unfinished">E&amp;ines</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edita</translation>
     </message>
@@ -602,7 +604,7 @@
         <translation type="unfinished">Visua&amp;litza</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation type="unfinished">&amp;Personal.</translation>
     </message>
@@ -617,7 +619,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1204"/>
+        <location line="+1252"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Obre</translation>
     </message>
@@ -687,7 +689,7 @@
         <translation type="unfinished">&amp;Sortida</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
         <translation type="unfinished">Al &amp;costat</translation>
     </message>
@@ -702,12 +704,12 @@
         <translation type="unfinished">Sepa&amp;rades</translation>
     </message>
     <message>
-        <location line="-1205"/>
+        <location line="-1267"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
     <message>
-        <location line="+772"/>
+        <location line="+820"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -722,12 +724,12 @@
         <translation type="unfinished">Tipus fotograma: </translation>
     </message>
     <message>
-        <location line="-1259"/>
+        <location line="-1308"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -764,12 +766,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -809,7 +811,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -869,7 +871,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-509"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -915,6 +927,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1063,7 +1085,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1083,7 +1105,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Permet freq. d&apos;àudio no estàndard per a DVD</translation>
     </message>
@@ -1158,7 +1180,27 @@
         <translation type="unfinished">Habilita SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished">Fils _lavc: </translation>
     </message>
@@ -1200,7 +1242,7 @@
         <translation type="unfinished">Baixa</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">Prioritat de _codificació: </translation>
     </message>
@@ -1225,7 +1267,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,22 +1287,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation type="unfinished">Xv (millor)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation type="unfinished">SDL (bona)</translation>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="obsolete">Xv (millor)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="obsolete">SDL (bona)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation type="unfinished">_Visualització vídeo: </translation>
     </message>
@@ -1333,7 +1429,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">Desbloqueig _horitzontal</translation>
     </message>
@@ -1359,17 +1455,17 @@
         <translation type="unfinished">_Intensitat: </translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished">Postprocessament predeterminat</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation type="unfinished">Interfície d&apos;usuari</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation type="unfinished">Sortida</translation>
     </message>
@@ -1384,13 +1480,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished">Àudio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1398,7 +1494,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation type="unfinished">CPU</translation>
     </message>
@@ -1408,8 +1504,7 @@
         <translation type="unfinished">Multiprocessament</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+3"/>
+        <location line="+18"/>
         <source>Preferences</source>
         <translation type="unfinished">Preferències</translation>
     </message>
@@ -1445,7 +1540,7 @@
         <translation type="unfinished">Posa el marcador B</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Filtres</translation>
@@ -1466,7 +1561,7 @@
         <translation type="unfinished">Fotograma clau següent</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished">Fotograma negre anterior</translation>
     </message>
@@ -1558,7 +1653,7 @@
         <translation type="unfinished">Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation type="unfinished">Mode de _guany:</translation>
     </message>
@@ -1573,7 +1668,7 @@
         <translation type="unfinished">_Mesclador:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation type="unfinished">Filtres d&apos;àudio</translation>
     </message>
@@ -1589,11 +1684,13 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation type="unfinished">SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished">XVideo</translation>
     </message>
@@ -1694,7 +1791,7 @@
         <translation type="unfinished">No s&apos;ha codificat en aquesta versió</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1713,7 +1810,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished">N&apos;esteu segur?</translation>
     </message>
@@ -1778,7 +1875,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished">S&apos;ha produït un error sobre permisos</translation>
     </message>
@@ -1830,19 +1927,19 @@
         <translation type="unfinished">Alguna cosa ha fallat en afegir.</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Alguna cosa ha falalt (II).</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished">S&apos;està comprovant el vídeo.</translation>
     </message>
@@ -1877,7 +1974,7 @@
         <translation type="unfinished">Alguna cosa no ha funcionat</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished">_Pista des del vídeo: </translation>
     </message>
@@ -1986,8 +2083,8 @@
         <translation type="unfinished">S&apos;han desat %d imatges.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2071,12 +2168,12 @@
         <translation type="unfinished">Dues passades</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation type="unfinished">Guany</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished">S&apos;està desant</translation>
     </message>
@@ -2086,7 +2183,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-8"/>
         <source>DRC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,13 +2198,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2132,6 +2229,7 @@
     </message>
     <message>
         <location line="+4"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2171,7 +2269,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2186,22 +2284,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2211,38 +2309,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>OpenGL (best)</source>
+        <location line="+46"/>
+        <location line="+3"/>
+        <source>Sdl driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
+        <location line="+48"/>
+        <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+3"/>
-        <source>Sdl driver</source>
+        <location line="+25"/>
+        <source>_Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
-        <source>System language</source>
+        <location line="+12"/>
+        <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
-        <source>_Language</source>
+        <location line="+50"/>
+        <source>Post-Processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2252,24 +2345,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2279,7 +2375,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-105"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2366,6 +2462,16 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2396,6 +2502,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
@@ -2451,7 +2562,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+3"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2476,6 +2597,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2501,8 +2662,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2580,7 +2741,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2605,8 +2766,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2626,14 +2787,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2644,7 +2805,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2675,7 +2836,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Caram!</translation>
     </message>
@@ -2685,7 +2846,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">S&apos;ha produït un problema en inicialitzar el dispositiu d&apos;àudio</translation>
     </message>
@@ -2807,13 +2968,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2835,20 +2996,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2876,17 +3037,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation type="unfinished">Desactivat</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Autodetecta</translation>
     </message>
@@ -3132,6 +3295,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished">WMA</translation>
     </message>
@@ -3211,6 +3379,11 @@
         <translation type="unfinished">8-bit PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished">Còdec desconegut</translation>
@@ -3333,7 +3506,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3381,6 +3554,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3409,6 +3631,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3455,6 +3734,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3561,6 +3982,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3592,9 +4121,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3612,35 +4167,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3736,12 +4296,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3797,12 +4352,12 @@
         <translation type="unfinished">Marge _inferior:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3822,12 +4377,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3905,6 +4460,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4057,7 +4632,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished">Blacken Borders</translation>
     </message>
@@ -4113,17 +4688,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4152,6 +4718,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4194,7 +4826,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4261,6 +4893,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4423,14 +5115,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished">Contrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4469,12 +5161,7 @@
         <translation type="unfinished">Crominància en V</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4532,7 +5219,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4542,7 +5229,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4554,12 +5241,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4574,13 +5262,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished">Dreta:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished">Amunt:</translation>
     </message>
@@ -4591,13 +5279,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished">Avall:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished">Esquerra:</translation>
     </message>
@@ -4607,17 +5295,17 @@
         <translation type="unfinished">Tall automàtic</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4663,7 +5351,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4682,6 +5370,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4773,6 +5497,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+57"/>
@@ -4857,6 +5697,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4872,25 +5725,25 @@
         <translation type="unfinished">S&apos;està codificant...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation type="unfinished">Fase:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation type="unfinished">Còdec de vídeo:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Cap</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
@@ -4922,12 +5775,12 @@
         <translation type="unfinished">Transcorregut:</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-505"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Temps restant:</translation>
     </message>
     <message>
-        <location line="+528"/>
+        <location line="+529"/>
         <source>Frames/sec:</source>
         <translation type="unfinished">Fotogrames/s:</translation>
     </message>
@@ -4974,7 +5827,7 @@
         <translation type="unfinished">Quantificador:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Apaga l&apos;ordinador en acabar</translation>
     </message>
@@ -5014,7 +5867,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Atura / Cancel·la</translation>
     </message>
@@ -5024,12 +5887,12 @@
         <translation type="unfinished">Avançat</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+198"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5047,7 +5910,7 @@
         <translation type="unfinished">Ajusta el contrast, la lluminositat, la saturació i la gamma.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5055,7 +5918,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+267"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+260"/>
         <source>Green</source>
         <translation type="unfinished">Verd</translation>
     </message>
@@ -5080,7 +5943,7 @@
         <translation type="unfinished">Inicial</translation>
     </message>
     <message>
-        <location line="-246"/>
+        <location line="-239"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation type="unfinished">Contrast</translation>
@@ -5096,12 +5959,7 @@
         <translation type="unfinished">Lluminositat</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5125,9 +5983,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Fade</translation>
@@ -5373,7 +6720,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">Predetermin.</translation>
     </message>
@@ -5459,7 +6806,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5576,7 +6923,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5627,7 +6974,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6081,7 +7428,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6134,12 +7481,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6177,7 +7524,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6198,9 +7545,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6294,6 +7704,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6807,16 +8389,11 @@
         <source>Saturation</source>
         <translation type="unfinished">Saturació</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6826,7 +8403,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6850,6 +8427,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6902,8 +8555,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Full</translation>
     </message>
@@ -6920,8 +8573,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">_Canvi veloc. d&apos;imatge: </translation>
     </message>
@@ -7097,12 +8750,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">_Quantificador:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7112,8 +8765,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7269,7 +8922,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">Taxa de _bits: </translation>
     </message>
@@ -7435,6 +9088,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7461,6 +9170,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished">Entrellaçat</translation>
     </message>
@@ -7528,12 +9242,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7639,7 +9353,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8003,12 +9717,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Hi ha hagut un problema en la lectura d&apos;encapçalaments d&apos;SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8016,7 +9731,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">No está suportat</translation>
     </message>
@@ -8051,7 +9766,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8066,6 +9781,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8196,7 +9916,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">Àudio</translation>
     </message>
@@ -8221,7 +9941,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8306,7 +10031,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8337,22 +10062,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8362,7 +10082,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8370,22 +10090,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Error</translation>
     </message>
@@ -8494,9 +10214,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">L&apos;encapçalament és malformat</translation>
     </message>
@@ -8509,7 +10229,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8578,27 +10298,39 @@
         <translation type="unfinished">Vídeo</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation type="obsolete">TextLabel</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation type="unfinished">Freq. de quadre:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation type="unfinished">Durada total:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Relació d&apos;aspecte:</translation>
     </message>
@@ -8613,12 +10345,31 @@
         <translation type="unfinished">Còdec 4CC:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation type="unfinished">Altres propietats del vídeo</translation>
+        <translation type="obsolete">Altres propietats del vídeo</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished">Àudio</translation>
     </message>
@@ -8657,16 +10408,6 @@
         <source>OK</source>
         <translation type="unfinished">Accepta</translation>
     </message>
-    <message>
-        <location line="-166"/>
-        <source>ExtraDataSize:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>psdemuxer</name>
@@ -8690,7 +10431,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8711,7 +10452,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8726,7 +10467,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8751,22 +10492,22 @@
         <translation type="unfinished">Calen privilegis de root per realitzar aquesta operació.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">S&apos;ha aturat la codificació. Voleu reprendre-la o bé cancel·lar-la?</translation>
     </message>
@@ -8804,12 +10545,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8819,12 +10560,17 @@
         <translation type="unfinished">Projectes recents</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8859,6 +10605,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8889,23 +10645,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8962,7 +10728,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9062,28 +10828,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished">Partial</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished">Afegeix</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished">Suprimeix</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Configura</translation>
     </message>
@@ -9093,22 +10860,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9126,7 +10934,7 @@
         <translation type="unfinished">Desconegut</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9153,8 +10961,23 @@
         <source>Yes</source>
         <translation type="unfinished">Sí</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9173,94 +10996,23 @@
         <translation type="unfinished">Estèreo</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9335,6 +11087,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9355,7 +11164,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9416,7 +11225,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Mode:</translation>
     </message>
@@ -9426,12 +11235,12 @@
         <translation type="unfinished">_Nova veloc. d&apos;imatge:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation type="unfinished">Resample fps</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation type="unfinished">Personalitzat</translation>
     </message>
@@ -9461,7 +11270,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9470,16 +11279,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Ni l&apos;amplada ni l&apos;alçària no poden ser senars</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9603,7 +11432,17 @@
         <translation type="unfinished">0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished">Mètode de redimensionament:</translation>
     </message>
@@ -9627,12 +11466,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">Rotate</translation>
     </message>
@@ -9647,6 +11491,11 @@
         <translation type="unfinished">90 graus</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 graus</translation>
@@ -9657,24 +11506,26 @@
         <translation type="unfinished">270 graus</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished">_Angle: </translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9690,7 +11541,17 @@
         <translation type="unfinished">Vista prèvia</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9776,17 +11637,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9965,7 +11826,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9983,7 +11844,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10002,7 +11863,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10571,6 +12432,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10596,7 +12539,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10607,17 +12550,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">Personalitzat</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Taxa de bits sortida:</translation>
     </message>
@@ -10653,7 +12606,7 @@
         <translation type="unfinished">Taxa de bits mitjana:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11974,7 +13927,7 @@
         <translation type="unfinished">Personalitzat</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Taxa de bits sortida:</translation>
     </message>
@@ -12090,7 +14043,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13349,7 +15302,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13511,4 +15464,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Selhalo otevření %s!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -493,7 +493,7 @@
         <translation type="unfinished">Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Kopie</translation>
@@ -527,6 +527,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -562,7 +564,7 @@
         <translation type="unfinished">000000</translation>
     </message>
     <message>
-        <location line="-1437"/>
+        <location line="-1486"/>
         <source>&amp;Help</source>
         <translation type="unfinished">Náp&amp;ověda</translation>
     </message>
@@ -572,7 +574,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation>Z&amp;vuk</translation>
     </message>
@@ -587,7 +589,7 @@
         <translation>Nás&amp;troje</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Upravit</translation>
     </message>
@@ -597,7 +599,7 @@
         <translation type="unfinished">&amp;Zobrazit</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation type="unfinished">V&amp;lastní</translation>
     </message>
@@ -612,7 +614,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1204"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+646"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Otevřít...</translation>
     </message>
@@ -669,7 +681,7 @@
         <translation type="unfinished">Vý&amp;stup</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
         <translation type="unfinished">V&amp;edle sebe</translation>
     </message>
@@ -679,27 +691,27 @@
         <translation type="unfinished">&amp;Na sebe</translation>
     </message>
     <message>
-        <location line="-1703"/>
+        <location line="-1765"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Video dekodér&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1138"/>
+        <location line="+1186"/>
         <source>Frame type:</source>
         <translation type="unfinished">Typ snímku:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">S&amp;amostatně</translation>
     </message>
     <message>
-        <location line="-1205"/>
+        <location line="-1267"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
     <message>
-        <location line="+772"/>
+        <location line="+820"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -709,12 +721,12 @@
         <translation type="unfinished">B:</translation>
     </message>
     <message>
-        <location line="-1386"/>
+        <location line="-1435"/>
         <source>&amp;Toolbars</source>
         <translation>Nás&amp;trojové lišty</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Automaticky</translation>
     </message>
@@ -751,12 +763,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigace</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -796,7 +808,7 @@
         <translation>Nastavit koncovou značku [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Hledat předchozí černý snímek</translation>
     </message>
@@ -907,6 +919,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Měřič zvuku</translation>
     </message>
@@ -1055,7 +1077,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1075,7 +1097,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">P_ovolit nestandardní frekvenci zvuku pro DVD</translation>
     </message>
@@ -1150,7 +1172,27 @@
         <translation type="unfinished">Aktivovat SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished">Vlákna _libavcodecu:</translation>
     </message>
@@ -1180,7 +1222,7 @@
         <translation type="unfinished">Nižší</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">Priorita _kódování:</translation>
     </message>
@@ -1205,7 +1247,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1220,22 +1267,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation type="unfinished">XVideo (nejlepší)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation type="unfinished">SDL (dobré)</translation>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="obsolete">XVideo (nejlepší)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="obsolete">SDL (dobré)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation type="unfinished">_Video výstup:</translation>
     </message>
@@ -1307,7 +1403,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">_Horizontální deblocking</translation>
     </message>
@@ -1333,17 +1429,17 @@
         <translation type="unfinished">_Síla:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished">Výchozí dodatečné zpracování</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation type="unfinished">Uživatelské prostředí</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation type="unfinished">Výstup</translation>
     </message>
@@ -1358,13 +1454,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1372,7 +1468,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation type="unfinished">CPU</translation>
     </message>
@@ -1382,8 +1478,7 @@
         <translation type="unfinished">Vlákna</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+3"/>
+        <location line="+18"/>
         <source>Preferences</source>
         <translation type="unfinished">Předvolby</translation>
     </message>
@@ -1418,7 +1513,7 @@
         <translation type="unfinished">Nastavit značku B</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Filtry</translation>
@@ -1439,7 +1534,7 @@
         <translation type="unfinished">Následující klíčový snímek</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished">Předchozí černý snímek</translation>
     </message>
@@ -1524,7 +1619,7 @@
         <translation type="unfinished">Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation type="unfinished">Z_výšení hlasitosti:</translation>
     </message>
@@ -1539,7 +1634,7 @@
         <translation type="unfinished">_Mixér:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation>Zvukové filtry</translation>
     </message>
@@ -1560,11 +1655,13 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation type="unfinished">SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished">XVideo</translation>
     </message>
@@ -1700,7 +1797,7 @@
         <translation type="unfinished">Nepodporováno v této verzi</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1719,7 +1816,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Určitě?</translation>
     </message>
@@ -1784,7 +1881,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished">Chyba oprávnění</translation>
     </message>
@@ -1821,19 +1918,19 @@
         <translation type="unfinished">Při připojování něco selhalo</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Přihodilo se něco zlého (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished">Kontroluji video</translation>
     </message>
@@ -1868,7 +1965,7 @@
         <translation type="unfinished">Přihodilo se něco zlého</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished">_Stopa z videa:</translation>
     </message>
@@ -1977,8 +2074,8 @@
         <translation type="unfinished">Počet uložených obrázků: %d.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2232,7 +2329,7 @@
         <translation type="unfinished">Nastavení Xvid4</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished">Ukládání</translation>
     </message>
@@ -2242,7 +2339,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-54"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-56"/>
         <location line="+25"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-85"/>
         <source>None</source>
@@ -2250,7 +2347,7 @@
     </message>
     <message>
         <location line="-14"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+64"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2270,7 +2367,7 @@
         <translation>Ruční (dB)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
         <translation>Zisk</translation>
     </message>
@@ -2281,7 +2378,7 @@
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2301,6 +2398,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-15"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-61"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2340,7 +2438,7 @@
         <translation>Multiplexery</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-156"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2355,22 +2453,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+67"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
         <source>High</source>
         <translation type="unfinished"></translation>
@@ -2382,7 +2480,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+36"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2392,28 +2490,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>OpenGL (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+48"/>
         <source>System language</source>
         <translation>Systémový jazyk</translation>
     </message>
@@ -2423,7 +2506,17 @@
         <translation>_Jazyk</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,24 +2526,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2460,7 +2556,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-105"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
@@ -2548,6 +2644,16 @@
     </message>
     <message>
         <location line="+5"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>Resetovat značky</translation>
     </message>
@@ -2578,6 +2684,11 @@
         <translation>Dodatečné zpracování</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
@@ -2633,7 +2744,17 @@
         <translation>Následující snímek</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+3"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
         <translation>První snímek</translation>
     </message>
@@ -2658,6 +2779,46 @@
         <translation>Přejít na čas</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2683,8 +2844,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2729,7 +2890,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2754,8 +2915,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Vybrat video soubor...</translation>
     </message>
@@ -2775,14 +2936,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2793,7 +2954,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+164"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2808,7 +2969,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+598"/>
+        <location line="+617"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2839,7 +3000,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Ouha</translation>
     </message>
@@ -2849,7 +3010,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Chyba inicializace zvukového zařízení</translation>
     </message>
@@ -2971,13 +3132,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2999,20 +3160,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3040,17 +3201,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation type="unfinished">Vypnuto</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Automatická detekce</translation>
     </message>
@@ -3126,6 +3289,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished">WMA</translation>
     </message>
@@ -3205,6 +3373,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished">Neznámý kodek</translation>
@@ -3327,7 +3500,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3375,6 +3548,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3403,6 +3625,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3449,6 +3728,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3555,6 +3976,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3586,9 +4115,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3606,35 +4161,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3730,12 +4290,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3795,12 +4350,12 @@
         <translation type="unfinished">Sp_odní okraj:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3820,12 +4375,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3904,6 +4459,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Formát multiplexeru</translation>
     </message>
@@ -4056,7 +4631,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished">Blacken Borders</translation>
     </message>
@@ -4112,17 +4687,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4151,6 +4717,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4193,7 +4825,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4260,6 +4892,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4422,14 +5114,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Jas</translation>
     </message>
@@ -4468,12 +5160,7 @@
         <translation type="unfinished">Chrominance V</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4531,7 +5218,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4541,7 +5228,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4553,12 +5240,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4573,13 +5261,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished">Vpravo:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished">Nahoře:</translation>
     </message>
@@ -4590,13 +5278,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished">Dole:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished">Vlevo:</translation>
     </message>
@@ -4606,17 +5294,17 @@
         <translation type="unfinished">Automatický ořez</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4662,7 +5350,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4681,6 +5369,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4772,6 +5496,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+57"/>
@@ -4856,6 +5696,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4871,25 +5724,25 @@
         <translation type="unfinished">Probíhá kódování...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation type="unfinished">Fáze:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation type="unfinished">Video kodek:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Nic</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished">Neznámý</translation>
     </message>
@@ -4921,12 +5774,12 @@
         <translation type="unfinished">Uplynulý čas:</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-505"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Zbývající čas:</translation>
     </message>
     <message>
-        <location line="+528"/>
+        <location line="+529"/>
         <source>Frames/sec:</source>
         <translation type="unfinished">Snímků za sekundu:</translation>
     </message>
@@ -4973,7 +5826,7 @@
         <translation type="unfinished">Kvantizér:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Po ukončení vypnout počítač</translation>
     </message>
@@ -5013,17 +5866,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pozastavit / Ukončit</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-218"/>
         <source>Main</source>
         <translation type="unfinished">Hlavní</translation>
     </message>
     <message>
-        <location line="+199"/>
+        <location line="+231"/>
         <source>Advanced</source>
         <translation type="unfinished">Pokročilé</translation>
     </message>
@@ -5046,7 +5909,7 @@
         <translation type="unfinished">Úprava kontrastu, jasu, sytosti a gama.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5054,7 +5917,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+267"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+260"/>
         <source>Green</source>
         <translation type="unfinished">Zelená</translation>
     </message>
@@ -5069,7 +5932,7 @@
         <translation type="unfinished">&lt;b&gt;Gama&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished">Sytost</translation>
     </message>
@@ -5079,7 +5942,7 @@
         <translation type="unfinished">Jas</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation type="unfinished">Modrá</translation>
     </message>
@@ -5089,17 +5952,12 @@
         <translation type="unfinished">Váha</translation>
     </message>
     <message>
-        <location line="-86"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+155"/>
+        <location line="+69"/>
         <source>Initial</source>
         <translation type="unfinished">Výchozí</translation>
     </message>
     <message>
-        <location line="-246"/>
+        <location line="-239"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
@@ -5124,9 +5982,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Fade</translation>
@@ -5372,7 +6719,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">Výchozí</translation>
     </message>
@@ -5518,7 +6865,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5575,7 +6922,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5696,7 +7043,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6080,7 +7427,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6133,12 +7480,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6176,7 +7523,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6197,9 +7544,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6293,6 +7703,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6806,16 +8388,11 @@
         <source>Saturation</source>
         <translation type="unfinished">Sytost</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6825,7 +8402,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
@@ -6849,6 +8426,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+92"/>
@@ -6901,8 +8554,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Plná</translation>
     </message>
@@ -6919,8 +8572,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Změna _snímkové frekvence:</translation>
     </message>
@@ -7096,12 +8749,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">_Kvantizér:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7111,8 +8764,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7268,7 +8921,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Datový tok:</translation>
     </message>
@@ -7434,6 +9087,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7454,17 +9163,22 @@
         <translation type="unfinished">Správce video filtrů</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished">&lt;big&gt;&lt;b&gt;Aktivní filtry&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-122"/>
+        <location line="-131"/>
         <source>Transform</source>
         <translation type="unfinished">Transformace</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished">Prokládání</translation>
     </message>
@@ -7527,12 +9241,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Matroska obrázky</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Matroska klastry</translation>
     </message>
@@ -7638,7 +9352,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8014,12 +9728,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Chyba čtení hlavičky SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8027,7 +9742,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">Nepodporováno</translation>
     </message>
@@ -8062,7 +9777,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8077,6 +9792,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Formát multiplexeru</translation>
@@ -8207,7 +9927,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Zvuk</translation>
     </message>
@@ -8232,7 +9952,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8317,7 +10042,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8348,22 +10073,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8373,7 +10093,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8381,22 +10101,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Chyba</translation>
     </message>
@@ -8505,9 +10225,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Špatná hlavička</translation>
     </message>
@@ -8520,7 +10240,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8589,27 +10309,22 @@
         <translation type="unfinished">Video</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation type="obsolete">TextLabel</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation type="unfinished">Snímková frekvence:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation type="unfinished">Celková délka:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-163"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Poměr stran pixelu:</translation>
     </message>
@@ -8624,12 +10339,11 @@
         <translation type="unfinished">FourCC kodeku:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation type="unfinished">Extra vlastnosti videa</translation>
+        <translation type="obsolete">Extra vlastnosti videa</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+217"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished">Kopírovat do schránky</translation>
     </message>
@@ -8644,7 +10358,44 @@
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-139"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Frequency:</source>
         <translation type="unfinished">Frekvence:</translation>
     </message>
@@ -8668,16 +10419,6 @@
         <source>Codec:</source>
         <translation type="unfinished">Kodek:</translation>
     </message>
-    <message>
-        <location line="-125"/>
-        <source>ExtraDataSize:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>psdemuxer</name>
@@ -8701,7 +10442,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Vybrat zvukový soubor</translation>
     </message>
@@ -8722,7 +10463,7 @@
         <translation>Některé stopy jsou použity vícekrát</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Stopa </translation>
     </message>
@@ -8737,7 +10478,7 @@
         <translation>Soubor </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>.... Přidat zvukovou stopu</translation>
     </message>
@@ -8762,22 +10503,22 @@
         <translation type="unfinished">K této akci jsou vyžadována práva roota.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Probíhá kódování...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">Kódování je pozastaveno. Chcete v něm pokračovat, nebo jej ukončit?</translation>
     </message>
@@ -8815,12 +10556,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished">Nedávné soubory</translation>
     </message>
@@ -8830,12 +10571,17 @@
         <translation type="unfinished">Nedávné projekty</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8870,6 +10616,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8900,23 +10656,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8974,7 +10740,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9074,28 +10840,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished">Částečný</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished">Přidat</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished">Odstranit</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Nastavit</translation>
     </message>
@@ -9105,22 +10872,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9138,7 +10946,7 @@
         <translation type="unfinished">Neznámý</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9166,109 +10974,53 @@
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation type="unfinished">%2.3f snímků/s</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
-        <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished">%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -9348,6 +11100,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9368,7 +11177,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9429,7 +11238,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Režim:</translation>
     </message>
@@ -9439,12 +11248,12 @@
         <translation type="unfinished">_Nová snímková frekvence:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation type="unfinished">Resample fps</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation type="unfinished">Vlastní</translation>
     </message>
@@ -9474,7 +11283,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9483,16 +11292,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Šířka a výška nemohou být liché</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9616,7 +11445,17 @@
         <translation type="unfinished">0,00/0,00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished">Metoda převzorkování:</translation>
     </message>
@@ -9640,12 +11479,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">Rotate</translation>
     </message>
@@ -9655,6 +11499,11 @@
         <translation type="unfinished">90 stupňů</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 stupňů</translation>
@@ -9665,24 +11514,26 @@
         <translation type="unfinished">270 stupňů</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished">Ú_hel:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9690,7 +11541,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9703,7 +11554,17 @@
         <translation type="unfinished">Náhled</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9789,17 +11650,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9978,7 +11839,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9996,7 +11857,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10015,7 +11876,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10584,6 +12445,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Force display width</source>
@@ -10624,7 +12567,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10635,17 +12578,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">Vlastní</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Cílový datový tok:</translation>
     </message>
@@ -10681,7 +12634,7 @@
         <translation type="unfinished">Průměrný datový tok:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12002,7 +13955,7 @@
         <translation type="unfinished">Vlastní</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Cílový datový tok:</translation>
     </message>
@@ -12118,7 +14071,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>Nastavení x265</translation>
     </message>
     <message>
@@ -13414,7 +15367,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13547,4 +15500,167 @@
         <translation type="unfinished">yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_da.ts Changed

@@ -4,17 +4,17 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+125"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Denne video indeholder B-frames, men præsentationstidsstemplerne (PTS) findes enten ikke eller øges monotont. Avidemux kan forsøge at rekonstruere de korrekte PTS&apos;er ved at dekodere hele videoen. Dette kan tage lang tid. Fortsæt?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Dekoderer video...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -31,7 +31,7 @@
 Drop timinginformationer?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Kan ikke finde en demuxer for %s</translation>
     </message>
@@ -41,7 +41,7 @@
         <translation>Forsøg på at åbne %s fejlede!</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation>bredden</translation>
     </message>
@@ -103,7 +103,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-244"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Tjekker om tidsstempler er gyldige...</translation>
     </message>
@@ -526,7 +526,7 @@
         <translation>&amp;Værktøjslinjer</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Auto</translation>
     </message>
@@ -621,6 +621,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -630,7 +632,17 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-542"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+201"/>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
@@ -751,18 +763,18 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-976"/>
-        <location line="+987"/>
+        <location line="-1024"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location line="-1634"/>
+        <location line="-1682"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1637"/>
+        <location line="+1685"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -788,6 +800,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Lydmeter</translation>
     </message>
@@ -812,7 +834,7 @@
         <translation>Si&amp;de</translation>
     </message>
     <message>
-        <location line="-1748"/>
+        <location line="-1810"/>
         <source>Codec O&amp;ptions</source>
         <translation>Codec-&amp;valgmuligheder</translation>
     </message>
@@ -862,7 +884,7 @@
         <translation>Sæt slutmarkør [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Søg til forrige sorte billede</translation>
     </message>
@@ -1187,13 +1209,12 @@
         <translation>Sæt markør B</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+540"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+655"/>
         <source>Preferences</source>
         <translation>Præferencer</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+16"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+18"/>
         <source>Decoder Option</source>
         <translation>Dekoder-valgmuligheder</translation>
     </message>
@@ -1204,6 +1225,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtre</translation>
@@ -1280,6 +1306,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Forrige sorte billede</translation>
     </message>
@@ -1314,6 +1350,46 @@
         <translation>Gå til tid</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -1382,7 +1458,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-147"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-210"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
@@ -1442,7 +1518,7 @@
         <translation>Manuel (dB)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Gain mode:</source>
         <translation>_Forstærkningstilstand:</translation>
     </message>
@@ -1463,8 +1539,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Remix:</translation>
+        <source>Remix</source>
+        <translation>Remix</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1477,7 +1553,7 @@
         <translation>Forskydningsværdi (ms):</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>Lydfiltre</translation>
     </message>
@@ -1498,16 +1574,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1528,7 +1607,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1564,7 +1643,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1573,7 +1652,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
@@ -1643,12 +1722,12 @@
         <translation>Pluginsinfo</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+39"/>
         <source>Enable openGl support</source>
         <translation>Aktivér understøttelse af OpenGL</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-304"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Acceptér ikke-standard lydfrekvens for DVD</translation>
     </message>
@@ -1718,7 +1797,27 @@
         <translation>Aktivér SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>_lavc-tråde:</translation>
     </message>
@@ -1760,7 +1859,7 @@
         <translation>Lav</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>_Kodningsprioritet:</translation>
     </message>
@@ -1785,7 +1884,12 @@
         <translation type="unfinished">Foreslå at gemme i mappen fra den sidst åbnede fil</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1800,27 +1904,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation>XVideo (bedste)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="vanished">XVideo (bedste)</translation>
+    </message>
+    <message>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (bedste)</translation>
+        <translation type="vanished">VDPAU (bedste)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (bedste)</translation>
+        <translation type="vanished">OpenGL (bedste)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>SDL (good)</source>
-        <translation>SDL (god)</translation>
+        <translation type="vanished">SDL (god)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>Video_skærm:</translation>
     </message>
@@ -1892,7 +2048,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
         <source>_Horizontal deblocking</source>
         <translation>_Vandret deblocking</translation>
     </message>
@@ -1918,30 +2074,30 @@
         <translation>_Styrke:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Standard efterbehandling</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Brugerflade</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+56"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
         <source>Threading</source>
         <translation>Trådning</translation>
     </message>
@@ -2004,7 +2160,7 @@
 Det er nødvendigt for at kunne oprette PSP-kompatibel video.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+188"/>
+        <location filename="../../common/gui_main.cpp" line="+189"/>
         <source>Select script to save</source>
         <translation>Vælg script som skal gemmes</translation>
     </message>
@@ -2014,12 +2170,12 @@
         <translation>Du er igang med at slette listen over de sidst åbnede filer og projekter. Dette kan ikke fortrydes. Fortsæt?</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+114"/>
         <source>Not coded in this version</source>
         <translation>Ikke kodet i denne version</translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+238"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2045,7 +2201,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Er du sikker?</translation>
     </message>
@@ -2110,7 +2266,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Tilladelsesfejl</translation>
     </message>
@@ -2162,7 +2318,7 @@
         <translation>Noget fejlede ved tilføjelse til slutning</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Noget gik galt (II)</translation>
     </message>
@@ -2202,7 +2358,7 @@
         <translation>Noget gik galt</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>_Spor fra video:</translation>
     </message>
@@ -2341,8 +2497,8 @@
         <translation>Gemte %d billeder.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2621,7 +2777,7 @@
         <translation>Xvid4-konfiguration</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation>Forstærkning</translation>
     </message>
@@ -2631,7 +2787,7 @@
         <translation>Mikser</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-295"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-39"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Dekod video ved brug af DXVA2 (windows)</translation>
     </message>
@@ -2671,7 +2827,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-349"/>
         <source>_Revert to saved default output settings on video load</source>
         <translation>_Tilbagefør til gemte standardoutputindstillinger når video indlæses</translation>
     </message>
@@ -2681,7 +2837,7 @@
         <translation>_Søg efter ny udgivelse</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2691,23 +2847,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (bedste)</translation>
+        <translation type="vanished">DXVA2 (bedste)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (bedste)</translation>
+        <translation type="vanished">LIBVA (bedste)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation>Sdl-driver</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+48"/>
         <source>System language</source>
         <translation>Systemets sprog</translation>
     </message>
@@ -2717,7 +2871,17 @@
         <translation>_Sprog</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Begræns opdateringshastighed</translation>
     </message>
@@ -2727,24 +2891,27 @@
         <translation>Opdateringshastighed cap (ms)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>Renderingsvalgmuligheder for brugerflade</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Visning</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>Hardwareacceleration</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation>_Spørg altid hvilken port der skal bruges</translation>
     </message>
@@ -2754,12 +2921,22 @@
         <translation>Standardport som skal bruges</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
         <source>Redo</source>
         <translation>Omgør</translation>
     </message>
     <message>
         <location line="+13"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2780,8 +2957,8 @@
         <translation>Indlæs gemte indstillinger</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Du kan ikke fjerne *hele* videoen
@@ -2826,7 +3003,7 @@
         <translation>Kan ikke vælge MPEG-4 SP-codec.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>Vælg script/projekt som skal køre</translation>
     </message>
@@ -2841,8 +3018,8 @@
         <translation>Vælg script som skal fejlfindes</translation>
     </message>
     <message>
-        <location line="+197"/>
-        <location line="+73"/>
+        <location line="+196"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Vælg videofil...</translation>
     </message>
@@ -2862,7 +3039,7 @@
         <translation>Vælg videofil som skal føjes til slutning...</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+290"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Klipper</translation>
@@ -2873,7 +3050,7 @@
         <translation>Fejl under udklipning.</translation>
     </message>
     <message>
-        <location line="+484"/>
+        <location line="+488"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2881,7 +3058,7 @@
 Forvent problemer.</translation>
     </message>
     <message>
-        <location line="+272"/>
+        <location line="+291"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Ugyldigt lydindeks givet</translation>
@@ -2912,7 +3089,7 @@
         <translation>Indstilling af sproget til det givne sporindeks er ikke muligt: ugyldigt sporindeks!</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation>Ups</translation>
     </message>
@@ -2922,7 +3099,7 @@
         <translation>Denne funktion er deaktiveret eller er ikke længere gyldig</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Problem ved initialisering af lydenhed</translation>
     </message>
@@ -3020,14 +3197,14 @@
         <translation>Kan ikke tilføje job %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Genbrug forrige første gennemløbsdata?
 Advarsel, indstillingerne skal være lukket.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation>Kan ikke instantiere videokæde</translation>
     </message>
@@ -3055,20 +3232,20 @@
 Vil du fortsætte alligevel?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Muxer</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Kan ikke instantiere muxer</translation>
     </message>
@@ -3096,17 +3273,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>Kan ikke åbne </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>Deaktiveret</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Automatisk registrering</translation>
     </message>
@@ -3157,6 +3336,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -3236,6 +3420,11 @@
         <translation>8-bit PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>Ukendt codec</translation>
@@ -3261,7 +3450,7 @@
         <translation>Hukommelsesfejl</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Gemmer</translation>
     </message>
@@ -3374,7 +3563,7 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3416,6 +3605,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation>Script &quot;%s&quot; eksisterer ikke.</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3444,6 +3682,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3490,6 +3785,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3596,6 +4033,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3627,9 +4172,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3647,35 +4218,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3772,12 +4348,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3837,12 +4408,12 @@
         <translation>_Nederste margen</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation>SSA/ASS/SRT</translation>
     </message>
@@ -3862,12 +4433,12 @@
         <translation>Er du sikkert på, at dette er en ASS-/SSA-fil?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3947,6 +4518,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Muxing-format</translation>
     </message>
@@ -4099,7 +4690,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Mørke kanter</translation>
     </message>
@@ -4155,17 +4746,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>SortBillede</translation>
+        <translation type="vanished">SortBillede</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Denne funktion understøttes ikke i øjeblikket</translation>
+        <translation type="vanished">Denne funktion understøttes ikke i øjeblikket</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Søger efter sort billede..</translation>
     </message>
@@ -4194,6 +4784,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4221,7 +4877,7 @@
         <translation>50 (PAL)</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+189"/>
         <source>Source Fps:</source>
         <translation>Kilde billeder/sekund:</translation>
     </message>
@@ -4251,7 +4907,7 @@
         <translation>Ugyldig billeder/sekund</translation>
     </message>
     <message>
-        <location line="-166"/>
+        <location line="-175"/>
         <source>Change FPS</source>
         <translation>Skift billeder/sekund</translation>
     </message>
@@ -4266,7 +4922,7 @@
         <translation>Gør videoen hurtigere/langsommere som ved ændring af billeder/sekund. Dette filtre ændrer varighed.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+174"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -4303,6 +4959,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4465,14 +5181,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Lysstyrke</translation>
     </message>
@@ -4516,12 +5232,11 @@
         <translation>Luma</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Process</source>
-        <translation>Behandl</translation>
+        <translation type="vanished">Behandl</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4574,7 +5289,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Beskær</translation>
     </message>
@@ -4584,7 +5299,7 @@
         <translation>Beskæringsfilter</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Advarsel! Klipper for meget bredde! Bredde nulstillet!
@@ -4598,12 +5313,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4618,13 +5334,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Højre:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Øverst:</translation>
     </message>
@@ -4635,13 +5351,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Nederst:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Venstre:</translation>
     </message>
@@ -4651,17 +5367,17 @@
         <translation>Automatisk beskæring</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4707,7 +5423,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4726,6 +5442,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4817,6 +5569,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4901,6 +5769,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4916,25 +5797,25 @@
         <translation>Kodning...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Fase:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation>Video-codec:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
@@ -4966,12 +5847,12 @@
         <translation>Forløbet:</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-505"/>
         <source>Time Remaining:</source>
         <translation>Resterende tid:</translation>
     </message>
     <message>
-        <location line="+528"/>
+        <location line="+529"/>
         <source>Frames/sec:</source>
         <translation>Billeder/sekund:</translation>
     </message>
@@ -5018,7 +5899,7 @@
         <translation>Quantiser:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation>Luk computer når fuldført</translation>
     </message>
@@ -5058,17 +5939,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Pause / Abort</source>
         <translation>Pause/afbryd</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-218"/>
         <source>Main</source>
         <translation>Hoved</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+198"/>
         <source>Minimize to Tray</source>
         <translation>Minimer til bakke</translation>
     </message>
@@ -5091,7 +5982,7 @@
         <translation>Justér kontrast, lysstyrke, mætning og gamma.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5105,12 +5996,12 @@
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Gamma&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>Mætning</translation>
     </message>
@@ -5120,7 +6011,7 @@
         <translation>Lysstyrke</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation>Blå</translation>
     </message>
@@ -5144,11 +6035,6 @@
         <source>Green</source>
         <translation>Grøn</translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5169,9 +6055,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Overgang</translation>
@@ -5417,7 +6792,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation>Normal (4:3)</translation>
     </message>
@@ -5468,7 +6843,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>To tråde</translation>
     </message>
     <message>
@@ -5620,7 +6995,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5651,7 +7026,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>To tråde</translation>
     </message>
     <message>
@@ -6133,7 +7508,7 @@
         <translation>[uoverensstemmelse]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Gemmer MPEG PS (ff)</translation>
     </message>
@@ -6194,12 +7569,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Ledig</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Muxing-format</translation>
     </message>
@@ -6237,7 +7612,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Gemmer MPEG TS (ff)</translation>
     </message>
@@ -6258,9 +7633,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6354,6 +7792,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6868,16 +8478,11 @@
         <source>Saturation</source>
         <translation>Mætning</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6887,7 +8492,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
@@ -6911,6 +8516,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6963,8 +8644,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>Fuld</translation>
     </message>
@@ -6981,8 +8662,8 @@
         <translation>Meget hurtig</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>Ændring af _billedhastighed:</translation>
     </message>
@@ -7158,7 +8839,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7168,14 +8849,18 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation>_Quantiser:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>_Farverum:</translation>
+        <translation type="vanished">_Farverum:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7330,7 +9015,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>_Bithastighed:</translation>
     </message>
@@ -7504,6 +9189,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7524,7 +9265,7 @@
         <translation>Videofilterhåndtering</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Aktive filtre&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -7534,12 +9275,17 @@
         <translation>&lt;big&gt;&lt;b&gt;Tilgængelige filtre&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation>Transformér</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Sammenfletning</translation>
     </message>
@@ -7597,12 +9343,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Matroska-billeder</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Matroska-klynger</translation>
     </message>
@@ -7708,7 +9454,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8080,12 +9826,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Problem ved læsning af SVQ3-hoveder</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8093,7 +9840,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Understøttes ikke</translation>
     </message>
@@ -8128,7 +9875,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Gemmer MP4</translation>
     </message>
@@ -8143,6 +9890,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Muxing-format</translation>
@@ -8273,7 +10025,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
@@ -8298,7 +10050,12 @@
         <translation>Video har ikke nok timinginformation. Kopierer du fra AVI?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation>Kan ikke omdøbe fil (optimize)</translation>
     </message>
@@ -8384,7 +10141,7 @@
         <translation>Forhåndsvis. Klik i billedet ovenfor, for groft at sætte boksens koordinater</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8415,22 +10172,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8440,7 +10192,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8448,22 +10200,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Kan ikke gå til det næste nøglebillede</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Kan ikke gå til det forrige nøglebillede</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>Søg</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -8572,9 +10324,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Forkert udformet hoved</translation>
     </message>
@@ -8587,7 +10339,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8660,27 +10412,39 @@
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Tekstetiket</translation>
+        <translation type="vanished">Tekstetiket</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Billedhastighed:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Total varighed:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>Højde-bredde-forhold:</translation>
     </message>
@@ -8695,22 +10459,39 @@
         <translation>Codec 4CC:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>Ekstra videoegenskaber</translation>
+        <translation type="vanished">Ekstra videoegenskaber</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Størrelse på ekstradata:</translation>
+        <translation type="vanished">Størrelse på ekstradata:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Ekstradata:</translation>
+        <translation type="vanished">Ekstradata:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
@@ -8772,7 +10553,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Vælg lydfil</translation>
     </message>
@@ -8793,7 +10574,7 @@
         <translation>Nogle spor er brugt flere gange</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Spor </translation>
     </message>
@@ -8808,7 +10589,7 @@
         <translation>Fil </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>.... tilføj lydspor</translation>
     </message>
@@ -8833,22 +10614,22 @@
         <translation>Root-rettigheder kræves for at udføre denne handling.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kodningen er sat på pause. Vil du genoptage eller afbryde?</translation>
     </message>
@@ -8886,12 +10667,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Ny version tilgængelig&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Udgivet den %2.&lt;br&gt;Du kan downloade den her&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Du kan deaktivere automatisk opdatering i præferencer.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Seneste filer</translation>
     </message>
@@ -8901,12 +10682,17 @@
         <translation>Seneste projekter</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Afspil/stop</translation>
     </message>
@@ -8941,6 +10727,16 @@
         <translation>Sæt slutmarkør</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Gå til første billede</translation>
@@ -8971,24 +10767,34 @@
         <translation>Fremad ét minut</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Programmet er stødt på et fatalt problem
 Den aktuelle redigering er blevet gemt og vil blive genindlæst ved næste start</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9045,7 +10851,7 @@
         <translation>Reference</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation>Gendan seneste session</translation>
     </message>
@@ -9145,28 +10951,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Delvist</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Dette filter kan ikke gøre delvist</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
@@ -9176,22 +10983,63 @@
         <translation>Flyt op</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Flyt ned</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Gør delvist</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>Indlæs videofiltre..</translation>
     </message>
@@ -9209,7 +11057,7 @@
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>_Genoptag</translation>
     </message>
@@ -9237,108 +11085,52 @@
         <translation>Ja</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation>%2.3f billeder/sekund</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
-        <translation>%02d:%02d:%02d,%03d</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d,%03d</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -9421,6 +11213,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9441,7 +11290,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9502,7 +11351,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
         <translation>Brugerdefineret</translation>
     </message>
@@ -9527,7 +11376,22 @@
         <translation>50 (PAL)</translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+387"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation>_Tilstand:</translation>
     </message>
@@ -9537,22 +11401,27 @@
         <translation>_Ny billedhastighed:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Resample fps</source>
         <translation>Gensample billeder/sekund</translation>
     </message>
     <message>
-        <location line="-289"/>
+        <location line="-366"/>
         <source>Resample FPS</source>
         <translation>Gensample billeder/sekund</translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="-36"/>
         <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+37"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>Ændr og gennemtving billeder/sekund. Behold varighed og synk.</translation>
     </message>
@@ -9560,7 +11429,7 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>swsResize</translation>
     </message>
@@ -9570,7 +11439,7 @@
         <translation>sw skalering tilpas størrelse.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Bredde og højde kan ikke være ulige</translation>
     </message>
@@ -9689,7 +11558,17 @@
         <translation>0.00/0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Tilpas størrelse-metode:</translation>
     </message>
@@ -9713,22 +11592,27 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Rotér</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>Rotér billedet med 90/180/270 grader.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
@@ -9738,6 +11622,11 @@
         <translation>90 grader</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 grader</translation>
@@ -9748,24 +11637,26 @@
         <translation>270 grader</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>_Vinkel:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
 </context>
 <context>
@@ -9776,7 +11667,17 @@
         <translation>Forhåndsvis</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished">Baglæns ét minut</translation>
     </message>
@@ -9862,17 +11763,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10051,7 +11952,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10069,7 +11970,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10088,7 +11989,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Der er flere med filer fortløbende filnavne. Skal de indlæses allesammen?</translation>
@@ -10657,6 +12558,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10713,7 +12696,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>Ikke kodet</translation>
     </message>
@@ -10725,17 +12708,27 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>intet</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Brugerdefineret</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Ønsket bithastighed:</translation>
     </message>
@@ -10771,7 +12764,7 @@
         <translation>Gennemsnitlig bithastighed:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12094,7 +14087,7 @@
         <translation>Brugerdefineret</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Ønsket bithastighed:</translation>
     </message>
@@ -12211,7 +14204,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>x265-konfiguration</translation>
     </message>
     <message>
@@ -13248,7 +15241,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>To tråde</translation>
     </message>
     <message>
@@ -13471,4 +15464,167 @@
         <translation>yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>Der Versuch, %s zu öffnen, ist fehlgeschlagen!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>Kann Demuxer für %s nicht finden</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation>Breite</translation>
     </message>
@@ -76,7 +76,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Prüfe Gültigkeit der Zeitstempel...</translation>
     </message>
@@ -86,12 +86,12 @@
         <translation>Dieses Video enthält B-Frames, aber Presentation Timestamps (PTS) entweder fehlen oder monoton ansteigen. Avidemux kann durch Dekodierung des ganzen Videos die korrekten PTS zu rekonstruieren versuchen. Das kann viel Zeit in Anspruch nehmen. Fortfahren?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Dekodiere Video...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -287,7 +287,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/audioTracks.ui" line="+25"/>
         <source>Track 1</source>
-        <translation type="unfinished">Tonspur 1</translation>
+        <translation>Tonspur 1</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -300,22 +300,22 @@
     <message>
         <location line="-105"/>
         <source>Track 2</source>
-        <translation type="unfinished">Tonspur 2</translation>
+        <translation>Tonspur 2</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Track 3</source>
-        <translation type="unfinished">Tonspur 3</translation>
+        <translation>Tonspur 3</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Track 4</source>
-        <translation type="unfinished">Tonspur 4</translation>
+        <translation>Tonspur 4</translation>
     </message>
     <message>
         <location line="-134"/>
         <source>Audio Tracks Configuration</source>
-        <translation type="unfinished">Tonspureinstellungen</translation>
+        <translation>Tonspureinstellungen</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -495,7 +495,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
@@ -529,6 +529,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -548,7 +550,7 @@
         <translation>?</translation>
     </message>
     <message>
-        <location line="-1291"/>
+        <location line="-1340"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
@@ -558,7 +560,7 @@
         <translation>&amp;Video</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
@@ -573,7 +575,7 @@
         <translation>&amp;Werkzeuge</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
@@ -583,7 +585,7 @@
         <translation>An&amp;sicht</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation>&amp;Skripte</translation>
     </message>
@@ -593,7 +595,7 @@
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location line="+1612"/>
+        <location line="+1660"/>
         <source>&amp;Open...</source>
         <translation>&amp;Öffnen...</translation>
     </message>
@@ -644,12 +646,12 @@
         <translation type="obsolete">F7</translation>
     </message>
     <message>
-        <location line="-1096"/>
+        <location line="-1144"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
-        <location line="+772"/>
+        <location line="+820"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -669,7 +671,7 @@
         <translation>&amp;Vorschau</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
         <translation>&amp;Nebeneinander</translation>
     </message>
@@ -679,22 +681,22 @@
         <translation>&amp;Übereinander</translation>
     </message>
     <message>
-        <location line="-565"/>
+        <location line="-579"/>
         <source>Frame type:</source>
         <translation>Frame-Typ:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
         <translation>Ab&amp;trennen</translation>
     </message>
     <message>
-        <location line="-1812"/>
+        <location line="-1875"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Werkzeugleisten</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>A&amp;uto</translation>
     </message>
@@ -719,7 +721,7 @@
         <translation>&lt;b&gt;Ausgabeformat&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1099"/>
+        <location line="+1147"/>
         <source>&amp;Codec Options</source>
         <translation>&amp;Codec-Einstellungen</translation>
     </message>
@@ -734,12 +736,12 @@
         <translation>&amp;Lautstärke</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+28"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Pegelanzeige</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-138"/>
         <source>Play filtered</source>
         <translation>Filter anwenden</translation>
     </message>
@@ -749,7 +751,7 @@
         <translation>Videodatei öffnen</translation>
     </message>
     <message>
-        <location line="-794"/>
+        <location line="-842"/>
         <source>Play [SPACE]</source>
         <translation>Wiedergabe/Stopp [Leertaste]</translation>
     </message>
@@ -784,7 +786,7 @@
         <translation>Endmarkierung setzen [Strg + Bild runter]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Ein schwarzes Frame rückwärts suchen</translation>
     </message>
@@ -824,7 +826,7 @@
         <translation>Springe zur Markierung B [Bild runter]</translation>
     </message>
     <message>
-        <location line="-1327"/>
+        <location line="-1375"/>
         <source>Codec O&amp;ptions</source>
         <translation>&amp;Codec-Einstellungen</translation>
     </message>
@@ -846,17 +848,27 @@
     </message>
     <message>
         <location line="+338"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigation</translation>
     </message>
     <message>
-        <location line="-909"/>
+        <location line="-957"/>
         <source>Play</source>
         <translation>Wiedergabe</translation>
     </message>
     <message>
-        <location line="+285"/>
+        <location line="+167"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation>Springe zum vorherigen Schnittpunkt [Umschalt + Pfeiltaste runter]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation>Springe zum nächsten Schnittpunkt [Umschalt + Pfeiltaste hoch]</translation>
+    </message>
+    <message>
+        <location line="+143"/>
         <source>Forward one minute</source>
         <translation>Eine Minute vor</translation>
     </message>
@@ -917,6 +929,16 @@
         <translation>Strg+Alt+V</translation>
     </message>
     <message>
+        <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation>&amp;Toolbar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation>Strg+Alt+B</translation>
+    </message>
+    <message>
         <location line="+14"/>
         <source>Ctrl+Alt+M</source>
         <translation>Strg+Alt+M</translation>
@@ -958,12 +980,12 @@
     <message>
         <location line="+12"/>
         <source>Select VS file</source>
-        <translation type="unfinished"></translation>
+        <translation>VS-Datei wählen</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Port to use: </source>
-        <translation type="unfinished"></translation>
+        <translation>Port:</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -973,7 +995,7 @@
     <message>
         <location line="+7"/>
         <source>Run!</source>
-        <translation type="unfinished"></translation>
+        <translation>Start!</translation>
     </message>
 </context>
 <context>
@@ -1061,7 +1083,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+260"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Erlaube auch nicht DVD-konforme Audiofrequenzen (DVD-konform sind lediglich 48kHz und 96kHz)</translation>
     </message>
@@ -1088,55 +1110,75 @@
     <message>
         <location line="+4"/>
         <source>SIMD</source>
-        <translation type="unfinished">Befehlssatzerweiterungen der Prozessoren(SIMD)</translation>
+        <translation>Befehlssatzerweiterungen (SIMD)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Enable all SIMD</source>
-        <translation type="unfinished">benutze _alle verfügbaren Befehlssatzerweiterungen</translation>
+        <translation>_Alle verfügbaren Befehlssatzerweiterungen verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable MMX</source>
-        <translation type="unfinished">benutze MMX</translation>
+        <translation>MMX verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable MMXEXT</source>
-        <translation type="unfinished">benutze MMXEXT</translation>
+        <translation>MMXEXT verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable 3DNOW</source>
-        <translation type="unfinished">benutze 3DNOW</translation>
+        <translation>3DNOW verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable 3DNOWEXT</source>
-        <translation type="unfinished">benutze 3DNOWEXT</translation>
+        <translation>3DNOWEXT verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE</source>
-        <translation type="unfinished">benutze SSE</translation>
+        <translation>SSE verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE2</source>
-        <translation type="unfinished">benutze SSE2</translation>
+        <translation>SSE2 verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE3</source>
-        <translation type="unfinished">benutze SSE3</translation>
+        <translation>SSE3 verwenden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSSE3</source>
-        <translation type="unfinished">benutze SSSE3</translation>
+        <translation>SSSE3 verwenden</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation>SSE4 verwenden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation>SSE4.2 verwenden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation>AVX verwenden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation>AVX2 verwenden</translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>Decoder-_Multithreading in libavcodec:</translation>
     </message>
@@ -1166,7 +1208,7 @@
         <translation type="unfinished">Unter normal</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">Priorität für den _Kodierungsvorgang:</translation>
     </message>
@@ -1191,7 +1233,12 @@
         <translation>_Den Ordner der gerade geladenen Datei als Speicherziel vorschlagen</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation>Logdateien vom ersten Durchgang standardmäßig löschen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation>Automatisches Zusammenfügen von gestückelten Dateien</translation>
     </message>
@@ -1206,7 +1253,37 @@
         <translation>_Fragmentgröße (MiB):</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation>Laden von Bildern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation>Fortlaufend nummerierte Bilder in umgekehrter Reihenfolge _laden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation>AviSynth</translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation>HDR</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation>Standardmäßiges _Tone Mapping-Verfahren:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation>Ziel-Spitzenluminanz (cd/m²):</translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation>Zwischenspeicher für dekodierte Frames</translation>
     </message>
@@ -1216,22 +1293,20 @@
         <translation>Größe des _Zwischenspeichers:</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>XVideo (best)</source>
-        <translation type="unfinished">XVideo (bestens)</translation>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation>Gemeinsamen Cache verwenden</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
-        <translation type="unfinished"></translation>
+        <source>XVideo (best)</source>
+        <translation type="obsolete">XVideo (bestens)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>SDL (good)</source>
-        <translation type="unfinished">SDL (gut)</translation>
+        <translation type="obsolete">SDL (gut)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+25"/>
         <source>Video _display:</source>
         <translation>Video-_Anzeige:</translation>
     </message>
@@ -1253,7 +1328,7 @@
     <message>
         <location line="+2"/>
         <source>_Message level:</source>
-        <translation type="unfinished">_Anzeigestufe für Meldungen:</translation>
+        <translation>_Anzeigestufe für Meldungen:</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1279,12 +1354,12 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>Pro Logic</source>
-        <translation type="unfinished">Dolby ProLogic</translation>
+        <translation>Dolby ProLogic</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Pro Logic II</source>
-        <translation type="unfinished">Dolby ProLogic II</translation>
+        <translation>Dolby ProLogic II</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1297,22 +1372,27 @@
         <translation>_Audiogerät</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation type="unfinished">De_ringing (entfernt leichte Farbverzerrungen rund um scharfe Konturen)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Default Postprocessing</source>
         <translation>Standardmäßige Bildnachbearbeitung</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Benutzerschnittstelle</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
+        <source>Import</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
@@ -1327,13 +1407,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1341,17 +1421,17 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
-        <translation type="unfinished">Prozessor</translation>
+        <translation>Prozessor</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>Threading</source>
-        <translation type="unfinished">Mehrkernprozessoren</translation>
+        <translation>Multi-Threading</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation>_Immer fragen, welcher Port benutzt werden soll</translation>
     </message>
@@ -1361,18 +1441,17 @@
         <translation>Standardport</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+7"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+288"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
         <source>Open</source>
         <translation>Ö&amp;ffnen...</translation>
     </message>
@@ -1429,7 +1508,7 @@
     <message>
         <location line="+2"/>
         <source>Connect to avsproxy</source>
-        <translation type="unfinished">Verbinde mit avsproxy</translation>
+        <translation>Verbindung zu avsproxy</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1481,12 +1560,22 @@
     <message>
         <location line="+3"/>
         <source>Set Marker A</source>
-        <translation>Setze Markierung &amp;A</translation>
+        <translation>&amp;A-Markierung setzen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Set Marker B</source>
-        <translation>Setze Markierung &amp;B</translation>
+        <translation>&amp;B-Markierung setzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation>A-Markierung zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation>B-Markierung zurücksetzen</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1516,6 +1605,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation>HDR Tone Mapping</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>&amp;Filter</translation>
@@ -1553,12 +1647,22 @@
     <message>
         <location line="+1"/>
         <source>Previous Intra Frame</source>
-        <translation>Ein I-Frame zurück</translation>
+        <translation>Ein Keyframe zurück</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Intra Frame</source>
-        <translation>Ein I-Frame vor</translation>
+        <translation>Ein Keyframe vor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation>Zum vorherigen Schnittpunkt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation>Zum nächsten Schnittpunkt</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1583,17 +1687,57 @@
     <message>
         <location line="+2"/>
         <source>Go To Marker A</source>
-        <translation>Springe zur Markierung A</translation>
+        <translation>Zur Markierung A springen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Go To Marker B</source>
-        <translation>Springe zur Markierung B</translation>
+        <translation>Zur Markierung B springen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Go To Time</source>
-        <translation type="unfinished">Gehe zum Zeitpunkt</translation>
+        <translation>Zeit wählen</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation>Eine Sekunde zurück</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation>Eine Sekunde vor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation>Zwei Sekunden zurück</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation>Zwei Sekunden vor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation>4 Sekunden zurück</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation>4 Sekunden vor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation>Eine Minute zurück</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation>Eine Minute vor</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -1633,17 +1777,17 @@
     <message>
         <location line="+5"/>
         <source>Film to PAL</source>
-        <translation type="unfinished">23.976Hz (Film) zu 25Hz (PAL)</translation>
+        <translation>23,976 Hz (Film) zu 25 Hz (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL to Film</source>
-        <translation type="unfinished">25Hz (PAL) zu 23.976Hz (Film)</translation>
+        <translation>25 Hz (PAL) zu 23,976 Hz (Film)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Frame rate change:</source>
-        <translation type="unfinished">_Bildfrequenz ändern:</translation>
+        <translation>_Geschwindigkeit ändern:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1696,7 +1840,7 @@
         <translation type="unfinished">Dolby Surround Prologic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation>_Veränderungsmodus:</translation>
     </message>
@@ -1708,10 +1852,10 @@
     <message>
         <location line="+10"/>
         <source>_Mixer:</source>
-        <translation>_Kanalmixer:</translation>
+        <translation>_Modus:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation type="unfinished">Audio Filter</translation>
     </message>
@@ -1771,12 +1915,12 @@
         <translation type="unfinished">Audiogeräte</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-295"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-91"/>
         <source>Enable openGl support</source>
         <translation>OpenG_L benutzen</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="-4"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Bildwiederholungsfrequenz begrenzen</translation>
     </message>
@@ -1786,13 +1930,13 @@
         <translation>Bild _neu aufbauen nicht häufiger als nach (ms)</translation>
     </message>
     <message>
-        <location line="-194"/>
+        <location line="-229"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+266"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Video mittels _DXVA2 dekodieren (nur Windows)</translation>
     </message>
@@ -1812,20 +1956,18 @@
         <translation>Bei aktivierter Hardwarebeschleunigung wird Decoder-Multithreading in libavcodec deaktiviert, Änderungen erfordern Neustart der Anwendung</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="-274"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (bestens)</translation>
+        <translation type="vanished">VDPAU (bestens)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (bestens)</translation>
+        <translation type="vanished">OpenGL (bestens)</translation>
     </message>
     <message>
         <source>The options above are effective only for MPEG and DivX with software decoding</source>
@@ -1838,7 +1980,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+78"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+193"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">_Horizontales Deblocking</translation>
     </message>
@@ -1875,7 +2017,7 @@
         <translation>Nicht implementiert in dieser Version</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Dieses Video verwendet Nicht-IDR-Frames für den Direktzugriff. Der Zähler für die Anzeigereihenfolge der Frames (POC) wird an solchen Keyframes nicht zurückgesetzt. Die Wiedergabe des im Kopiermodus gespeicherten editierten Videos kann durch den unerwartet zurückgehenden Zähler an Schnittpunkten der eingefügten Auswahl stocken.
@@ -1897,7 +2039,7 @@
 Trotzdem fortsetzen?</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Sind Sie sicher?</translation>
     </message>
@@ -1969,7 +2111,7 @@
 Trotzdem fortsetzen?</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Fehlende Berechtigungen</translation>
     </message>
@@ -2021,19 +2163,19 @@
         <translation type="unfinished">Beim Anhängen ging irgendetwas schief</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Irgendetwas Schlimmes ist passiert (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished">Das Video wird geprüft</translation>
     </message>
@@ -2063,7 +2205,7 @@
         <translation type="unfinished">Sie können nicht alle Bilder entfernen</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+116"/>
         <source>_Track from video:</source>
         <translation type="unfinished">Audio-_Spur:</translation>
     </message>
@@ -2148,7 +2290,7 @@
     <message>
         <location line="+327"/>
         <source>Maximum number of 99999 images reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>Höchstzahl von 99999 Bildern erreicht.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2162,8 +2304,8 @@
         <translation>%d Bilder gespeichert.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2237,7 +2379,7 @@
         <translation type="unfinished">2. Durchlauf</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+72"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Video mittels _VDPAU dekodieren</translation>
     </message>
@@ -2257,12 +2399,11 @@
         <translation>Bei aktivierter Dekodierung in Hardware ist es ratsam, die entsprechende Video-Anzeige zu verwenden</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>LIBVA (best)</source>
-        <translation type="unfinished">libVA (bestens)</translation>
+        <translation type="obsolete">libVA (bestens)</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="-113"/>
         <source>_Language</source>
         <translation>_Sprache</translation>
     </message>
@@ -2272,38 +2413,67 @@
         <translation>Systemvorgabe</translation>
     </message>
     <message>
-        <location line="-179"/>
+        <location line="-205"/>
         <source>_Check for new release</source>
         <translation>Auf _Update überprüfen</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+114"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation>Für OpenGL-Anzeige und -Filter muss OpenGL bereits beim Start der Anwendung aktiviert und funktionsfähig sein</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>Darstellungsoptionen der grafischen Oberfläche</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Darstellung</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished">HW-Beschleunigung</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Das *ganze* Video zu löschen ist nicht möglich
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1253"/>
-        <location line="+73"/>
+        <location filename="../../common/gui_main.cpp" line="-1303"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Videodatei wählen...</translation>
     </message>
@@ -2313,13 +2483,13 @@
         <translation>Videodatei zum Anfügen wählen...</translation>
     </message>
     <message>
-        <location line="+1087"/>
+        <location line="+1133"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished">Ungültige Liste der Tonspuren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Speichern</translation>
     </message>
@@ -2329,7 +2499,7 @@
         <translation>Das gespeicherte Video ist unvollständig. Der Fehler ereignete sich bei %s (%d%%). Dies kann eine Folge ungültiger Zeitstempel im Video sein.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1395"/>
+        <location filename="../../common/gui_main.cpp" line="-1444"/>
         <source>Select script/project to run</source>
         <translation>Skript/Projekt zum Ausführen wählen</translation>
     </message>
@@ -2349,7 +2519,7 @@
         <translation>Sie sind dabei, die Liste der zuletzt geladenen Videos und Projekte zu leeren. Dies kann nicht rückgängig gemacht werden. Fortfahren?</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+154"/>
         <source>No engine</source>
         <translation>Keine Skript-Engine</translation>
     </message>
@@ -2359,7 +2529,7 @@
         <translation>tinyPy wurde beim Kompilieren nicht aktiviert</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+198"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2368,7 +2538,7 @@
 Trotzdem fortsetzen?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Schneiden</translation>
@@ -2379,7 +2549,7 @@
         <translation>Fehler beim Ausschneiden.</translation>
     </message>
     <message>
-        <location line="+826"/>
+        <location line="+849"/>
         <source>Cannot use that file as audio track</source>
         <translation>Kann diese Datei nicht als Tonspur verwenden</translation>
     </message>
@@ -2414,7 +2584,7 @@
         <translation>wenige Sekunden</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-54"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-56"/>
         <location line="+25"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-78"/>
         <source>None</source>
@@ -2423,7 +2593,7 @@
     <message>
         <location line="-3"/>
         <source>DRC</source>
-        <translation type="unfinished"></translation>
+        <translation>Dynamikkompression</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2436,9 +2606,9 @@
         <translation>Manuell (dB)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
-        <translation type="unfinished"></translation>
+        <translation>Verstärkung</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2447,13 +2617,13 @@
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
-        <translation type="unfinished"></translation>
+        <source>Remix</source>
+        <translation>Remix</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mixer</source>
-        <translation type="unfinished"></translation>
+        <translation>Mischer</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2472,16 +2642,19 @@
     </message>
     <message>
         <location line="+2"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-232"/>
         <source>SDL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2493,7 +2666,7 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="-3"/>
         <source>TimeStamp:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeit:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-109"/>
@@ -2566,7 +2739,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-150"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
@@ -2578,7 +2751,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-41"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-52"/>
         <source>Build Option</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2682,17 +2855,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1447"/>
+        <location filename="../../common/gui_main.cpp" line="-1496"/>
         <source>Select script to save</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateinamen für Skript wählen</translation>
     </message>
     <message>
-        <location line="+1236"/>
+        <location line="+1265"/>
         <source>Something bad happened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+509"/>
+        <location line="+531"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2702,7 +2875,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Probleme beim Initialisieren des Audio-Gerätes</translation>
     </message>
@@ -2824,14 +2997,14 @@
         <translation>Kann den Job %s nicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished">Ergebnisse eines früheren ersten Durchlaufs wiederverwenden?
 Warnung: Die Encoder-Konfiguration muss ähnlich sein.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished">Kann Filterkette nicht aufbauen</translation>
     </message>
@@ -2859,20 +3032,20 @@
 Trotzdem fortsetzen?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished">Kann Muxer-Instanz nicht erstellen</translation>
     </message>
@@ -2900,17 +3073,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished">Keine Daten zum Muxen oder keine Ausgabedatei</translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+105"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>Deaktiviert</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Automatisch</translation>
     </message>
@@ -3156,6 +3331,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3235,6 +3415,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished">Unbekannter Codec</translation>
@@ -3363,7 +3548,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3412,6 +3597,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation>Skript &quot;%s&quot; existiert nicht.</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation>_Tone Mapping:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation>_Sättigung:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation>_Verstärkung (Multiplikator):</translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation>Zurücksetzen</translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3440,6 +3674,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3486,6 +3777,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3592,6 +4025,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3623,9 +4164,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation>VHS</translation>
     </message>
@@ -3643,35 +4210,40 @@
         <translation>VHS</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation>Luminanz-Bandbreite</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation>Chrominanz-Bandbreite</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation>Synchronisationsfehler</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation>Chrominanz nicht verzögern</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation>Luminanz nicht verzögern</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation>Synchronisationsfilter</translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation>Rauschen</translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3767,12 +4339,7 @@
         <translation>Blockfilterung auch in der y-Achse (HQBF)</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation>Anpassungsstärke</translation>
     </message>
@@ -3828,12 +4395,12 @@
         <translation>_Unterer Rand:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3853,12 +4420,12 @@
         <translation>Ist dies wirklich eine ASS/SSA-Datei?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation>Nicht anpassen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation>Anpassen an Seitenverhältnis (DAR):</translation>
     </message>
@@ -3938,6 +4505,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Ausgabeformat</translation>
     </message>
@@ -4090,7 +4677,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Rand schwärzen</translation>
     </message>
@@ -4146,17 +4733,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4185,6 +4763,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+77"/>
@@ -4227,7 +4871,7 @@
         <translation>59,94 (NTSC)</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+188"/>
         <source>Source Fps:</source>
         <translation>Ausgangsbildfrequenz:</translation>
     </message>
@@ -4294,6 +4938,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation>Farbbalance</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation>Highlights</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation>Sättigung</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation>Farbverschiebung</translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation>Schatten</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation>Mitteltöne</translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4456,14 +5160,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Helligkeit</translation>
     </message>
@@ -4507,12 +5211,11 @@
         <translation type="unfinished">Farbkomponente V</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Process</source>
-        <translation>Vorschau</translation>
+        <translation type="vanished">Vorschau</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,7 +5268,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Zuschneiden</translation>
     </message>
@@ -4575,7 +5278,7 @@
         <translation>Bildrand entfernen.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Die Breite kann nicht im geforderten Maße verkleinert werden. Die Breite wird zurückgesetzt!
@@ -4589,12 +5292,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Größe: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4609,13 +5313,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Rechts:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Oben:</translation>
     </message>
@@ -4626,13 +5330,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Unten:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Links:</translation>
     </message>
@@ -4642,12 +5346,12 @@
         <translation>Zuschneideautomatik</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Bildgröße: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>&amp;Auswahlrahmen verstecken</translation>
     </message>
@@ -4664,7 +5368,7 @@
         <translation type="vanished">Quelle</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation>Frei</translation>
@@ -4710,7 +5414,7 @@
         <translation>9:16</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation>Seitenverhältnis:</translation>
     </message>
@@ -4729,6 +5433,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4820,6 +5560,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+57"/>
@@ -4904,6 +5760,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation>Multiplexing-Simulation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation>(Keine)</translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4919,25 +5788,25 @@
         <translation>Kodieren...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Vorgang:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation>Video-Codec:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Keiner</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -4954,42 +5823,42 @@
         <translation type="unfinished">0 kb/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation>Nach Beendigung den Computer herunterfahren</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Priority:</source>
-        <translation type="unfinished">Priorität:</translation>
+        <translation>Priorität:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>High</source>
-        <translation type="unfinished">Hoch</translation>
+        <translation>Hoch</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Above Normal</source>
-        <translation type="unfinished">Über Normal</translation>
+        <translation>Über Normal</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Normal</source>
-        <translation type="unfinished">Normal</translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Below Normal</source>
-        <translation type="unfinished">Unter Normal</translation>
+        <translation>Unter Normal</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Low</source>
-        <translation type="unfinished">Niedrig</translation>
+        <translation>Niedrig</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation>Pause / Abbruch</translation>
     </message>
@@ -4999,22 +5868,32 @@
         <translation>Details</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+39"/>
         <source>Time Remaining:</source>
         <translation>Verbleibende Zeit:</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+74"/>
         <source>Keep dialog open when finished</source>
         <translation>Dialog geöffnet lassen</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation>Logdateien vom ersten Durchgang löschen</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation>Ausgabedatei:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>In den Infobereich minimieren</translation>
     </message>
@@ -5053,7 +5932,7 @@
         <location line="+31"/>
         <location line="+60"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="-81"/>
@@ -5073,7 +5952,7 @@
     <message>
         <location line="+7"/>
         <source>00:00:00</source>
-        <translation type="unfinished">00:00:00</translation>
+        <translation>00:00:00</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -5094,7 +5973,7 @@
         <translation>MPlayer eq2</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
@@ -5102,7 +5981,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+267"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+260"/>
         <source>Green</source>
         <translation>Grün</translation>
     </message>
@@ -5112,7 +5991,7 @@
         <translation>Rot</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
@@ -5128,7 +6007,7 @@
         <translation>Helligkeit</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation>Blau</translation>
     </message>
@@ -5138,12 +6017,11 @@
         <translation>Gewichtung</translation>
     </message>
     <message>
-        <location line="-86"/>
         <source>Show full preview</source>
-        <translation>Vorschau nicht teilen</translation>
+        <translation type="vanished">Vorschau nicht teilen</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+69"/>
         <source>Initial</source>
         <translation type="unfinished">Wert</translation>
     </message>
@@ -5172,9 +6050,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Ausblenden</translation>
@@ -5420,7 +6787,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">Voreinstellung</translation>
     </message>
@@ -5486,7 +6853,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Zwei Threads</translation>
     </message>
     <message>
@@ -5623,7 +6990,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5664,7 +7031,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6128,7 +7495,7 @@
         <translation>Inkompatible Parameter</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>MPEG-PS wird gespeichert</translation>
     </message>
@@ -6189,12 +7556,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Ausgabeformat</translation>
     </message>
@@ -6232,7 +7599,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>MPEG-TS wird gespeichert</translation>
     </message>
@@ -6253,9 +7620,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6349,6 +7779,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation>Spiegeln</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation>Bild horizontal oder vertikal spiegeln.</translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation>Spiegeln</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation>Horizontal spiegeln</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation>Vertikal spiegeln</translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6863,15 +8465,14 @@
         <translation>Sättigung</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Show full preview</source>
-        <translation>Vorschau nicht teilen</translation>
+        <translation type="vanished">Vorschau nicht teilen</translation>
     </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6881,7 +8482,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6905,6 +8506,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6957,8 +8634,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Umfassend</translation>
     </message>
@@ -6975,8 +8652,8 @@
         <translation type="unfinished">Sehr schnell</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">_Suchmethode:</translation>
     </message>
@@ -7152,12 +8829,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">_Quantizer:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7167,8 +8844,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7324,7 +9001,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Bitrate (kb/s):</translation>
     </message>
@@ -7498,6 +9175,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7518,17 +9251,22 @@
         <translation>Videofilter-Verwaltung</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Aktive Filter&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-122"/>
+        <location line="-131"/>
         <source>Transform</source>
         <translation>Transformation</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation>Übergang</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Interlacing</translation>
     </message>
@@ -7591,12 +9329,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7703,7 +9441,7 @@
 Nur VP8, VP9 oder AV1 als Video-Codec und Vorbis oder Opus als Audio-Codec sind zulässig</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation>WebM wird gespeichert</translation>
     </message>
@@ -7967,7 +9705,7 @@
     <message>
         <location line="+1"/>
         <source>Matrix Coefficients:</source>
-        <translation type="unfinished"></translation>
+        <translation>Matrixkoeffizienten:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7977,12 +9715,12 @@
     <message>
         <location line="+1"/>
         <source>Transfer Characteristic:</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragungs-Charakteristik:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Color Primaries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Primärfarben:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -8079,12 +9817,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problem beim Lesen der SVQ3 Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8092,7 +9831,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Nicht unterstütztes Format</translation>
     </message>
@@ -8127,7 +9866,7 @@
         <translation>Nur AAC, AC3, DTS, E-AC3, MP3, MP3 und Vorbis werden als Audio unterstützt</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Speichere mp4</translation>
     </message>
@@ -8142,6 +9881,11 @@
         <translation>MOV wird gespeichert</translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Ausgabeformat</translation>
@@ -8272,7 +10016,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +10041,12 @@
         <translation type="unfinished">Video enthält nicht genug Zeitstempel. Wird es aus AVI kopiert?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished">Für Streaming optimieren: Kann die Datei nicht umbenennen</translation>
     </message>
@@ -8382,7 +10131,7 @@
         <translation type="unfinished">Vorschau. Ins Bild klicken, um die Position der Box grob festzulegen</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Zur Größenänderung des roten Rechtecks an den Griffen ziehen </translation>
     </message>
@@ -8413,22 +10162,17 @@
         <translation>Schärfefilter MSharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Maske anzeigen</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Stärke</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Schwellenwert</translation>
     </message>
@@ -8438,7 +10182,7 @@
         <translation>Höhere Qualität</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation>Chroma verarbeiten</translation>
     </message>
@@ -8446,22 +10190,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Kann nicht zum nächsten Keyframe wechseln</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Kann nicht zum vorhergehenden Keyframe wechseln</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished">Navigation</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
@@ -8570,9 +10314,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Fehlerhafte Kopfzeilen</translation>
     </message>
@@ -8585,7 +10329,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation>&quot;%s&quot; auf Teilbereich anwenden</translation>
     </message>
@@ -8658,27 +10402,22 @@
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Bezeichnung</translation>
+        <translation type="vanished">Bezeichnung</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Bildrate:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Gesamtdauer:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-163"/>
         <source>Aspect Ratio:</source>
         <translation>Seitenverhältnis:</translation>
     </message>
@@ -8693,12 +10432,11 @@
         <translation>Codec (FourCC):</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>Zusätzliche Video-Eigenschaften</translation>
+        <translation type="vanished">Zusätzliche Video-Eigenschaften</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+217"/>
         <source>Copy to Clipboard</source>
         <translation>In die Zwischenablage</translation>
     </message>
@@ -8713,7 +10451,44 @@
         <translation>Audio</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-139"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation>nicht verfügbar</translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Average Bitrate:</source>
+        <translation>Mittlere Bitrate:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation>Extradata des Video-Codecs</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation>Größe:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation>Hex:</translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Frequency:</source>
         <translation>Abtastrate:</translation>
     </message>
@@ -8738,14 +10513,12 @@
         <translation>Codec:</translation>
     </message>
     <message>
-        <location line="-125"/>
         <source>ExtraDataSize:</source>
-        <translation>Extradata-Länge:</translation>
+        <translation type="vanished">Extradata-Länge:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Extradata:</translation>
+        <translation type="vanished">Extradata:</translation>
     </message>
 </context>
 <context>
@@ -8770,7 +10543,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8791,7 +10564,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8806,7 +10579,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8831,22 +10604,22 @@
         <translation type="unfinished">Für diese Operation sind Root-Rechte erforderlich.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Erster Durchgang</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation>Zweiter Durchgang</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
-        <translation type="unfinished"></translation>
+        <translation>Encodierung...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Der Kodierungvorgang wurde angehalten. Möchten Sie den Vorgang fortsetzen oder abbrechen?</translation>
     </message>
@@ -8884,7 +10657,7 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+494"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+713"/>
         <source>Recent Files</source>
         <translation>Zuletzt verwendete &amp;Dateien</translation>
     </message>
@@ -8894,12 +10667,17 @@
         <translation>Zuletzt verwendete &amp;Projekte</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation>Auf Vorgabe zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Wiedergabe/Stopp</translation>
     </message>
@@ -8916,12 +10694,12 @@
     <message>
         <location line="+4"/>
         <source>Go to previous keyframe</source>
-        <translation>Ein I-Frame zurück</translation>
+        <translation>Ein Keyframe zurück</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Go to next keyframe</source>
-        <translation>Ein I-Frame vor</translation>
+        <translation>Ein Keyframe vor</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -8934,6 +10712,16 @@
         <translation>Endmarkierung setzen</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation>Einen Schnittpunkt zurück</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation>Einen Schnittpunkt vor</translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Zum ersten Frame gehen</translation>
@@ -8964,12 +10752,22 @@
         <translation>Eine Minute vor</translation>
     </message>
     <message>
-        <location line="+999"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+671"/>
+        <source>%c-%s</source>
+        <translation>%c-%s</translation>
+    </message>
+    <message>
+        <location line="+80"/>
         <source>Selection: </source>
         <translation>Auswahl: </translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -8978,21 +10776,21 @@
         </translation>
     </message>
     <message>
-        <location line="-2423"/>
+        <location line="-2904"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Neue Version verfügbar&lt;/b&gt;&lt;br&gt;Version %1&lt;br&gt;Freigegeben am %2.&lt;br&gt;Das Update kann hier heruntergeladen werden:&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Sie können automatische Überprüfung auf Updates in Einstellungen deaktivieren.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+1809"/>
+        <location line="+2231"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Die Anwendung hat ein schwerwiegendes Problem festgestellt.
 Der letzte Bearbeitungsstand wurde gespeichert und wird beim nächsten Anwendungsstart geladen.</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+249"/>
         <source>%c-%s (%02d)</source>
-        <translation type="unfinished"></translation>
+        <translation>%c-%s (%02d)</translation>
     </message>
 </context>
 <context>
@@ -9043,7 +10841,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation>Vorherige Sitzung wiederherstellen</translation>
     </message>
@@ -9143,28 +10941,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Teilanwendung</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Dieser Filter kann nicht abschnittsweise angewendet werden</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Konfigurieren</translation>
     </message>
@@ -9174,22 +10973,63 @@
         <translation>Nach oben verschieben</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Nach unten verschieben</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation>Duplizieren</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Abschnittsweise anwenden</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation>Aktivieren/Deaktivieren</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation>Deaktivieren</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation>Aktivieren</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation>Auf das ganze Video anwenden</translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation>Konfiguration bestätigen und Dialog schließen mit %s</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9207,7 +11047,7 @@
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>_Fortsetzen</translation>
     </message>
@@ -9234,8 +11074,23 @@
         <source>Yes</source>
         <translation type="unfinished">Ja</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation>nicht verfügbar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation>(+%d Bytes)</translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9246,102 +11101,63 @@
     <message>
         <location line="+34"/>
         <source>Mono</source>
-        <translation type="unfinished">Mono</translation>
+        <translation>Mono</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Stereo</source>
-        <translation type="unfinished">Stereo</translation>
-    </message>
-    <message>
-        <location line="+46"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
+        <translation>Stereo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Auflösung:	</translation>
+        <translation type="vanished">Auflösung:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>Seitenverhältnis:</translation>
+        <translation type="vanished">Seitenverhältnis:</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>Bildrate:	</translation>
+        <translation type="vanished">Bildrate:	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Gesamtdauer:	</translation>
+        <translation type="vanished">Gesamtdauer:	</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Zusätzliche Video-Eigenschaften</translation>
+        <translation type="vanished">Zusätzliche Video-Eigenschaften</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>ExtraData-Länge:</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">ExtraData-Länge:</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Kanäle:		</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Kanäle:		</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Abtastrate:	</translation>
+        <translation type="vanished">Abtastrate:	</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation>Kein Ton</translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d,%03d</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9386,26 +11202,26 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
         <source>Alert</source>
-        <translation type="unfinished">Meldung</translation>
+        <translation>Meldung</translation>
     </message>
     <message>
         <location line="+6"/>
         <location line="+25"/>
         <location line="+25"/>
         <source>Info</source>
-        <translation type="unfinished">Hinweis</translation>
+        <translation>Hinweis</translation>
     </message>
     <message>
         <location line="+26"/>
         <location line="+31"/>
         <source>Confirmation</source>
-        <translation type="unfinished">Bestätigung</translation>
+        <translation>Bestätigung</translation>
     </message>
     <message>
         <location line="+21"/>
         <location line="+33"/>
         <source>Question</source>
-        <translation type="unfinished">Frage</translation>
+        <translation>Frage</translation>
     </message>
     <message>
         <location line="-7"/>
@@ -9422,6 +11238,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9442,7 +11315,7 @@
         <translation>Video Only Muxer konfigurieren</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation>Rohvideo wird gespeichert</translation>
     </message>
@@ -9503,7 +11376,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Modus:</translation>
     </message>
@@ -9513,12 +11386,12 @@
         <translation>_Neue Bildrate:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>Bildrate (Hz) ändern</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
@@ -9548,7 +11421,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>Resample</translation>
     </message>
@@ -9557,16 +11430,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>Bildrate durch Duplizieren oder Weglassen von Frames unter Beibehaltung der Abspieldauer und der Synchronisation ändern.</translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Ungerade Werte für Breite oder Höhe sind unzulässig</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>Bildgröße ändern (swsResize)</translation>
     </message>
@@ -9682,7 +11575,17 @@
         <translation>0,00 / 0,00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Methode zur Größenänderung:</translation>
     </message>
@@ -9706,12 +11609,17 @@
         <source>Spline</source>
         <translation>Spline</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Drehen</translation>
     </message>
@@ -9721,6 +11629,11 @@
         <translation>90 Grad</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 Grad</translation>
@@ -9731,24 +11644,26 @@
         <translation>270 Grad</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished">Drehen um:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9756,7 +11671,7 @@
         <translation>Bild im Uhrzeigersinn um 90/180/270 Grad drehen.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation type="unfinished">Nicht drehen</translation>
     </message>
@@ -9769,7 +11684,17 @@
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9855,17 +11780,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Standbild</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Ein Frame für angegebene Zeit wiederholen.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>_Beginn:</translation>
     </message>
@@ -10044,7 +11969,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10062,7 +11987,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation>Datei speichern</translation>
     </message>
@@ -10081,7 +12006,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Es gibt mehrere Dateien mit fortlaufender Nummerierung im Dateinamen. Sollen sie alle geladen werden?</translation>
@@ -10653,6 +12578,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10709,7 +12716,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished">Nicht verfügbar</translation>
     </message>
@@ -10720,17 +12727,27 @@
         <translation type="unfinished">Dieser Modus ist nicht implementiert</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>Kein Tuning</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Ziel-Bitrate:</translation>
     </message>
@@ -10766,7 +12783,7 @@
         <translation type="unfinished">Durchschnittliche Bitrate:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11103,7 +13120,7 @@
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation>I-Bildvorhersage beschränken (mindert die Kompression) [constrained-intra]</translation>
+        <translation>Nur Bild-intern kodierte MB für Bild-interne Vorhersage nutzen [constrained-intra]</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -11164,7 +13181,7 @@
     <message>
         <location line="-1294"/>
         <source>Threshold:</source>
-        <translation type="unfinished">Schwellwert:</translation>
+        <translation>Schwellenwert:</translation>
     </message>
     <message>
         <location line="+124"/>
@@ -11214,12 +13231,12 @@
     <message>
         <location line="+10"/>
         <source>I-frames</source>
-        <translation type="unfinished">I-Bilder (unabhängige Vollbilder, u.a.wichtig für einen späteren Videoschnitt)</translation>
+        <translation>Schlüsselbilder</translation>
     </message>
     <message>
         <location line="+82"/>
         <source>I-frame Threshold:</source>
-        <translation type="unfinished">Bildveränderungsschwellwert (%) der zum Setzen eines I-Bildes führt [scenecut]:</translation>
+        <translation>Schwellenwert der Bildveränderungen (%) zum Setzen eines Schlüsselbildes [scenecut]:</translation>
     </message>
     <message>
         <location line="+60"/>
@@ -12088,7 +14105,7 @@
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Ziel-Bitrate:</translation>
     </message>
@@ -12205,7 +14222,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>x265 HEVC Encoder konfigurieren</translation>
     </message>
     <message>
@@ -12542,7 +14559,7 @@
     <message>
         <location line="+31"/>
         <source>Constrained Intra Prediction</source>
-        <translation type="unfinished">I-Bildvorhersage beschränken (mindert die Kompression) [constrained-intra]</translation>
+        <translation>Nur Bild-intern kodierte MB für Bild-interne Vorhersage nutzen [constrained-intra]</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -13436,7 +15453,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13598,4 +15615,167 @@
         <translation>Yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation>Bildrand entfernen. Dieser Filter kann abschnittsweise angewendet werden.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation>Auswahl: </translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation>Rechts:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation>Oben:</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation>Zurücksetzen</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation>Unten:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation>Links:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation>Methode zur Größenänderung:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation>Bilinear</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Bikubisch</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation>Spline</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation>Seitenverhältnis:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>&amp;Auswahlrahmen verstecken</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation>Auswahl: </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation>Frei</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation>Wie aktuelle Auswahl</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation>Wie Quelle</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation>21:9</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation>18:9</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation>16:9</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation>4:3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation>1:1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation>9:16</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation>Auffüllung:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation>Schwarze Balken</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation>Echo</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation>Keine (Strecken)</translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>Η προσπάθεια ανοίγματος του %s απέτυχε!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>Αδυναμία εύρεσης αποπολυπλέκτη για το %s</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation>πλάτος</translation>
     </message>
@@ -77,7 +77,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Ελέγχεται η εγκυρότητα των χρονοσφραγίδων...</translation>
     </message>
@@ -87,12 +87,12 @@
         <translation>Αυτό το βίντεο περιέχει Β-στιγμιότυπα αλλά, οι χρονοσφραγίδες παρουσίασης (PTS) είτε λείπουν, είτε αυξάνονται μονοτονικά.Το Avidemux μπορεί να προσπαθήσει να ξαναχτίσει σωστά τις χρονοσφραγίδες παρουσίασης αποκωδικοποιώντας ολόκληρο το βίντεο. Πρόκειται για μια χρονοφάγο εργασία. Να συνεχίσω;</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Αποκωδικοποιείται το βίντεο...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -502,7 +502,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Αντιγραφή</translation>
@@ -536,6 +536,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -571,7 +573,7 @@
         <translation>000000</translation>
     </message>
     <message>
-        <location line="-1437"/>
+        <location line="-1486"/>
         <source>&amp;Help</source>
         <translation>Βοή&amp;θεια</translation>
     </message>
@@ -581,7 +583,7 @@
         <translation>&amp;Βίντεο</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation>&amp;Ήχος</translation>
     </message>
@@ -596,7 +598,7 @@
         <translation>Ε&amp;ργαλεία</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation>&amp;Επεξεργασία</translation>
     </message>
@@ -606,7 +608,7 @@
         <translation>Προ&amp;βολή</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation>Προ&amp;σαρμοσμένο</translation>
     </message>
@@ -621,7 +623,7 @@
         <translation> (0 κανάλια)</translation>
     </message>
     <message>
-        <location line="+1204"/>
+        <location line="+1252"/>
         <source>&amp;Open...</source>
         <translation>Άν&amp;οιγμα...</translation>
     </message>
@@ -681,12 +683,12 @@
         <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1213"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
-        <location line="+772"/>
+        <location line="+820"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -706,7 +708,7 @@
         <translation>Δεδομένα ε&amp;ξόδου</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
         <translation>&amp;Πλευρά</translation>
     </message>
@@ -716,27 +718,27 @@
         <translation>&amp;Κορυφή</translation>
     </message>
     <message>
-        <location line="-1703"/>
+        <location line="-1765"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Αποκωδικοποιητής βίντεο&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1138"/>
+        <location line="+1186"/>
         <source>Frame type:</source>
         <translation>Τύπος στιγμιότυπου:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
         <translation>Δια&amp;χωρισμός</translation>
     </message>
     <message>
-        <location line="-1812"/>
+        <location line="-1875"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Εργαλειοθήκες</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Αυτόματο</translation>
     </message>
@@ -773,12 +775,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Πλοήγηση</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation>Αναπαραγωγή [ΔΙΑΣΤΗΜΑ]</translation>
     </message>
@@ -818,7 +820,7 @@
         <translation>Ορίστε τον σημαδευτή τέλους [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Αναζήτηση προηγούμενου μαύρου στιγμιότυπου</translation>
     </message>
@@ -878,7 +880,17 @@
         <translation>Έντασ&amp;η</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-509"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation>Επιλογή: 000000</translation>
     </message>
@@ -924,6 +936,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>Μετρητής &amp;ήχου</translation>
     </message>
@@ -1080,7 +1102,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Αποκωδικοποίηση του βίντεο με τη χρήση DXVA2 (windows)</translation>
     </message>
@@ -1100,7 +1122,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-349"/>
         <source>_Revert to saved default output settings on video load</source>
         <translation>_Επαναφορά στις προεπιλεγμένες ρυθμίσεις εξόδου του βίντεο, κατά τη φόρτωση του αρχείου</translation>
     </message>
@@ -1170,7 +1192,27 @@
         <translation>Ενεργοποίηση SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>_Νήματα lavc:</translation>
     </message>
@@ -1212,7 +1254,7 @@
         <translation>Χαμηλή</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>Προτεραιότητα της _κωδικοποίησης:</translation>
     </message>
@@ -1237,7 +1279,12 @@
         <translation>_Χρήση του καταλόγου του τελευταίως αναγνωσμένου αρχείου ως του καταλόγου αποθήκευσης εξ ορισμού</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation>Ρυθμίσεις αυτόματης προσάρτησης</translation>
     </message>
@@ -1252,7 +1299,37 @@
         <translation>_Μέγεθος τμήματος:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation>Προσωρινή μνήμη αποκωδικοποιημένων εικόνων</translation>
     </message>
@@ -1262,22 +1339,45 @@
         <translation>_Μέγεθος προσωρινής μνήμης:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>XVideo (best)</source>
-        <translation>XVideo (κάλλιστη)</translation>
+        <translation type="vanished">XVideo (κάλλιστη)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (κάλλιστη)</translation>
+        <translation type="vanished">DXVA2 (κάλλιστη)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>SDL (good)</source>
-        <translation>SDL (καλή)</translation>
+        <translation type="vanished">SDL (καλή)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>_Προβολή του βίντεο:</translation>
     </message>
@@ -1344,7 +1444,7 @@
         <translation>_Σύμπτυξη καναλιών (downmixing) τοπικής αναπαραγωγής:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+82"/>
         <source>De_ringing</source>
         <translation>Αφαί_ρεση δακτυλιδιών (Deringing)</translation>
     </message>
@@ -1354,17 +1454,17 @@
         <translation>_Ισχύς:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Προεπιλεγμένη μεταεπεξεργασία</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Περιβάλλον χρήστη</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Έξοδος</translation>
     </message>
@@ -1379,13 +1479,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1393,13 +1493,12 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+15"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+22"/>
         <source>Preferences</source>
         <translation>Προτιμήσεις</translation>
     </message>
@@ -1424,7 +1523,7 @@
         <translation>Ορίστε τον σημαδευτή Β</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Μεταμορφωτές</translation>
@@ -1435,7 +1534,7 @@
         <translation>Εκτέλεση/Διακοπή</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Previous Black Frame</source>
         <translation>Προηγούμενο μαύρο στιγμιότυπο</translation>
     </message>
@@ -1527,7 +1626,7 @@
         <translation>Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation>Λειτουργία _απολαβής:</translation>
     </message>
@@ -1542,7 +1641,7 @@
         <translation>_Μείκτης:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation>Μεταμορφωτές ήχου</translation>
     </message>
@@ -1558,11 +1657,13 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
@@ -1613,7 +1714,7 @@
         <translation>Δεν κωδικοποιήθηκε σε αυτή την έκδοση</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Αυτό το βίντεο χρησιμοποιεί μη IDR σημεία επαναφοράς αντί για IDR ως κλειδοστιγμιότυπα. Η επαναταξινόμηση εικόνων στη ροή του βίντεο δεν είναι αρχικοποιημένη σε μη IDR στιγμιότυπα. Τα σημεία αποκοπής της επικολλημένης επιλογής μπορεί να προκαλέσουν διακοπές στην αναπαραγωγή λόγω της αντιστραμμένης σειράς προβολής των στιγμιότυπων αν αποθηκευθεί σε λειτουργία αντιγραφής.
@@ -1636,7 +1737,7 @@
 Να γίνει προσπάθεια ούτως ή άλλως;</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Είστε σίγουρος/η;</translation>
     </message>
@@ -1716,7 +1817,7 @@
 Να συνεχίσω ούτως ή άλλως;</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Σφάλμα δικαιωμάτων</translation>
     </message>
@@ -1768,12 +1869,12 @@
         <translation>Κάτι απέτυχε στην προσάρτηση</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Κάτι στραβό συνέβη (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -1781,7 +1882,7 @@
 Αναμένονται προβλήματα.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Ελέγχεται το βίντεο</translation>
     </message>
@@ -1816,7 +1917,7 @@
         <translation>Κάτι στραβό έγινε</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>_Κανάλι από το βίντεο:</translation>
     </message>
@@ -1916,8 +2017,8 @@
         <translation>Αποθηκεύτηκαν %d εικόνες.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -1971,12 +2072,12 @@
         <translation>Μεσαίο</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation>Απολαβή</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Αποθηκεύεται</translation>
     </message>
@@ -1988,7 +2089,7 @@
 Αυτό συνέβη, ίσως λόγω μη έγκυρων χρονοσφραγίδων στο βίντεο.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-8"/>
         <source>DRC</source>
         <translation>Συμπίεση του Δυναμικού Εύρους (DRC)</translation>
     </message>
@@ -2003,14 +2104,14 @@
         <translation>Χειροκίνητη (dB)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation>_Μέγιστη τιμή:</translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
-        <translation>Επανα-μείξη:</translation>
+        <source>Remix</source>
+        <translation>Επανα-μείξη</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2034,6 +2135,7 @@
     </message>
     <message>
         <location line="+4"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -2133,7 +2235,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-126"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+145"/>
         <source>_Horizontal deblocking</source>
         <translation>Ορι_ζόντια αφαίρεση τμημάτων (deblocking)</translation>
     </message>
@@ -2154,7 +2256,7 @@
         <translation>_Απόπλεξη (ffmpegdeint)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+74"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Αποκωδικοποίηση του βίντεο με τη χρήση VDPAU (NVIDIA)</translation>
     </message>
@@ -2169,17 +2271,17 @@
         <translation>Αποκωδικοποίηση του βίντεο με τη χρήση VideoToolbox (macOS)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation>Ενεργοποίηση της υποστήριξης openGl</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>Αν χρησιμοποιείτε την αποκωδικοποίηση μέσω υλικού, είναι καλύτερα να επιλέξετε και τον κατάλληλο οδηγό της συσκευής απεικόνισης</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-348"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Αποδοχή μη τυπικών συχνοτήτων ήχου για DVD</translation>
     </message>
@@ -2189,22 +2291,19 @@
         <translation>Έλεγ_χος για νέα έκδοση</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (κάλλιστη)</translation>
+        <translation type="vanished">VDPAU (κάλλιστη)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (κάλλιστη)</translation>
+        <translation type="vanished">OpenGL (κάλλιστη)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (κάλλιστη)</translation>
+        <translation type="vanished">LIBVA (κάλλιστη)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+154"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation>Οδηγός Sdl</translation>
@@ -2215,7 +2314,7 @@
         <translation>Συσκευή _ήχου</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+7"/>
         <source>System language</source>
         <translation>Γλώσσα του συστήματος</translation>
     </message>
@@ -2225,7 +2324,17 @@
         <translation>_Γλώσσα</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Περιορισμός του ρυθμού ανανέωσης</translation>
     </message>
@@ -2235,19 +2344,22 @@
         <translation>Ανώτατος ρυθμός ανανέωσης (ms)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>Επιλογές αποτύπωσης γραφικού περιβάλλοντος χρήστη</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Προβολή</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>Επιτάχυνση υλικού</translation>
     </message>
@@ -2257,7 +2369,7 @@
         <translation>Νημάτωση</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation>_Πάντα ερώτηση για το ποια θύρα θα χρησιμοποιηθεί</translation>
     </message>
@@ -2267,7 +2379,7 @@
         <translation>Προεπιλεγμένη θύρα προς χρήση</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-105"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
@@ -2365,6 +2477,16 @@
     </message>
     <message>
         <location line="+5"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>Επαναφορά των σημαδευτών</translation>
     </message>
@@ -2395,6 +2517,11 @@
         <translation>Μεταεπεξεργασία</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation>Αναπαραγωγή του μεταμορφωμένου</translation>
@@ -2460,6 +2587,16 @@
         <translation>Επόμενο ενδοστιγμιότυπο</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>First Frame</source>
         <translation>Πρώτο στιγμιότυπο</translation>
@@ -2485,6 +2622,46 @@
         <translation>Μετάβαση στον χρόνο</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Εστίαση 1:4</translation>
@@ -2510,8 +2687,8 @@
         <translation>Προσαρμογή στο παράθυρο</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Δεν μπορείτε να αφαιρέσετε *όλο* το βίντεο
@@ -2596,7 +2773,7 @@
 Είναι απαραίτητο για τη δημιουργία βίντεο συμβατό με PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>Επιλέξτε σενάριο ή εργασία για εκτέλεση</translation>
     </message>
@@ -2624,8 +2801,8 @@
 Να συνεχίσω;</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Επιλέξτε αρχείο βίντεο...</translation>
     </message>
@@ -2645,7 +2822,7 @@
         <translation>Επιλέξτε ένα αρχείο βίντεο για προσάρτηση...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2656,7 +2833,7 @@
 Να συνεχίσω, ούτως ή άλλως;</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Γίνεται αποκοπή</translation>
@@ -2667,7 +2844,7 @@
         <translation>Σφάλμα κατά την αποκοπή.</translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Μη έγκυρο δοθέν ευρετήριο ήχου</translation>
@@ -2703,7 +2880,7 @@
         <translation>Δεκαεξαδική αποτύπωση στιγμιότυπων</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+113"/>
         <source>Oops</source>
         <translation>Ωχ</translation>
     </message>
@@ -2713,7 +2890,7 @@
         <translation>Αυτή η λειτουργία είναι απενεργοποιημένη ή δεν ισχύει πια</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Πρόβλημα στην αρχικοποίηση της συσκευής ήχου</translation>
     </message>
@@ -2836,7 +3013,7 @@
         <translation>Αδυναμία προσθήκης της διαδικασίας %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Να επαναχρησιμοποιηθούν τα προηγούμενα δεδομένα
@@ -2844,7 +3021,7 @@
 Προειδοποίηση: οι ρυθμίσεις θα πρέπει να κλείσουν.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation>Αδυναμία αρχικοποίησης της αλυσίδας του βίντεο</translation>
     </message>
@@ -2875,20 +3052,20 @@
 Επιθυμείτε να συνεχίσετε ούτως ή άλλως;</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Πολυπλέκτης</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation>Αδύνατη ή ρύθμιση ενός κωδικοποιητή για το πρώτο πέρασμα. Η παρασχεθείσα διαμόρφωση για τον κωδικοποιητή μπορεί να μην είναι συμβατή ή ο κωδικοποιητής μπορεί να εξαρτάται από χαρακτηριστικά μη διαθέσιμα σε αυτό το σύστημα.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Αδυναμία αρχικοποίησης του πολυπλέκτη</translation>
     </message>
@@ -2920,17 +3097,19 @@
 Να γίνει προσπάθεια ούτως ή άλλως;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>Αδυναμία ανοίγματος </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation>Απενεργοποιημένο</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Αυτόματη ανίχνευση</translation>
     </message>
@@ -3206,6 +3385,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -3285,6 +3469,11 @@
         <translation>8-bit PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>Άγνωστος κωδικοποιητής</translation>
@@ -3413,7 +3602,7 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3462,6 +3651,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation>Το σενάριο «%s» δεν υπάρχει.</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3490,6 +3728,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3536,6 +3831,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3642,6 +4079,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3673,9 +4218,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3693,35 +4264,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3832,12 +4408,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-134"/>
+        <location line="-116"/>
         <source>ASharp</source>
         <translation>ASharp</translation>
     </message>
@@ -3878,12 +4449,12 @@
         <translation>Περιθώριο _βάσης:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation>SSA/ASS/SRT</translation>
     </message>
@@ -3908,12 +4479,12 @@
         <translation>Επιλογή αρχείου υποτίτλων</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation>Χωρίς προσαρμογή</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation>Προσαρμογή για προβολή της αναλογίας διαστάσεων:</translation>
     </message>
@@ -3993,6 +4564,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Μορφή πολυπλεξίας</translation>
     </message>
@@ -4145,7 +4736,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Μαύρισμα των ορίων</translation>
     </message>
@@ -4201,17 +4792,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>Μαύρο στιγμιότυπο</translation>
+        <translation type="vanished">Μαύρο στιγμιότυπο</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Αυτή η λειτουργία δεν υποστηρίζεται για την ώρα</translation>
+        <translation type="vanished">Αυτή η λειτουργία δεν υποστηρίζεται για την ώρα</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Αναζήτηση μαύρου στιγμιότυπου...</translation>
     </message>
@@ -4240,6 +4830,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4284,7 +4940,7 @@
 Αυτός ο μεταμορφωτής αλλάζει τη διάρκεια.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation>FPS πηγής:</translation>
     </message>
@@ -4351,6 +5007,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4508,8 +5224,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Αντίθεση</translation>
     </message>
@@ -4519,8 +5235,8 @@
         <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας και των χρωμάτων.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Φωτεινότητα</translation>
     </message>
@@ -4564,12 +5280,11 @@
         <translation>Χρωματισμός V</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Process</source>
-        <translation>Διεργασία</translation>
+        <translation type="vanished">Διεργασία</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4628,7 +5343,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Περικοπή</translation>
     </message>
@@ -4638,7 +5353,7 @@
         <translation>Φίλτρο περικοπής</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Προειδοποίηση : Υπερβολικά μεγάλη περικοπή κατά πλάτος. Έγινε επαναφορά του πλάτους!
@@ -4652,12 +5367,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Μέγεθος: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4677,25 +5393,25 @@
     </message>
     <message>
         <location line="-50"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Δεξιά:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Κορυφή:</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Βάση:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Αριστερά:</translation>
     </message>
@@ -4705,17 +5421,17 @@
         <translation>Αυτόματη περικοπή</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Μέγεθος: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>Απόκρυψη του &amp;περιγράμματος</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4761,7 +5477,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4780,6 +5496,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4871,6 +5623,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4955,6 +5823,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4970,25 +5851,35 @@
         <translation>Γίνεται κωδικοποίηση...</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+247"/>
+        <location line="+24"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Κανένα</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Άγνωστο</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation>Διατήρηση του διαλόγου ανοιχτού μετά τον τερματισμό</translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation>Κωδικοποιητής ήχου:</translation>
     </message>
@@ -5062,17 +5953,17 @@
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation>Κλείσιμο του υπολογιστή όταν τερματιστεί</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation>Εναπομένων χρόνος:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation>Προτεραιότητα:</translation>
     </message>
@@ -5102,7 +5993,7 @@
         <translation>Χαμηλή</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation>Παύση / Εγκατάλειψη</translation>
     </message>
@@ -5112,17 +6003,17 @@
         <translation>Προχωρημένα</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation>Κύριο</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+15"/>
         <source>Phase:</source>
         <translation>Φάση:</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+183"/>
         <source>Minimize to Tray</source>
         <translation>Ελαχιστοποίηση στο πλαίσιο συστήματος</translation>
     </message>
@@ -5145,7 +6036,7 @@
         <translation>Προσαρμογή της αντίθεσης, της φωτεινότητας, του κορεσμού και του γάμμα.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Επαναφορά</translation>
     </message>
@@ -5164,17 +6055,17 @@
         <translation>Φωτεινότητα</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Γάμμα&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>Κορεσμός</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+122"/>
         <source>Blue</source>
         <translation>Κυανό</translation>
     </message>
@@ -5198,11 +6089,6 @@
         <source>Green</source>
         <translation>Πράσινο</translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5223,9 +6109,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Εξασθένιση</translation>
@@ -5471,7 +6846,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation>Προεπιλεγμένο</translation>
     </message>
@@ -5537,7 +6912,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Δύο νήματα</translation>
     </message>
     <message>
@@ -5674,7 +7049,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5720,7 +7095,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Δύο νήματα</translation>
     </message>
     <message>
@@ -6199,7 +7574,7 @@
         <translation>[Αναντιστοιχία]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Αποθηκεύεται το mpeg PS (ff)</translation>
     </message>
@@ -6260,12 +7635,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Ελεύθερο</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Μορφή πολυπλεξίας</translation>
     </message>
@@ -6303,7 +7678,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Αποθηκεύεται το mpeg TS (ff)</translation>
     </message>
@@ -6324,9 +7699,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation>Γραμμή βάσης</translation>
     </message>
@@ -6420,6 +7858,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+88"/>
@@ -6934,16 +8544,11 @@
         <source>Saturation</source>
         <translation>Πληρότητα</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6953,7 +8558,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Τύπος:</translation>
     </message>
@@ -6977,6 +8582,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -7029,8 +8710,8 @@
         <translation>Απομάκ_ρυνση των διπλότυπων:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>Πλήρες</translation>
     </message>
@@ -7047,8 +8728,8 @@
         <translation>Πολύ γρήγορο</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>Αλλαγή της _ταχύτητας των στιγμιότυπων:</translation>
     </message>
@@ -7224,12 +8905,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation>_Κβαντιστής:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7239,9 +8920,13 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>_Χρωματικό διάστημα:</translation>
+        <translation type="vanished">_Χρωματικό διάστημα:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7396,7 +9081,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>_Δυφιορυθμός:</translation>
     </message>
@@ -7570,6 +9255,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7596,6 +9337,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Πλέξη</translation>
     </message>
@@ -7663,12 +9409,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Εικόνες Matroska</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Συστάδες Matroska</translation>
     </message>
@@ -7774,7 +9520,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8150,12 +9896,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Πρόβλημα στην ανάγνωση των κεφαλίδων SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation>Τύπος αποκωδικοποίησης του στιγμιότυπου</translation>
     </message>
@@ -8163,7 +9910,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Μη υποστηριζόμενη</translation>
     </message>
@@ -8214,7 +9961,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Αποθήκευση του mp4</translation>
     </message>
@@ -8229,6 +9976,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Μορφή πολυπλεξίας</translation>
@@ -8359,7 +10111,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
@@ -8384,7 +10136,12 @@
         <translation>Το βίντεο δεν έχει αρκετές πληροφορίες χρονισμού. Μήπως κάνετε αντιγραφή από AVI;</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation>Αδυναμία μετονομασίας του αρχείου (βελτιστοποίηση)</translation>
     </message>
@@ -8470,7 +10227,7 @@
         <translation>Προεπισκόπηση. Κάντε κλικ στην ανωτέρω εικόνα για να ορίσετε κατά προσέγγιση τις συντεταγμένες του παραλληλόγραμμου</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Μπορείτε να αλλάξετε το μέγεθος του κόκκινου ορθογωνίου χρησιμοποιώντας τις λαβές </translation>
     </message>
@@ -8501,22 +10258,17 @@
         <translation>MSharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Μάσκα</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Ισχύς</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Κατώτατο όριο</translation>
     </message>
@@ -8526,7 +10278,7 @@
         <translation>Υψηλή ποιότητα</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8534,22 +10286,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Αδυναμία μετάβασης στο επόμενο κλειδοστιγμιότυπο</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Αδυναμία μετάβασης στο προηγούμενο κλειδοστιγμιότυπο</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>Αναζήτηση</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
@@ -8658,9 +10410,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Παραμορφωμένη κεφαλίδα</translation>
     </message>
@@ -8673,7 +10425,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8746,18 +10498,35 @@
         <translation>Βίντεο</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Ταχύτητα στιγμιότυπων:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Συνολική διάρκεια:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>Αναλογία διαστάσεων:</translation>
     </message>
@@ -8772,7 +10541,27 @@
         <translation>Κωδικοποιητής 4CC:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
@@ -8802,31 +10591,23 @@
         <translation>Κωδικοποιητής:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Ετικέτα κειμένου</translation>
+        <translation type="vanished">Ετικέτα κειμένου</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Extra Video Properties</source>
-        <translation>Επιπρόσθετες ιδιότητες βίντεο</translation>
+        <translation type="vanished">Επιπρόσθετες ιδιότητες βίντεο</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Μέγεθος επιπρόσθετων δεδομένων:</translation>
+        <translation type="vanished">Μέγεθος επιπρόσθετων δεδομένων:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Επιπρόσθετα δεδομένα :</translation>
+        <translation type="vanished">Επιπρόσθετα δεδομένα :</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
         <translation>Αντιγραφή στο πρόχειρο</translation>
     </message>
@@ -8859,7 +10640,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Επιλέξτε αρχείο ήχου</translation>
     </message>
@@ -8880,7 +10661,7 @@
         <translation>Κάποια κανάλια χρησιμοποιούνται πολλαπλές φορές</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Κανάλι </translation>
     </message>
@@ -8895,7 +10676,7 @@
         <translation>Αρχείο </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>.... Προσθήκη καναλιού ήχου</translation>
     </message>
@@ -8920,22 +10701,26 @@
         <translation>Απαιτούνται δικαιώματα υπερχρήστη για να εκτελεστεί αυτή η λειτουργία.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Πρώτο πέρασμα</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pass 1</source>
-        <translation>Πέρασμα 1</translation>
+        <translation type="vanished">Πέρασμα 1</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Γίνεται κωδικοποίηση...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Η κωδικοποίηση ανεστάλη. Θέλετε να συνεχιστεί ή να εγκαταλείψετε;</translation>
     </message>
@@ -8973,12 +10758,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Διαθέσιμη νέα έκδοση&lt;/b&gt;&lt;br&gt; Έκδοση %1&lt;br&gt;Εκδόθηκε στις %2.&lt;br&gt;Μπορείτε να την κάνετε λήψη από εδώ&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Μπορείτε να απενεργοποιήσετε την αυτόματη ενημέρωση από τις προτιμήσεις.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Πρόσφατα αρχεία</translation>
     </message>
@@ -8988,12 +10773,17 @@
         <translation>Πρόσφατες εργασίες</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Εκτέλεση/Διακοπή</translation>
     </message>
@@ -9028,6 +10818,16 @@
         <translation>Ορίστε τον σημαδευτή του τέλους</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Μετάβαση στο πρώτο στιγμιότυπο</translation>
@@ -9058,24 +10858,34 @@
         <translation>Προς τα εμπρός, κατά ένα λεπτό</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Η εφαρμογή αντιμετώπισε ένα μοιραίο πρόβλημα
 Η τρέχουσα επεξεργασία έχει αποθηκευθεί και θα ξαναφορτωθεί στην επόμενη εκκίνηση</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation>Επιλογή: </translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9132,7 +10942,7 @@
         <translation> Αναφορά</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation>Αποκατάσταση της προηγούμενης συνεδρίας</translation>
     </message>
@@ -9232,28 +11042,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Μερικό</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Αυτός ο μεταμορφωτής δεν μπορεί να γίνει μερικός</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Προσθήκη</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Αφαίρεση</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Διαμόρφωση</translation>
     </message>
@@ -9263,22 +11074,63 @@
         <translation>Μετακίνηση πάνω</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Μετακίνηση κάτω</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Να γίνει μερικό</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>Φόρτωση μεταμορφωτών βίντεο...</translation>
     </message>
@@ -9296,7 +11148,7 @@
         <translation>Άγνωστο</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>_Συνέχιση</translation>
     </message>
@@ -9323,8 +11175,23 @@
         <source>Yes</source>
         <translation>Ναι</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9343,94 +11210,79 @@
         <translation>Στερεοφωνικός</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Video</source>
-        <translation>Βίντεο</translation>
+        <translation type="vanished">Βίντεο</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>Κωδικοποιητής 4CC:	</translation>
+        <translation type="vanished">Κωδικοποιητής 4CC:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Μέγεθος εικόνας:	</translation>
+        <translation type="vanished">Μέγεθος εικόνας:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>Αναλογία διαστάσεων:	</translation>
+        <translation type="vanished">Αναλογία διαστάσεων:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>Ταχύτητα στιγμιότυπων:	</translation>
+        <translation type="vanished">Ταχύτητα στιγμιότυπων:	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Συνολική διάρκεια:	</translation>
+        <translation type="vanished">Συνολική διάρκεια:	</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Επιπρόσθετες ιδιότητες βίντεο</translation>
+        <translation type="vanished">Επιπρόσθετες ιδιότητες βίντεο</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>Μέγεθος επιπρόσθετων δεδομένων:	</translation>
+        <translation type="vanished">Μέγεθος επιπρόσθετων δεδομένων:	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>Επιπρόσθετα δεδομένα :	</translation>
+        <translation type="vanished">Επιπρόσθετα δεδομένα :	</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>Ήχος</translation>
+        <translation type="vanished">Ήχος</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>Κωδικοποιητής:		</translation>
+        <translation type="vanished">Κωδικοποιητής:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Κανάλια:	</translation>
+        <translation type="vanished">Κανάλια:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>Δυφιορυθμός:	</translation>
+        <translation type="vanished">Δυφιορυθμός:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Συχνότητα:	</translation>
+        <translation type="vanished">Συχνότητα:	</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation>Χωρίς ήχο</translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
@@ -9511,6 +11363,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9531,7 +11440,7 @@
         <translation>Ρυθμίσεις πολυπλέκτη μόνο βίντεο</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation>Αποθήκευση του ακατέργαστου βίντεο</translation>
     </message>
@@ -9592,7 +11501,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Λειτουργία:</translation>
     </message>
@@ -9602,12 +11511,12 @@
         <translation>_Νέα ταχύτητα στιγμιότυπων:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>Επαναδειγματοληψία fps</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Προσαρμοσμένο</translation>
     </message>
@@ -9637,7 +11546,7 @@
         <translation>59.94 (NTSC)</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>Επαναδειγματοληψία FPS</translation>
     </message>
@@ -9646,16 +11555,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>Αλλαγή και εξαναγκασμός του FPS. Διατήρηση της διάρκειας και του συγχρονισμού.</translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Το πλάτος και το ύψος δεν μπορούν να είναι μονοί αριθμοί</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>Αλλαγή μεγέθους swsResize</translation>
     </message>
@@ -9699,7 +11628,7 @@
         <translation>200%</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation>Διγραμμικός</translation>
     </message>
@@ -9709,7 +11638,7 @@
         <translation>Δικυβικός</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation>Αναλογίες διαστάσεων</translation>
     </message>
@@ -9793,7 +11722,17 @@
         <translation>0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Μέθοδος αλλαγής των διαστάσεων:</translation>
     </message>
@@ -9807,12 +11746,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Περιστροφή</translation>
     </message>
@@ -9827,6 +11771,11 @@
         <translation>90 μοίρες</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 μοίρες</translation>
@@ -9837,24 +11786,26 @@
         <translation>270 μοίρες</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>_Γωνία:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9870,7 +11821,17 @@
         <translation>Προεπισκόπηση</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>Πίσω, για ένα λεπτό</translation>
     </message>
@@ -9956,17 +11917,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Ακίνητη εικόνα</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Διπλογραφή στιγμιότυπων, για μια δοθείσα διάρκεια.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>Χρόνο_ς έναρξης:</translation>
     </message>
@@ -10145,7 +12106,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation> ώ</translation>
     </message>
@@ -10163,7 +12124,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10182,7 +12143,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Υπάρχουν αρκετά αρχεία με συνεχόμενες ονομασίες. Να φορτωθούν όλα μαζί;</translation>
@@ -10756,6 +12717,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10812,7 +12855,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>Δεν κωδικοποιήθηκε</translation>
     </message>
@@ -10824,17 +12867,27 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>κανένα</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Προσαρμοσμένο</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Δυφιορυθμός προορισμού:</translation>
     </message>
@@ -10870,7 +12923,7 @@
         <translation>Μέσος δυφιορυθμός:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12195,7 +14248,7 @@
         <translation>Προσαρμοσμένο</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Δυφιορυθμός προορισμού:</translation>
     </message>
@@ -12314,7 +14367,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>Διαμόρφωση του x265</translation>
     </message>
     <message>
@@ -13597,7 +15650,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Δύο νήματα</translation>
     </message>
     <message>
@@ -13759,4 +15812,167 @@
         <translation>yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_en.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -488,12 +488,12 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+141"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+142"/>
         <source>&amp;Auto</source>
         <translation type="unfinished">A&amp;uto</translation>
     </message>
     <message>
-        <location line="-126"/>
+        <location line="-127"/>
         <source>Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
@@ -523,7 +523,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>&amp;Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -615,12 +615,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -639,6 +639,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -648,7 +650,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -678,7 +680,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -779,12 +781,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,6 +900,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,6 +1171,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1175,6 +1207,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>&amp;Filters</translation>
@@ -1210,7 +1247,17 @@
         <translation>&amp;About</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
         <translation>&amp;First Frame</translation>
     </message>
@@ -1235,6 +1282,46 @@
         <translation>Go to &amp;Time</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -1303,7 +1390,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+396"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+445"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1363,7 +1450,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1389,7 +1476,7 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1408,7 +1495,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1429,16 +1516,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1459,7 +1549,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1505,7 +1595,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1514,7 +1604,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1595,7 +1685,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1616,7 +1706,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-184"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1636,12 +1726,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1661,7 +1751,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1741,7 +1831,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1783,7 +1893,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1808,7 +1918,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1823,47 +1938,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Caching of decoded pictures</source>
+        <location line="+6"/>
+        <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Cache size:</source>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>XVideo (best)</source>
+        <location line="+4"/>
+        <source>Avisynth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>VDPAU (best)</source>
+        <location line="+187"/>
+        <source>HDR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>DXVA2 (best)</source>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>OpenGL (best)</source>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
+        <location line="-178"/>
+        <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>SDL (good)</source>
+        <location line="+1"/>
+        <source>_Cache size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Video _display:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,7 +2055,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1945,12 +2065,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-64"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1960,17 +2080,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+46"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,19 +2110,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2002,7 +2135,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2012,13 +2145,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+12"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+262"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-128"/>
         <source>Save as BMP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2038,12 +2191,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+18"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>&amp;Advanced</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,7 +2236,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2093,13 +2246,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+1571"/>
+        <location filename="../../common/gui_main.cpp" line="+1621"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2113,8 +2266,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+49"/>
+        <location line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2203,7 +2356,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2228,13 +2381,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+114"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+73"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2254,7 +2407,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2280,7 +2433,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2356,7 +2509,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2407,19 +2560,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2454,7 +2607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2526,7 +2679,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+113"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2536,7 +2689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2735,14 +2888,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-251"/>
+        <location filename="../../common/gui_savenew.cpp" line="-253"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+170"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -2771,20 +2924,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2812,17 +2965,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-113"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3108,6 +3263,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3187,6 +3347,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3212,7 +3377,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3319,7 +3484,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3367,6 +3532,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3395,6 +3609,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3441,6 +3712,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3547,6 +3960,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3578,9 +4099,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3598,35 +4145,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3722,12 +4274,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3795,12 +4342,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3883,6 +4430,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4035,7 +4602,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4091,17 +4658,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4130,6 +4688,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4172,7 +4796,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4239,6 +4863,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4396,8 +5080,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4407,8 +5091,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4437,12 +5121,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4508,7 +5187,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4518,7 +5197,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4530,12 +5209,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4550,13 +5230,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4567,13 +5247,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4583,17 +5263,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4639,7 +5319,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4658,6 +5338,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4749,6 +5465,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4825,6 +5657,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4846,29 +5691,29 @@
     </message>
     <message>
         <location line="+32"/>
-        <location line="+254"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+247"/>
+        <location line="-310"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-310"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-31"/>
+        <location line="+24"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+11"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4908,7 +5753,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5015,7 +5870,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5029,12 +5884,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5044,7 +5899,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,11 +5923,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5093,9 +5943,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5341,7 +6680,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5392,7 +6731,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5544,7 +6883,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5575,7 +6914,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6049,7 +7388,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6102,12 +7441,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6145,7 +7484,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6166,9 +7505,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6260,6 +7662,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6738,16 +8312,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6757,7 +8326,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6781,6 +8350,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6833,8 +8478,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6851,8 +8496,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7028,7 +8673,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7038,13 +8683,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_ColorSpace:</source>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7200,7 +8845,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7366,6 +9011,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7386,7 +9087,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7396,12 +9097,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7459,12 +9165,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7570,7 +9276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7934,12 +9640,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7947,7 +9654,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7982,7 +9689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7997,6 +9704,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8127,7 +9839,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8152,7 +9864,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8237,7 +9954,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8268,22 +9985,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8293,7 +10005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8301,22 +10013,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8425,9 +10137,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8440,7 +10152,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8509,27 +10221,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
+        <location line="+66"/>
+        <source>Frame Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <source>Frame Rate:</source>
+        <location line="-14"/>
+        <location line="+142"/>
+        <source>Total Duration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-170"/>
         <location line="+14"/>
-        <location line="+135"/>
-        <source>Total Duration:</source>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8544,22 +10264,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Extra Video Properties</source>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <source>ExtraDataSize:</source>
+        <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
+        <location line="+7"/>
+        <source>Extradata:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8621,7 +10346,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8642,7 +10367,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8657,7 +10382,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8682,22 +10407,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8735,12 +10460,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8750,12 +10475,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8790,6 +10520,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8820,23 +10560,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -8893,7 +10643,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8993,28 +10743,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,169 +10775,154 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Make partial</source>
+        <source>DISABLED </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
-        <source>Press %s to accept the dialog</source>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
-        <source>Load video filters..</source>
+        <location line="+164"/>
+        <source>Move down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Save video filters..</source>
+        <location line="+2"/>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>qprocessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
-        <source>Unknown</source>
+        <location line="+2"/>
+        <location line="+80"/>
+        <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
-        <source>_Resume</source>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The processing is paused.</source>
+        <location line="+74"/>
+        <source>Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Cancel it ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>qprops</name>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
-        <source>No</source>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Yes</source>
+        <location line="+3"/>
+        <source>Make global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>%2.3f fps</source>
+        <location line="+146"/>
+        <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
+        <location line="+148"/>
+        <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation>
-            <numerusform>Audio (%n active track)</numerusform>
-            <numerusform>Audio (%n active tracks)</numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+83"/>
-        <source>Video</source>
+        <location line="+15"/>
+        <source>Save video filters..</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>qprocessing</name>
     <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
+        <location line="+96"/>
+        <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
+        <location line="+1"/>
+        <source>The processing is paused.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
+        <location line="+1"/>
+        <source>Cancel it ?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>qprops</name>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
+        <location line="+0"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
+        <location line="+36"/>
+        <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
+        <location line="+4"/>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation>
+            <numerusform>Audio (%n active track)</numerusform>
+            <numerusform>Audio (%n active tracks)</numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9266,6 +11002,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9286,7 +11079,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9347,7 +11140,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9377,7 +11170,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9387,7 +11180,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,6 +11205,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
@@ -9405,12 +11218,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9514,7 +11327,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9538,22 +11361,27 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9564,17 +11392,17 @@
     </message>
     <message>
         <location line="+0"/>
-        <source>90°</source>
+        <source>90° clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>180 degrees</source>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>180°</source>
+        <location line="-1"/>
+        <source>180 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9583,11 +11411,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>270°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished"></translation>
@@ -9601,7 +11424,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9687,17 +11520,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9876,7 +11709,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9894,7 +11727,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9913,7 +11746,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10482,6 +12315,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10507,7 +12422,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10518,17 +12433,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10564,7 +12489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11881,7 +13806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11993,7 +13918,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13022,7 +14947,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13245,4 +15170,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>¡Error al intentar abrir %s!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>No se puede encontrar un demultiplexor para %s</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation>anchura</translation>
     </message>
@@ -76,7 +76,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Comprobando si las marcas de tiempo son válidas..</translation>
     </message>
@@ -86,12 +86,12 @@
         <translation>Este vídeo contiene fotogramas-B, pero las marcas de tiempo de presentación (PTS) faltan o aumentan monotónicamente. Avidemux puede intentar reconstruir las PTS correctas decodificando el vídeo entero. Esto puede llevar mucho tiempo. ¿Quiere proceder?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Decodificando el vídeo...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -501,7 +501,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Copiar</translation>
@@ -526,7 +526,7 @@
         <translation>Filtros</translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+708"/>
         <source>00:00:00.000</source>
         <translation></translation>
     </message>
@@ -557,7 +557,7 @@
         <translation>Tipo de fotograma:</translation>
     </message>
     <message>
-        <location line="-1278"/>
+        <location line="-1327"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
@@ -582,7 +582,7 @@
         <translation>Barras de herramien&amp;tas</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Automático</translation>
     </message>
@@ -654,12 +654,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navegación</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation>Reproducir [ESPACIO]</translation>
     </message>
@@ -678,6 +678,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -687,7 +689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>Ir al fotograma anterior [IZQUIERDA]</translation>
     </message>
@@ -717,7 +719,7 @@
         <translation>Establecer el marcador de fin [CTRL+Av Pág]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Buscar el fotograma en negro anterior</translation>
     </message>
@@ -787,12 +789,22 @@
         <translation>Vol&amp;umen</translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation>Selección: 000000</translation>
     </message>
@@ -904,6 +916,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>Medidor de &amp;audio</translation>
     </message>
@@ -1071,7 +1093,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Decodificar vídeos usando DXVA2 (windows)</translation>
     </message>
@@ -1091,7 +1113,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>Permitir frecuencias de _audio no estándar para DVD</translation>
     </message>
@@ -1166,7 +1188,27 @@
         <translation>Habilitar SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>Subprocesos de _lavc:</translation>
     </message>
@@ -1208,7 +1250,7 @@
         <translation>Baja</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>Prioridad d_e codificación:</translation>
     </message>
@@ -1233,7 +1275,12 @@
         <translation>Usar por _defecto el diretorio del último archivo leído para guardar</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1248,22 +1295,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation>XVideo (mejor)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
-        <translation></translation>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation>SDL (bueno)</translation>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="vanished">XVideo (mejor)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="vanished">SDL (bueno)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>Presentación _del vídeo:</translation>
     </message>
@@ -1336,7 +1432,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
         <source>_Horizontal deblocking</source>
         <translation>Eliminar bloques en _horizontal</translation>
     </message>
@@ -1362,17 +1458,17 @@
         <translation>Inten_sidad:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Posprocesamiento por defecto</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Interfaz de usuario</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
@@ -1387,13 +1483,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1401,7 +1497,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,18 +1507,17 @@
         <translation>Subprocesos</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>Pr&amp;eferencias</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -1540,6 +1635,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>Reiniciar los marcadores</translation>
     </message>
@@ -1560,6 +1665,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtros</translation>
@@ -1626,6 +1736,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Fotograma en negro anterior</translation>
     </message>
@@ -1660,6 +1780,46 @@
         <translation>Ir a la posición</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Zum 1:4</translation>
@@ -1767,7 +1927,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation>Modo de _ganancia:</translation>
     </message>
@@ -1788,8 +1948,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Remezcla:</translation>
+        <source>Remix</source>
+        <translation>Remezcla</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1802,7 +1962,7 @@
         <translation>Valor del desplazamiento (ms):</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>Filtros de audio</translation>
     </message>
@@ -1818,11 +1978,13 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1867,19 +2029,17 @@
         <translation>Guardar tarea</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-295"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+183"/>
         <source>Enable openGl support</source>
         <translation>Activar el soporte para openGL</translation>
     </message>
     <message>
-        <location line="+85"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (mejor)</translation>
+        <translation type="vanished">VDPAU (mejor)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (mejor)</translation>
+        <translation type="vanished">OpenGL (mejor)</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
@@ -1940,17 +2100,17 @@
 Se necesita para crear vídeos compatibles con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+188"/>
+        <location filename="../../common/gui_main.cpp" line="+189"/>
         <source>Select script to save</source>
         <translation>Seleccionar script a guardar</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+181"/>
         <source>Not coded in this version</source>
         <translation>Sin codificar en esta versión</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1969,7 +2129,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>
@@ -2038,7 +2198,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Error de permisos</translation>
     </message>
@@ -2090,12 +2250,12 @@
         <translation>Algo ha fallado al anexar</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Algo malo ha sucedido (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2103,7 +2263,7 @@
 Espere problemas.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Comprobando el vídeo</translation>
     </message>
@@ -2138,7 +2298,7 @@
         <translation>Algo malo ha sucedido</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>Pis_ta del vídeo:</translation>
     </message>
@@ -2272,8 +2432,8 @@
         <translation>Guardadas %d imágenes.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2482,12 +2642,12 @@
         <translation>Configuración de Xvid4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation>Ganancia</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Guardando</translation>
     </message>
@@ -2497,7 +2657,7 @@
         <translation>El vídeo guardado está incompleto. El error ha ocurrido en %s (%d%). Puede haber sucedido como resultado de marcas de tiempo inválidas en el vídeo.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-8"/>
         <source>DRC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2512,7 +2672,7 @@
         <translation>Manual (dB)</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Mixer</source>
         <translation>Mezclador</translation>
     </message>
@@ -2523,6 +2683,7 @@
     </message>
     <message>
         <location line="+4"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2597,7 +2758,7 @@
         <translation>Información de complementos</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Decodificar vídeos usando VDPAU (NVIDIA)</translation>
     </message>
@@ -2617,12 +2778,12 @@
         <translation>Si utiliza la decodificación hardware, es mejor utilizar el controlador de pantalla correspondiente</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation>_Comprobar si hay versiones nuevas</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2632,12 +2793,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (mejor)</translation>
+        <translation type="vanished">LIBVA (mejor)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation>Controlador Sdl</translation>
@@ -2648,7 +2808,7 @@
         <translation>Dispositivo de _audio</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+7"/>
         <source>System language</source>
         <translation>Idioma del sistema</translation>
     </message>
@@ -2658,7 +2818,17 @@
         <translation>Idioma</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Limitar la tasa de refresco</translation>
     </message>
@@ -2668,24 +2838,27 @@
         <translation>Tasa de refresco máxima (ms)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>Opciones de presentación de la interfaz gráfica de usuario</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Presentación</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>Aceleración hardware</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation>Pregunt_ar siempre por el puerto a usar</translation>
     </message>
@@ -2695,13 +2868,13 @@
         <translation>Puerto a usar por defecto</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-80"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Guardar la configuación actual como predefinida</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Plugins</source>
         <translation>Complementos</translation>
     </message>
@@ -2711,8 +2884,8 @@
         <translation>Reproducir/Detener</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>No puede eliminar *todo* el vídeo
@@ -2750,7 +2923,7 @@
         <translation>No se puede seleccionar el códec MPEG-4 SP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>Seleccionar script/proyecto a ejecutar</translation>
     </message>
@@ -2770,8 +2943,8 @@
         <translation>Está a punto de vaciar la lista de archivos y proyectos recientes. Esto no se puede deshacer. ¿Procecer?</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Seleccionar archivo de vídeo...</translation>
     </message>
@@ -2791,7 +2964,7 @@
         <translation>Seleccionar archivo de vídeo a anexar...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2800,7 +2973,7 @@
 ¿Proceder de todas formas?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Cortando</translation>
@@ -2811,7 +2984,7 @@
         <translation>Error al cortar.</translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Se ha dado un índice de audio no válido</translation>
@@ -2842,7 +3015,7 @@
         <translation>No es posible establecer el idioma para la pista del índice dado: ¡índice de pista no válido!</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation>Huy</translation>
     </message>
@@ -2852,7 +3025,7 @@
         <translation>Esta función esta deshabilitada o ya no es válida</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Problemas al inicializar el dispositivo de audio</translation>
     </message>
@@ -2955,14 +3128,14 @@
         <translation>No se puede añadir la tarea %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>¿Quiere reutilizar los datos de la anterior primera pasada?
 Aviso: la configuración debe ser parecida.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation>No se puede instanciar la cadena de vídeo</translation>
     </message>
@@ -2990,20 +3163,20 @@
 ¿Quiere continuar de todas formas?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Multiplexor</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>No se puede instanciar el multiplexor</translation>
     </message>
@@ -3031,17 +3204,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>No se puede abrir </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Autodetectar</translation>
     </message>
@@ -3164,6 +3339,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3243,6 +3423,11 @@
         <translation>PCM de 8 bits</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>Códec desconocido</translation>
@@ -3371,7 +3556,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3420,6 +3605,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation>El script &quot;%&quot; no existe.</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3448,6 +3682,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3494,6 +3785,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3600,6 +4033,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3631,9 +4172,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3651,35 +4218,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3790,12 +4362,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-134"/>
+        <location line="-116"/>
         <source>ASharp</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3841,12 +4408,12 @@
         <translation>_Margen inferior:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3866,12 +4433,12 @@
         <translation>¿Está seguro de que es un archivo ASS/SSA?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3951,6 +4518,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Formato de multiplexado</translation>
     </message>
@@ -4103,7 +4690,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Oscurecer los bordes</translation>
     </message>
@@ -4159,17 +4746,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>Fotograma en negro</translation>
+        <translation type="vanished">Fotograma en negro</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Esta función no está soportada por el momento</translation>
+        <translation type="vanished">Esta función no está soportada por el momento</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Buscando fotograma en negro..</translation>
     </message>
@@ -4198,6 +4784,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4210,7 +4862,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+188"/>
         <source>Source Fps:</source>
         <translation>FPS de origen:</translation>
     </message>
@@ -4240,7 +4892,7 @@
         <translation>FPS no válido</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-211"/>
         <source>25  (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4270,7 +4922,7 @@
         <translation>Acelerar/enlentecer el vídeo como si se alterasen los FPS. Este filtro cambia la duración del vídeo.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+174"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -4307,6 +4959,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4469,14 +5181,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Contraste</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Brillo</translation>
     </message>
@@ -4520,12 +5232,11 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Process</source>
-        <translation>Procesar</translation>
+        <translation type="vanished">Procesar</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4578,7 +5289,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Recortar</translation>
     </message>
@@ -4588,7 +5299,7 @@
         <translation>Filtro de recorte</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>¡Aviso, está recortando demasiada anchura! ¡Anchura restablecida!
@@ -4602,12 +5313,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Tamaño: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4627,25 +5339,25 @@
     </message>
     <message>
         <location line="-50"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Derecha:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Arriba:</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Abajo:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Izquierda:</translation>
     </message>
@@ -4655,17 +5367,17 @@
         <translation>Recorte automático</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Tamaño: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>Ocultar el borde de selección</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4711,7 +5423,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4730,6 +5442,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+57"/>
@@ -4821,6 +5569,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4905,6 +5769,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4920,25 +5797,35 @@
         <translation>Codificando...</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+247"/>
+        <location line="+24"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation>Códec de audio:</translation>
     </message>
@@ -5012,17 +5899,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation>Apagar el ordenador al terminar</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation>Tiempo restante:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
@@ -5052,27 +5939,27 @@
         <translation>Baja</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation>Pausar / Cancelar</translation>
     </message>
     <message>
-        <location line="-147"/>
+        <location line="-203"/>
         <source>Phase:</source>
         <translation>Fase:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation>Códec de vídeo:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-339"/>
         <source>Main</source>
         <translation>Principal</translation>
     </message>
     <message>
-        <location line="+199"/>
+        <location line="+231"/>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
@@ -5095,7 +5982,7 @@
         <translation>Ajustar contraste, brillo, saturación y gamma.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Reiniciar</translation>
     </message>
@@ -5114,17 +6001,17 @@
         <translation>Brillo</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>Saturación</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+122"/>
         <source>Blue</source>
         <translation>Azul</translation>
     </message>
@@ -5148,11 +6035,6 @@
         <source>Green</source>
         <translation>Verde</translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5173,9 +6055,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Fundido</translation>
@@ -5421,7 +6792,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+252"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+265"/>
         <source>Wide (16:9)</source>
         <translation>Ancho (16:9)</translation>
     </message>
@@ -5457,7 +6828,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dos subprocesos</translation>
     </message>
     <message>
@@ -5624,7 +6995,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5655,7 +7026,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dos subprocesos</translation>
     </message>
     <message>
@@ -6137,7 +7508,7 @@
         <translation>[Incongruencia]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Guardando mpeg PS (ff)</translation>
     </message>
@@ -6198,12 +7569,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Libre</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Formato de multiplexado</translation>
     </message>
@@ -6242,7 +7613,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Guardando mpeg TS (ff)</translation>
     </message>
@@ -6263,9 +7634,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6359,6 +7793,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6873,21 +8479,16 @@
         <source>Saturation</source>
         <translation>Saturación</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+117"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+115"/>
         <source>HuffYUV Configuration</source>
         <translation>Configuración de HuffYUV</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-7"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6897,7 +8498,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
@@ -6916,6 +8517,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6968,8 +8645,8 @@
         <translation>Elimina_r duplicado:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>Completo</translation>
     </message>
@@ -6986,8 +8663,8 @@
         <translation>Muy rápido</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>Cambiar el número de _FPS:</translation>
     </message>
@@ -7163,17 +8840,22 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation>_Cuantizador:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+1"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Mjpeg Configuration</source>
         <translation>Configuración de Mjpeg</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="-9"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7183,9 +8865,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>_ColorSpace:</source>
-        <translation>Espacio de _color:</translation>
+        <translation type="vanished">Espacio de _color:</translation>
     </message>
 </context>
 <context>
@@ -7335,7 +9016,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>Tasa de _bits:</translation>
     </message>
@@ -7509,6 +9190,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7535,6 +9272,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Entrelazado</translation>
     </message>
@@ -7602,12 +9344,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Imágenes Matroska</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Clústeres Matroska</translation>
     </message>
@@ -7713,7 +9455,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8089,12 +9831,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Ha habido un problema leyendo las cabeceras SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8102,7 +9845,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>No soportado</translation>
     </message>
@@ -8137,7 +9880,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Guardando mp4</translation>
     </message>
@@ -8152,6 +9895,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Formato de multiplexado</translation>
@@ -8282,7 +10030,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -8307,7 +10055,12 @@
         <translation>El vídeo no tiene suficiente información de temporizadión. ¿Está copiando de un AVI?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation>No se puede renombrar el archivo (optimizar)</translation>
     </message>
@@ -8393,7 +10146,7 @@
         <translation>Vista previa. Haga clic en la imagen de arriba para definir las coordenadas de la caja de forma aproximada</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Puede redimensionar el rectángulo rojo usando las asas </translation>
     </message>
@@ -8424,22 +10177,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Máscara</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Intensidad</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Umbral</translation>
     </message>
@@ -8449,7 +10197,7 @@
         <translation>Calidad alta</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8457,22 +10205,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>No se puede ir al fotograma siguiente</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>No se puede ir al fotograma anterior</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8581,9 +10329,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Cabecera mal formada</translation>
     </message>
@@ -8596,7 +10344,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8669,18 +10417,35 @@
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>FPS:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Duración total:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>Relación de aspecto:</translation>
     </message>
@@ -8695,7 +10460,27 @@
         <translation>Códec 4CC:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -8725,31 +10510,23 @@
         <translation>Códec:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Etiqueta de texto</translation>
+        <translation type="vanished">Etiqueta de texto</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Extra Video Properties</source>
-        <translation>Propiedades extra del vídeo</translation>
+        <translation type="vanished">Propiedades extra del vídeo</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Tamaño extra de datos:</translation>
+        <translation type="vanished">Tamaño extra de datos:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Datos extra:</translation>
+        <translation type="vanished">Datos extra:</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
         <translation>Copiar al portapapeles</translation>
     </message>
@@ -8781,7 +10558,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Seleccionar archivo de audio</translation>
     </message>
@@ -8802,7 +10579,7 @@
         <translation>Algunas pistas se usan varias veces</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Pista </translation>
     </message>
@@ -8817,7 +10594,7 @@
         <translation>Archivo </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>.... Añadir pista de audio</translation>
     </message>
@@ -8842,22 +10619,26 @@
         <translation>Se necesitan privilegios de administrador para llevar a cabo esta operación.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Primera pasada</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pass 1</source>
-        <translation>Pasada 1</translation>
+        <translation type="vanished">Pasada 1</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Codificando...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>La codificación está detenida. ¿Quiere continuar o cancelarla?</translation>
     </message>
@@ -8895,12 +10676,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Nueva versión disponible&lt;/b&gt;&lt;br&gt; Versión %1&lt;br&gt;Publicada el %2.&lt;br&gt;Puede descargarla aquí&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Puede deshabilitar las actualizaciones automáticas en Preferencias.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Archivos recientes</translation>
     </message>
@@ -8910,12 +10691,17 @@
         <translation>Proyectos recientes</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Reproducir/Detener</translation>
     </message>
@@ -8950,6 +10736,16 @@
         <translation>Establecer el marcador de fin</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Ir al primer fotograma</translation>
@@ -8980,24 +10776,34 @@
         <translation>Avanzar un minuto</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>La aplicación ha encontrado un problema fatal.
 Se ha guardado la edición actual y se volverá a cargar en el siguiente inicio</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -9054,7 +10860,7 @@
         <translation> Referencia</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9154,28 +10960,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Parcial</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Este filtro no puede ser parcial</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
@@ -9185,22 +10992,63 @@
         <translation>Subir</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Bajar</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Hacer parcial</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>Cargar filtros de vídeo..</translation>
     </message>
@@ -9218,7 +11066,7 @@
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>Continua_r</translation>
     </message>
@@ -9245,8 +11093,23 @@
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9265,94 +11128,79 @@
         <translation>Estéreo</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Video</source>
-        <translation>Vídeo</translation>
+        <translation type="vanished">Vídeo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>Códec 4CC:	</translation>
+        <translation type="vanished">Códec 4CC:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Tamaño de la imagen:	</translation>
+        <translation type="vanished">Tamaño de la imagen:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>Relación de aspecto:	</translation>
+        <translation type="vanished">Relación de aspecto:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>FPS:	</translation>
+        <translation type="vanished">FPS:	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Duración total:	</translation>
+        <translation type="vanished">Duración total:	</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Propiedades extra del vídeo</translation>
+        <translation type="vanished">Propiedades extra del vídeo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>Tamaño extra de datos:	</translation>
+        <translation type="vanished">Tamaño extra de datos:	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>Datos extra:	</translation>
+        <translation type="vanished">Datos extra:	</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="vanished">Audio</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>Códec:		</translation>
+        <translation type="vanished">Códec:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Canales:	</translation>
+        <translation type="vanished">Canales:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>Tasa de bits:	</translation>
+        <translation type="vanished">Tasa de bits:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Frecuencia:	</translation>
+        <translation type="vanished">Frecuencia:	</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation>No hay audio</translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9430,6 +11278,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9450,7 +11355,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9511,7 +11416,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Modo:</translation>
     </message>
@@ -9521,12 +11426,12 @@
         <translation>_Nuevos FPS:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>Cambiar los FPS</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
@@ -9536,7 +11441,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>Remuestrear los FPS</translation>
     </message>
@@ -9546,7 +11451,27 @@
         <translation>Cambiar y forzar los FPS. Mantener duración y sincronismo.</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-400"/>
         <source>25  (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9569,12 +11494,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+83"/>
         <source>swScale Resizer.</source>
         <translation>Redimensionador swScale.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Anchura y altura no pueden tener valor impar</translation>
     </message>
@@ -9602,7 +11527,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation>Bilineal</translation>
     </message>
@@ -9612,7 +11537,7 @@
         <translation>Bicúbico</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation>Relación de aspecto</translation>
     </message>
@@ -9697,7 +11622,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Método de redimensionado:</translation>
     </message>
@@ -9711,22 +11646,27 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Rotar</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>Rotar la imagen 90/180/270 grados.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
@@ -9736,6 +11676,11 @@
         <translation>90 grados</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 grados</translation>
@@ -9746,35 +11691,35 @@
         <translation>270 grados</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>_Ángulo:</translation>
     </message>
+</context>
+<context>
+    <name>seekablePreviewDialog</name>
     <message>
-        <location line="-4"/>
-        <source>90°</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
+        <source>Preview</source>
+        <translation>Previsualizar</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>180°</source>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>270°</source>
+        <source>Show unprocessed input</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>seekablePreviewDialog</name>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/seekablePreview.ui" line="+20"/>
-        <source>Preview</source>
-        <translation>Previsualizar</translation>
-    </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>Retroceder un minuto</translation>
     </message>
@@ -9860,17 +11805,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Imagen fija</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Duplicar los fotogramas por una duración dada.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>_Comienzo:</translation>
     </message>
@@ -10049,7 +11994,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10067,7 +12012,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10086,7 +12031,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Hay varios archivos con nombres de archivo secuenciales. ¿Debería cargarlos todos?</translation>
@@ -10655,6 +12600,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10711,7 +12738,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>No implementado</translation>
     </message>
@@ -10723,17 +12750,27 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>ninguno</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Tasa de bits objetivo:</translation>
     </message>
@@ -10769,7 +12806,7 @@
         <translation>Tasa de bits media:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12092,7 +14129,7 @@
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Tasa de bits objetivo:</translation>
     </message>
@@ -12209,7 +14246,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>Configuración de x265</translation>
     </message>
     <message>
@@ -13300,7 +15337,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dos subprocesos</translation>
     </message>
     <message>
@@ -13538,4 +15575,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Ezin da desmultiplexatzailea aurkitu %s-rako</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>%s irekitze saiatze hutsegitea!</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -67,17 +67,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+125"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -101,7 +101,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-244"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -499,7 +499,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
@@ -554,6 +554,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -563,7 +565,17 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-542"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+201"/>
         <source>Time:</source>
         <translation>Denbora:</translation>
     </message>
@@ -599,7 +611,7 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="-1400"/>
+        <location line="-1449"/>
         <source>Vi&amp;deo</source>
         <translation>&amp;Bideoa</translation>
     </message>
@@ -609,7 +621,7 @@
         <translation>&amp;Tresnabarrak</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Berez</translation>
     </message>
@@ -619,7 +631,7 @@
         <translation>A&amp;udioa</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-42"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editatu</translation>
     </message>
@@ -629,7 +641,7 @@
         <translation>&amp;Ikusi</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation>&amp;Norbererara</translation>
     </message>
@@ -644,12 +656,12 @@
         <translation>&amp;Agiria</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-57"/>
         <source>&amp;Help</source>
         <translation>&amp;Laguntza</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Tools</source>
         <translation>&amp;Tresnak</translation>
     </message>
@@ -664,7 +676,7 @@
         <translation>&lt;b&gt;Irteera Heuskarria&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+617"/>
+        <location line="+665"/>
         <source>Frame type:</source>
         <translation>Frame mota:</translation>
     </message>
@@ -749,8 +761,8 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-976"/>
-        <location line="+987"/>
+        <location line="-1024"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nabigazioa</translation>
     </message>
@@ -781,6 +793,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>A&amp;udio Neurgailua</translation>
     </message>
@@ -805,7 +827,7 @@
         <translation>&amp;Bananduta</translation>
     </message>
     <message>
-        <location line="-1724"/>
+        <location line="-1786"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -860,7 +882,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1116,7 +1138,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+396"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+445"/>
         <source>Stereo</source>
         <translation>Estereoa</translation>
     </message>
@@ -1176,7 +1198,7 @@
         <translation>Eskuzkoa (dB)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
         <translation type="unfinished">Irabazia</translation>
     </message>
@@ -1202,8 +1224,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Bernahastu:</translation>
+        <source>Remix</source>
+        <translation>Bernahastu</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1216,7 +1238,7 @@
         <translation>Aldatu Balioa (sm):</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>Audio Iragazkiak</translation>
     </message>
@@ -1237,16 +1259,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1267,7 +1292,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1313,7 +1338,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1322,7 +1347,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Audioa</translation>
     </message>
@@ -1403,7 +1428,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Horizontal deblocking</source>
         <translation>_Desblokeaketa etzana</translation>
     </message>
@@ -1424,7 +1449,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-184"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1444,12 +1469,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-46"/>
         <source>Enable openGl support</source>
         <translation>Gaitu openGl sostengua</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-304"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Onartu audio maiztasun ez-estandarra DVD-rako</translation>
     </message>
@@ -1524,7 +1549,27 @@
         <translation>Gaitu SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>_lavc hariak:</translation>
     </message>
@@ -1566,7 +1611,7 @@
         <translation>Apala</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>_Kodeaketa lehentasuna:</translation>
     </message>
@@ -1591,7 +1636,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1606,7 +1656,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1616,32 +1696,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>XVideo (best)</source>
-        <translation>XVideo (hoberena)</translation>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>VDPAU (best)</source>
-        <translation>VDPAU (hoberena)</translation>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>DXVA2 (best)</source>
+        <location line="+8"/>
+        <source>DXVA2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="vanished">XVideo (hoberena)</translation>
+    </message>
+    <message>
+        <source>VDPAU (best)</source>
+        <translation type="vanished">VDPAU (hoberena)</translation>
+    </message>
+    <message>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (hoberena)</translation>
+        <translation type="vanished">OpenGL (hoberena)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>SDL (good)</source>
-        <translation>SDL (ona)</translation>
+        <translation type="vanished">SDL (ona)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>Bideo _erakuspena:</translation>
     </message>
@@ -1707,7 +1804,7 @@
         <translation>_AudioGailua</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation>_Deshosketa</translation>
     </message>
@@ -1717,36 +1814,40 @@
         <translation>_Indartsua:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Berezko prozesatze-ondorengoa</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Erabiltzaile Interfazea</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Output</source>
         <translation>Irteera</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
         <translation>Bideoa</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+56"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
         <source>Threading</source>
         <translation>Hariak</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+3"/>
+        <location line="+18"/>
         <source>Preferences</source>
         <translation>Hobespenak</translation>
     </message>
@@ -1869,6 +1970,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1889,6 +2000,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Iragazkiak</translation>
@@ -1965,6 +2081,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Aurreko Frame Beltza</translation>
     </message>
@@ -1999,6 +2125,46 @@
         <translation>Joan Denborara</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2082,17 +2248,17 @@
 Hau beharrezkoa da PSP bateragarri bideoa sortzeko.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+188"/>
+        <location filename="../../common/gui_main.cpp" line="+189"/>
         <source>Select script to save</source>
         <translation>Hautatu gordetzeko eskripta</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+181"/>
         <source>Not coded in this version</source>
         <translation>Kodeatu gabe bertsio honetan</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2111,7 +2277,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Zihur zaude?</translation>
     </message>
@@ -2176,7 +2342,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Baimen akatsa</translation>
     </message>
@@ -2228,19 +2394,19 @@
         <translation>Zerbaitek huts egin du eransterakoan</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Zerbait gaitza gertatu da (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Bideoa aztertzen</translation>
     </message>
@@ -2275,7 +2441,7 @@
         <translation>Zerbait gaitza gertatu da</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>_Bidea bideotik:</translation>
     </message>
@@ -2394,8 +2560,8 @@
         <translation>%d irudi gordeta.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2674,7 +2840,7 @@
         <translation>Xvid4 Itxurapena</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished">Gordetzen</translation>
     </message>
@@ -2684,12 +2850,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-8"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-9"/>
         <source>Mixer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-51"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2709,23 +2875,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+154"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+48"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2735,7 +2896,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+62"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2745,24 +2911,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2772,7 +2941,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-71"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-83"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2783,8 +2952,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2818,7 +2987,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2838,8 +3007,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2859,14 +3028,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2877,7 +3046,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2908,7 +3077,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Ustekabea</translation>
     </message>
@@ -2918,7 +3087,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Arazoak audio gailua abiarazterakoan</translation>
     </message>
@@ -3015,13 +3184,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3043,20 +3212,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3084,17 +3253,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation type="unfinished">Ezgaituta</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Berez-atzeman</translation>
     </message>
@@ -3145,6 +3316,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3224,6 +3400,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3346,7 +3527,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3394,6 +3575,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3422,6 +3652,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3468,6 +3755,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3574,6 +4003,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3605,9 +4142,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3625,35 +4188,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3749,12 +4317,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3810,12 +4373,12 @@
         <translation type="unfinished">Behe_ko bazterra:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3835,12 +4398,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3918,6 +4481,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4070,7 +4653,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished">Hertz Beltzenak</translation>
     </message>
@@ -4126,17 +4709,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4165,6 +4739,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4192,7 +4832,7 @@
         <translation>50 (Pal)</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+189"/>
         <source>Source Fps:</source>
         <translation>Iturburu Fs-ko:</translation>
     </message>
@@ -4217,7 +4857,7 @@
         <translation>Aldatu fs-ko</translation>
     </message>
     <message>
-        <location line="-161"/>
+        <location line="-170"/>
         <source>Change FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4232,7 +4872,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+174"/>
         <source>Error</source>
         <translation type="unfinished">Akatsa</translation>
     </message>
@@ -4274,6 +4914,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4431,8 +5131,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished">Zuribeltztasuna</translation>
     </message>
@@ -4442,8 +5142,8 @@
         <translation>Zehaztu zuribeltztasuna, dizdira eta margoak.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4482,12 +5182,7 @@
         <translation type="unfinished">V Margotasuna</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4545,7 +5240,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +5250,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4567,12 +5262,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4587,13 +5283,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished">Eskuin:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished">Goi:</translation>
     </message>
@@ -4604,13 +5300,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished">Behe:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished">Ezker:</translation>
     </message>
@@ -4620,17 +5316,17 @@
         <translation type="unfinished">Berez Moztu</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4676,7 +5372,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4695,6 +5391,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4786,6 +5518,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4870,6 +5718,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4885,25 +5746,25 @@
         <translation>Kodeatzen...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Aldia:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation>Bideo Kodeka:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Ezer ez</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Ezezaguna</translation>
     </message>
@@ -4935,12 +5796,12 @@
         <translation type="unfinished">Igarota:</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-505"/>
         <source>Time Remaining:</source>
         <translation type="unfinished">Gelditzen dena:</translation>
     </message>
     <message>
-        <location line="+528"/>
+        <location line="+529"/>
         <source>Frames/sec:</source>
         <translation type="unfinished">Frame/seg:</translation>
     </message>
@@ -4987,17 +5848,17 @@
         <translation type="unfinished">Kuantizatzailea:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation>Itzali ordenagailua amaitutakoan</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-50"/>
         <source>Main</source>
         <translation type="unfinished">Nagusia</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+70"/>
         <source>Priority:</source>
         <translation>Lehentasuna:</translation>
     </message>
@@ -5032,7 +5893,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5060,7 +5931,7 @@
         <translation>Zehaztu zuribeltztasuna, dizdira, margoasetasuna eta gamma.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,7 +5939,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+267"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+260"/>
         <source>Green</source>
         <translation type="unfinished">Orlegia</translation>
     </message>
@@ -5093,18 +5964,18 @@
         <translation type="unfinished">Hasiera</translation>
     </message>
     <message>
-        <location line="-246"/>
+        <location line="-239"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation type="unfinished">Zuribeltztasuna</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished">Margoasetasuna</translation>
     </message>
@@ -5113,11 +5984,6 @@
         <source>Brightness</source>
         <translation type="unfinished">Dizdira</translation>
     </message>
-    <message>
-        <location line="+40"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5138,9 +6004,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5386,7 +6741,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation>Arrunta (4:3)</translation>
     </message>
@@ -5437,8 +6792,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>Bi hari)</translation>
+        <source>Two threads</source>
+        <translation>Bi hari</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5589,7 +6944,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5620,8 +6975,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>Bi hari)</translation>
+        <source>Two threads</source>
+        <translation>Bi hari</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6094,7 +7449,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">mpeg PS (ff) gordetzea</translation>
     </message>
@@ -6147,12 +7502,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6190,7 +7545,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">mpeg TS (ff) gordetzea</translation>
     </message>
@@ -6211,9 +7566,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6305,6 +7723,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6818,16 +8408,11 @@
         <source>Saturation</source>
         <translation type="unfinished">Margoasetasuna</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6837,7 +8422,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Mota:</translation>
     </message>
@@ -6861,6 +8446,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6913,8 +8574,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Osoa</translation>
     </message>
@@ -6931,8 +8592,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">_Frame neurri aldaketa:</translation>
     </message>
@@ -7108,7 +8769,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7118,14 +8779,18 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation>_Kuantizatzailea:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>_MargoEremua:</translation>
+        <translation type="vanished">_MargoEremua:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7280,7 +8945,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Bitneurria:</translation>
     </message>
@@ -7446,6 +9111,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7466,17 +9187,22 @@
         <translation>Bideo Iragazki Kudeatzailea</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Eragindako Iragazkiak&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-122"/>
+        <location line="-131"/>
         <source>Transform</source>
         <translation>Eraldatu</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Elkarlotzen</translation>
     </message>
@@ -7539,12 +9265,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7650,7 +9376,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8014,12 +9740,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Arazoak SVQ3 idazburuak irakurtzean</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8027,7 +9754,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">Ez-sostengatua</translation>
     </message>
@@ -8062,7 +9789,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished">mp4 gordetzea</translation>
     </message>
@@ -8077,6 +9804,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8207,7 +9939,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">Audioa</translation>
     </message>
@@ -8232,7 +9964,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8317,7 +10054,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8348,22 +10085,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8373,7 +10105,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8381,22 +10113,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Akatsa</translation>
     </message>
@@ -8505,9 +10237,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Idazburu gaizkieratua</translation>
     </message>
@@ -8520,7 +10252,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8589,27 +10321,22 @@
         <translation>Bideoa</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Idazki Etiketa</translation>
+        <translation type="vanished">Idazki Etiketa</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Frame Neurria:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Iraupena Guztira:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-163"/>
         <source>Aspect Ratio:</source>
         <translation>Ikuspegi Maila:</translation>
     </message>
@@ -8624,22 +10351,19 @@
         <translation>4 CC Kodeka:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>Estra Bideo Ezaugarriak</translation>
+        <translation type="vanished">Estra Bideo Ezaugarriak</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>GainDatuNeurria:</translation>
+        <translation type="vanished">GainDatuNeurria:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Gain datuak :</translation>
+        <translation type="vanished">Gain datuak :</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+217"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8654,7 +10378,44 @@
         <translation>Audioa</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-139"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Frequency:</source>
         <translation>Maiztasuna:</translation>
     </message>
@@ -8701,7 +10462,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8722,7 +10483,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8737,7 +10498,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8762,22 +10523,22 @@
         <translation type="unfinished">Erro eskubideak beharrezkoak dira eragiketa hau burutzeko.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">Kodeaketa pausatuta dago. Berrekitea edo uztea nahi duzu?</translation>
     </message>
@@ -8815,12 +10576,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished">Azken Agiriak</translation>
     </message>
@@ -8830,12 +10591,17 @@
         <translation type="unfinished">Azken Egitasmoak</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8870,6 +10636,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8900,23 +10676,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8973,7 +10759,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9073,28 +10859,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished">Gehitu</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished">Kendu</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Itxuratu</translation>
     </message>
@@ -9104,22 +10891,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9137,7 +10965,7 @@
         <translation type="unfinished">Ezezaguna</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9165,108 +10993,52 @@
         <translation>Bai</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fs-ko</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
-        <translation>%02d:%02d:%02d.%03d</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation>Monoa</translation>
     </message>
@@ -9346,6 +11118,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9366,7 +11195,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9427,7 +11256,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
         <translation>Egilea</translation>
     </message>
@@ -9452,7 +11281,22 @@
         <translation>50 (Pal)</translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+387"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation>_Modua:</translation>
     </message>
@@ -9462,22 +11306,27 @@
         <translation>_Frame neurri berria:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Resample fps</source>
         <translation>Birlaginketa fs-ko</translation>
     </message>
     <message>
-        <location line="-289"/>
+        <location line="-366"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="-36"/>
         <source>59.94  (NTSC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+37"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9485,12 +11334,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Zabalera eta garaiera ezin dira eta piku izan</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9614,7 +11463,17 @@
         <translation type="unfinished">0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished">Birneurriratze Metodoa:</translation>
     </message>
@@ -9638,12 +11497,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">Itzulikatu</translation>
     </message>
@@ -9659,18 +11523,26 @@
     </message>
     <message>
         <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 gradu</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9678,9 +11550,8 @@
         <translation type="unfinished">270 gradu</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9688,7 +11559,7 @@
         <translation type="unfinished">_Angelua:</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-158"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9701,7 +11572,17 @@
         <translation>Aurreikuspena</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9787,17 +11668,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9976,7 +11857,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,7 +11875,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10013,7 +11894,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10582,6 +12463,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10607,7 +12570,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10618,17 +12581,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Xede Bitneurria:</translation>
     </message>
@@ -10664,7 +12637,7 @@
         <translation type="unfinished">Bataz-besteko Bitneurria:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11985,7 +13958,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Xede Bitneurria:</translation>
     </message>
@@ -12101,7 +14074,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13318,8 +15291,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>Bi hari)</translation>
+        <source>Two threads</source>
+        <translation>Bi hari</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -13541,4 +15514,167 @@
         <translation type="unfinished">yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -4,17 +4,17 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+125"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -30,7 +30,7 @@
 Ignorer les informations de timing ?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Impossible de trouver un demuxer pour lire %s</translation>
     </message>
@@ -40,7 +40,7 @@
         <translation>l&apos;ouverture de %s a echouée !</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52,7 +52,7 @@
     <message>
         <location line="+1"/>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation> et </translation>
     </message>
     <message>
         <location line="+3"/>
@@ -62,12 +62,12 @@
     <message>
         <location line="+1"/>
         <source> are </source>
-        <translation type="unfinished"></translation>
+        <translation> sont </translation>
     </message>
     <message>
         <location line="+0"/>
         <source> is </source>
-        <translation type="unfinished"></translation>
+        <translation> est </translation>
     </message>
     <message>
         <location line="+2"/>
@@ -99,10 +99,10 @@
     <message>
         <location line="+4"/>
         <source>Unsupported size</source>
-        <translation type="unfinished"></translation>
+        <translation>Taille non supportée</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-244"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Vérification des informations de temps</translation>
     </message>
@@ -117,12 +117,12 @@
     <message>
         <location line="+143"/>
         <source>Track 1:</source>
-        <translation>Piste 1:</translation>
+        <translation>Piste 1 :</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Track 2:</source>
-        <translation>Piste 2:</translation>
+        <translation>Piste 2 :</translation>
     </message>
     <message>
         <location line="+330"/>
@@ -172,7 +172,7 @@
     <message>
         <location line="+7"/>
         <source>Duration:</source>
-        <translation></translation>
+        <translation>Durée :</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -202,7 +202,7 @@
     <message>
         <location line="+63"/>
         <source>Custom Size:</source>
-        <translation>Taille personnalisée:</translation>
+        <translation>Taille personnalisée :</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -210,12 +210,12 @@
         <location line="+27"/>
         <location line="+34"/>
         <source>MB</source>
-        <translation></translation>
+        <translation>Mo</translation>
     </message>
     <message>
         <location line="-217"/>
         <source>Audio Bitrate</source>
-        <translation></translation>
+        <translation>Débit audio</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -232,12 +232,12 @@
     <message>
         <location line="+28"/>
         <source>Audio Size:</source>
-        <translation>Taille audio:</translation>
+        <translation>Taille audio :</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Size:</source>
-        <translation>Taille de la vidéo:</translation>
+        <translation>Taille de la vidéo :</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -251,17 +251,17 @@
     <message>
         <location line="-101"/>
         <source>Total Size:</source>
-        <translation>Taille Totale:</translation>
+        <translation>Taille totale :</translation>
     </message>
     <message>
         <location line="+120"/>
         <source>Bits Per Pixel:</source>
-        <translation></translation>
+        <translation>Bit par pixel :</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Bitrate:</source>
-        <translation></translation>
+        <translation>Débit vidéo</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -279,7 +279,7 @@
     <message>
         <location line="+1"/>
         <source>Time Left : Infinity</source>
-        <translation>Temps Restant : Infini</translation>
+        <translation>Temps restant : infini</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -394,7 +394,7 @@
     <message>
         <location line="+7"/>
         <source>Nb Lines :</source>
-        <translation>Nb Lignes:</translation>
+        <translation>Nb lignes :</translation>
     </message>
 </context>
 <context>
@@ -417,7 +417,7 @@
     <message>
         <location line="+28"/>
         <source>ProcessImages</source>
-        <translation>Images Traitées</translation>
+        <translation>Images traitées</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -445,7 +445,7 @@
     <message>
         <location line="+13"/>
         <source>Current job</source>
-        <translation>Job en cours</translation>
+        <translation>Travail en cours</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -515,7 +515,7 @@
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&amp;Tools</source>
         <translation>Ou&amp;tils</translation>
     </message>
@@ -565,7 +565,17 @@
         <translation>&lt;b&gt;Format de sortie&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+795"/>
+        <location line="+371"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -599,13 +609,13 @@
     <message>
         <location line="+9"/>
         <source>Save &amp;Project</source>
-        <translation>Sauver un &amp;Projet</translation>
+        <translation>Sauver un &amp;projet</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Save Project</source>
-        <translation>Sauver un Projet</translation>
+        <translation>Sauver un projet</translation>
     </message>
     <message>
         <source>&amp;Calculator...</source>
@@ -627,7 +637,7 @@
         <translation>Options du co&amp;dec</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+85"/>
         <source>&amp;Separate</source>
         <translation>&amp;Séparer</translation>
     </message>
@@ -642,24 +652,24 @@
         <translation>Cot&amp;e à cote</translation>
     </message>
     <message>
-        <location line="-1850"/>
+        <location line="-1913"/>
         <source>Vi&amp;deo</source>
-        <translation></translation>
+        <translation>Vidéo</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>&amp;Toolbars</source>
-        <translation></translation>
+        <translation>Barre d&apos;outils</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Custom</source>
-        <translation>&amp;Scripts Perso</translation>
+        <translation>&amp;Scripts perso</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -684,7 +694,7 @@
     <message>
         <location line="+33"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Décodeur Vidéo&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Décodeur vidéo&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+75"/>
@@ -704,14 +714,14 @@
     </message>
     <message>
         <location line="+161"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
-        <translation>Lire [SPACE]</translation>
+        <translation>Lire [ESPACE]</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -728,6 +738,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -737,7 +749,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished">Image précédente [GAUCHE]</translation>
     </message>
@@ -767,7 +779,7 @@
         <translation>Mettre le marqueur B [CTRL+PAGE SUIVANTE]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Chercher l&apos;image noire précédente</translation>
     </message>
@@ -804,7 +816,7 @@
     <message>
         <location line="+58"/>
         <source>Time:</source>
-        <translation>Temps:</translation>
+        <translation>Temps :</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -819,7 +831,7 @@
     <message>
         <location line="+29"/>
         <source>Frame type:</source>
-        <translation>Type:</translation>
+        <translation>Type :</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -829,17 +841,17 @@
     <message>
         <location line="+50"/>
         <source>Se&amp;lection</source>
-        <translation></translation>
+        <translation>Sélection</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>A:</source>
-        <translation></translation>
+        <translation>A :</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>B:</source>
-        <translation></translation>
+        <translation>B :</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -870,7 +882,7 @@
     <message>
         <location line="+113"/>
         <source>Audio &amp;Metre</source>
-        <translation></translation>
+        <translation>Audio&amp;mètre</translation>
     </message>
     <message>
         <location line="+50"/>
@@ -895,7 +907,7 @@
     <message>
         <location line="+11"/>
         <source>&amp;Selection</source>
-        <translation></translation>
+        <translation>&amp;Sélection</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -914,8 +926,18 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
-        <translation></translation>
+        <translation>Audio&amp;mètre</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -928,7 +950,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+277"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Débit :</translation>
     </message>
 </context>
 <context>
@@ -936,7 +958,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
         <source>Shell</source>
-        <translation></translation>
+        <translation>Console</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -964,7 +986,7 @@
     <message>
         <location line="+11"/>
         <source>Port to use: </source>
-        <translation type="unfinished"></translation>
+        <translation>Port à utiliser :</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -987,7 +1009,7 @@
     <message>
         <location line="+112"/>
         <source>Multi-platform Video Editor</source>
-        <translation>Editeur vidéo multiplateformes</translation>
+        <translation>Editeur vidéo multiplateforme</translation>
     </message>
     <message>
         <location line="-19"/>
@@ -1007,7 +1029,7 @@
     <message>
         <location line="+45"/>
         <source>&amp;License</source>
-        <translation></translation>
+        <translation>&amp;Licence</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -1020,22 +1042,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
         <source>_Left border:</source>
-        <translation>Bord gauche:</translation>
+        <translation>Bord gauche :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Right border:</source>
-        <translation>Bord droit:</translation>
+        <translation>Bord droit :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Top border:</source>
-        <translation>Bord haut:</translation>
+        <translation>Bord haut :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Bottom border:</source>
-        <translation>Bord bas:</translation>
+        <translation>Bord bas :</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1062,7 +1084,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
     </message>
@@ -1082,14 +1104,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-46"/>
         <source>Enable openGl support</source>
         <translation>Activer OpenGL</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-304"/>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation>Accepter les fréquences non standard pour les DVDs</translation>
+        <translation>Accepter les fréquences non standard pour les DVD</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1109,7 +1131,7 @@
     <message>
         <location line="+1"/>
         <source>_Swap markers if marker A is set past marker B or marker B before A in video</source>
-        <translation type="unfinished"></translation>
+        <translation>_Inversion des marqueurs dans la vidéo si le marqueur A est après le marqueur B, ou inversement</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1157,9 +1179,29 @@
         <translation>Activer le SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
-        <translation>Threads lavc:</translation>
+        <translation>Threads lavc :</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1194,19 +1236,19 @@
         <translation>Basse</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
-        <translation>Priorité de l&apos;encodage:</translation>
+        <translation>Priorité de l&apos;encodage :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Indexing/unpacking priority:</source>
-        <translation>Priorité de l&apos;indexation:</translation>
+        <translation>Priorité de l&apos;indexation :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Playback priority:</source>
-        <translation>Priorité de la lecture:</translation>
+        <translation>Priorité de la lecture :</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1219,7 +1261,12 @@
         <translation>Utiliser le répertoire du dernier fichier lu comme répertoire de sauvegarde par défaut</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,37 +1278,67 @@
     <message>
         <location line="+1"/>
         <source>_Fragment size:</source>
+        <translation>_Taille du fragment :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>XVideo (best)</source>
-        <translation>Xvideo (rapide)</translation>
+        <translation type="vanished">Xvideo (rapide)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (très rapide)</translation>
+        <translation type="vanished">VDPAU (très rapide)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>DXVA2 (best)</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">DXVA2 (très rapide)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (rapide)</translation>
+        <translation type="vanished">OpenGL (rapide)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>SDL (good)</source>
-        <translation>SDL (moyen)</translation>
+        <translation type="vanished">SDL (moyen)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+25"/>
         <source>Video _display:</source>
-        <translation>Affichage vidéo:</translation>
+        <translation>Affichage vidéo :</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -1281,12 +1358,12 @@
     <message>
         <location line="+2"/>
         <source>_Message level:</source>
-        <translation>Afficher les messages:</translation>
+        <translation>Afficher les messages :</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>_Volume control:</source>
-        <translation>Contrôle du volume:</translation>
+        <translation>Contrôle du volume :</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1296,17 +1373,17 @@
     <message>
         <location line="+5"/>
         <source>_Local playback downmixing:</source>
-        <translation>Downmixing pour la lecture:</translation>
+        <translation>Downmixing pour la lecture :</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>_AudioDevice</source>
-        <translation>Périphérique Audio</translation>
+        <translation>Périphérique audio</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+27"/>
         <source>_Filter strength:</source>
-        <translation>Force du filtre:</translation>
+        <translation>Force du filtre :</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -1315,7 +1392,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
         <source>_Horizontal deblocking</source>
         <translation>Deblocking horizontal</translation>
     </message>
@@ -1333,20 +1410,20 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+2"/>
         <source>_Strength:</source>
-        <translation>Force:</translation>
+        <translation>Force :</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Postprocessing par défaut</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Interface Utilisateur</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Sortie</translation>
     </message>
@@ -1378,7 +1455,7 @@
     <message>
         <location line="+1"/>
         <source>Save as PNG</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauver comme PNG</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1388,7 +1465,7 @@
     <message>
         <location line="+1"/>
         <source>Save Selection as JPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauver la sélection comme JPEG</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1406,13 +1483,7 @@
         <translation>Quitter</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+2"/>
-        <source>Clear recent items</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Undo</source>
         <translation>Défaire</translation>
     </message>
@@ -1459,13 +1530,23 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished">Réinitialiser les marqueurs</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Load saved settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Charger les réglages sauvegardés</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1479,6 +1560,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtres</translation>
@@ -1486,7 +1572,7 @@
     <message>
         <location line="-8"/>
         <source>Play filtered</source>
-        <translation type="unfinished"></translation>
+        <translation>Jouer post filtrage</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1550,6 +1636,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Image noire précédente</translation>
     </message>
@@ -1584,6 +1680,46 @@
         <translation>Aller au temps</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -1606,12 +1742,12 @@
     <message>
         <location line="+2"/>
         <source>Fit to window</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajuster à la fenêtre</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
         <source>R_esampling (Hz):</source>
-        <translation>R_eéchantillonnage (Hz):</translation>
+        <translation>R_eéchantillonnage (Hz) :</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -1638,7 +1774,7 @@
     <message>
         <location line="+3"/>
         <source>_Frame rate change:</source>
-        <translation>Changement i/s</translation>
+        <translation>Changement fréquence (i/s)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1647,7 +1783,7 @@
     </message>
     <message>
         <location line="+2"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-77"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-66"/>
         <source>Stereo</source>
         <translation>Stéréo</translation>
     </message>
@@ -1659,17 +1795,17 @@
     <message>
         <location line="+1"/>
         <source>Stereo+center</source>
-        <translation>Stéréo+Centre</translation>
+        <translation>Stéréo + centre</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center+surround</source>
-        <translation>Stéréo+Centre+Surround</translation>
+        <translation>Stéréo + centre + surround</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo front+stereo rear</source>
-        <translation>Stéréo Avant+Stéréo Arrière</translation>
+        <translation>Stéréo avant + stéréo arrière</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1682,19 +1818,19 @@
         <translation>Manuel (dB)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Gain mode:</source>
-        <translation>Mode:</translation>
+        <translation>Mode :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>G_ain value:</source>
-        <translation>Valeur du gain:</translation>
+        <translation>Valeur du gain :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Maximum value:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Valeur maximum :</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -1703,23 +1839,23 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Remixer:</translation>
+        <source>Remix</source>
+        <translation>Remixer</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Shift audio:</source>
-        <translation>Décalage audio:</translation>
+        <translation>Décalage audio :</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Shift Value (ms):</source>
-        <translation>Valeur (ms):</translation>
+        <translation>Valeur (ms) :</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
-        <translation>Filtres Audio</translation>
+        <translation>Filtres audio</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
@@ -1760,17 +1896,17 @@
         <translation>Impossible de choisir le codec FLV1.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+188"/>
+        <location filename="../../common/gui_main.cpp" line="+189"/>
         <source>Select script to save</source>
         <translation>Choisir le script à sauvegarder</translation>
     </message>
     <message>
-        <location line="+489"/>
+        <location line="+515"/>
         <source>Are you sure?</source>
-        <translation>Etes vous sur ?</translation>
+        <translation>Etes-vous sur ?</translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+232"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>Impossible d&apos;ouvrir &quot;%s&quot;.</translation>
     </message>
@@ -1787,10 +1923,10 @@
     <message>
         <location line="+96"/>
         <source>Multiple Audio Tracks</source>
-        <translation>Plusieurs pistes audio</translation>
+        <translation>Plusieurs pistes audios</translation>
     </message>
     <message>
-        <location line="+419"/>
+        <location line="+418"/>
         <source>Something bad happened</source>
         <translation>Quelque chose d&apos;anormal c&apos;est produit</translation>
     </message>
@@ -1800,7 +1936,7 @@
         <translation>Manuel</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-44"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-46"/>
         <source>Mono</source>
         <translation></translation>
     </message>
@@ -1830,7 +1966,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Gain</source>
         <translation></translation>
     </message>
@@ -1856,16 +1992,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation></translation>
     </message>
@@ -1886,7 +2025,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation></translation>
     </message>
@@ -1903,7 +2042,7 @@
     <message>
         <location line="+3"/>
         <source>Go to Time</source>
-        <translation>Aller au temp</translation>
+        <translation>Aller au temps</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
@@ -1913,7 +2052,7 @@
     <message>
         <location line="+3"/>
         <source>Output _File:</source>
-        <translation>Fichier à écrire:</translation>
+        <translation>Fichier à écrire :</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -1932,7 +2071,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1941,7 +2080,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation></translation>
     </message>
@@ -1968,22 +2107,22 @@
     <message>
         <location line="+5"/>
         <source>Audio Device Plugins</source>
-        <translation>PLugin de périph. Audio</translation>
+        <translation>Plugin de périph. audio</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Device</source>
-        <translation>Périph. Audio</translation>
+        <translation>Périph. audio</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Audio Encoder Plugins</source>
-        <translation>Plugins d&apos;encodage Audio</translation>
+        <translation>Plugins d&apos;encodage audio</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Encoders</source>
-        <translation>Encodeurs audio</translation>
+        <translation>Encodeurs audios</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2016,7 +2155,7 @@
         <translation>Deringing</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-247"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+79"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Utiliser VDPAU pour décoder (NVIDIA)</translation>
     </message>
@@ -2036,9 +2175,9 @@
         <translation>Si vous activez le décodage HW, il est préférable d&apos;utiliser la même méthode d&apos;affichage</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
-        <translation>Vérifier si il y a de nouvelle version</translation>
+        <translation>Vérifier s&apos;il y a de nouvelle version</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2046,27 +2185,22 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+59"/>
         <source>Multi-threading</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+45"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Cache size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>LIBVA (best)</source>
-        <translation></translation>
+        <translation>_Taille du cache :</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation></translation>
@@ -2093,12 +2227,12 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+84"/>
         <source>De_ringing</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="-61"/>
         <source>System language</source>
         <translation>Langue du système</translation>
     </message>
@@ -2108,7 +2242,17 @@
         <translation>Langue</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>Limiter le rafraichissement</translation>
     </message>
@@ -2118,19 +2262,22 @@
         <translation>Limite en ms</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Affichage</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>Accel. HW</translation>
     </message>
@@ -2140,7 +2287,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation>Toujours demander le port à utiliser</translation>
     </message>
@@ -2150,13 +2297,33 @@
         <translation>Port par défaut</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+12"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+262"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-116"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-130"/>
         <source>Queue</source>
         <translation>Mettre en queue</translation>
     </message>
@@ -2166,7 +2333,13 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+12"/>
+        <location line="+2"/>
+        <source>Clear recent items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Pr&amp;eferences</source>
         <translation>Préférences</translation>
     </message>
@@ -2177,18 +2350,18 @@
         <translation>Sauver les réglages courants comme défaut</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Plugins</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+147"/>
+        <location filename="../../common/gui_main.cpp" line="+167"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2202,8 +2375,8 @@
         <translation>Erreur</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+49"/>
+        <location line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Vous ne pouvez pas *tout* enlever</translation>
@@ -2255,9 +2428,9 @@
 Il est nécessaire pour créer un fichier compatible PSP</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
-        <translation>Choisir un script/projet à lancer</translation>
+        <translation>Choisir un script ou projet à lancer</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -2275,13 +2448,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+114"/>
         <source>Not coded in this version</source>
         <translation>Pas disponible dans cette version</translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+73"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Choisir un fichier vidéo</translation>
     </message>
@@ -2301,7 +2474,7 @@
         <translation>Choisir le fichier à concatener</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2327,7 +2500,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+126"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2398,7 +2571,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Erreur de permission</translation>
     </message>
@@ -2429,19 +2602,19 @@
         <translation>Quelque chose a échoué lors de l&apos;ajout</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Quelque chose d&apos;horrible est arrivé (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Vérification de la vidéo</translation>
     </message>
@@ -2471,7 +2644,7 @@
         <translation>Vous ne pouvez pas tout détruire</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+116"/>
         <source>_Track from video:</source>
         <translation>_Piste venant de la vidéo</translation>
     </message>
@@ -2543,7 +2716,7 @@
         <translation>Hex dump:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+113"/>
         <source>Oops</source>
         <translation></translation>
     </message>
@@ -2553,7 +2726,7 @@
         <translation>Cette fonction est désactivée ou plus disponible.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Le device audio ne peut pas être initialisé</translation>
     </message>
@@ -2752,7 +2925,7 @@
         <translation>Impossible d&apos;ajouter le job %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-251"/>
+        <location filename="../../common/gui_savenew.cpp" line="-253"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Réutiliser les données précédentes du premier passage ?
@@ -2760,7 +2933,7 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+170"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -2795,20 +2968,20 @@
 Voulez-vous continuer ?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Impossible d&apos;instancier muxer</translation>
     </message>
@@ -2836,17 +3009,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished">Ne peut pas ouvrir</translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-113"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation>Désactivé</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Détection auto</translation>
     </message>
@@ -3127,6 +3302,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3206,6 +3386,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3231,7 +3416,7 @@
         <translation type="unfinished">Impossible d&apos;allouer la mémoire</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3341,7 +3526,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3390,6 +3575,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3418,6 +3652,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3464,6 +3755,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3570,6 +4003,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3601,9 +4142,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3621,35 +4188,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3746,12 +4318,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3819,12 +4386,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3907,6 +4474,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4059,7 +4646,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Noircir les bords</translation>
     </message>
@@ -4115,17 +4702,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4154,6 +4732,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4166,7 +4810,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+188"/>
         <source>Source Fps:</source>
         <translation type="unfinished">Source:</translation>
     </message>
@@ -4196,7 +4840,7 @@
         <translation>i/s invalide</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-211"/>
         <source>25  (PAL)</source>
         <translation type="unfinished">25  (Pal/Secam)</translation>
     </message>
@@ -4226,7 +4870,7 @@
         <translation type="unfinished">Accélère/Ralentit la vidéo en modifiant le nombre d&apos;i/s. La durée est modifiée.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+174"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
@@ -4263,6 +4907,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4420,8 +5124,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4431,8 +5135,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,12 +5165,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4532,7 +5231,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4542,7 +5241,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4554,12 +5253,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4574,13 +5274,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4591,13 +5291,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4607,17 +5307,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4663,7 +5363,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4682,6 +5382,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4773,6 +5509,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+72"/>
@@ -4849,6 +5701,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4864,12 +5729,12 @@
         <translation type="unfinished">Encodage...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation type="unfinished">Phases:</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+296"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4884,25 +5749,25 @@
         <translation type="unfinished">Codec Vidéo:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished">Inconnu</translation>
     </message>
     <message>
-        <location line="-278"/>
+        <location line="-279"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation type="unfinished">Priorité:</translation>
     </message>
@@ -4937,7 +5802,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pause/Abandon</translation>
     </message>
@@ -4982,17 +5857,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-536"/>
+        <location line="-568"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+50"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+148"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5039,7 +5914,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5053,12 +5928,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,7 +5943,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5092,11 +5967,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5117,9 +5987,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5365,7 +6724,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+328"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+341"/>
         <source>Interlacing</source>
         <translation type="unfinished">Entrelacement</translation>
     </message>
@@ -5421,7 +6780,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished">Deux threads</translation>
     </message>
     <message>
@@ -5568,7 +6927,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+232"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+243"/>
         <source>User Interface</source>
         <translation type="unfinished">Interface Utilisateur</translation>
     </message>
@@ -5604,7 +6963,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished">Deux threads</translation>
     </message>
     <message>
@@ -6073,7 +7432,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">Sauvegarde au format PS (ff)</translation>
     </message>
@@ -6126,12 +7485,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6169,7 +7528,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">Sauvegarde au format TS (ff)</translation>
     </message>
@@ -6190,9 +7549,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6284,6 +7706,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+88"/>
@@ -6710,7 +8304,7 @@
     <message>
         <location line="+3"/>
         <source>_Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Mode :</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6762,16 +8356,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6781,7 +8370,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6805,6 +8394,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+92"/>
@@ -6857,8 +8522,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Complète</translation>
     </message>
@@ -6875,8 +8540,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Changement i/s</translation>
     </message>
@@ -7052,7 +8717,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7062,13 +8727,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_ColorSpace:</source>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7224,7 +8889,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7390,6 +9055,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7410,7 +9131,7 @@
         <translation type="unfinished">Gestionnaire de filtres videos</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished">&lt;big&gt;&lt;b&gt;Filtres Actifs&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -7420,12 +9141,17 @@
         <translation type="unfinished">&lt;big&gt;&lt;b&gt;Filtres disponibles&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation type="unfinished">Transformation</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished">Entrelacement</translation>
     </message>
@@ -7483,12 +9209,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7594,7 +9320,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7958,12 +9684,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Impossible de lire l&apos;entete SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7971,7 +9698,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8006,7 +9733,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished">Sauvegarde au format MP4</translation>
     </message>
@@ -8021,6 +9748,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8151,7 +9883,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8176,7 +9908,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8261,7 +9998,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8292,22 +10029,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8317,7 +10049,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8325,22 +10057,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
@@ -8449,9 +10181,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">En tete incorrecte</translation>
     </message>
@@ -8464,7 +10196,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8528,18 +10260,35 @@
         <translation type="unfinished">Propriétés</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+72"/>
         <source>Frame Rate:</source>
         <translation type="unfinished">Images/s:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation type="unfinished">Durée totale:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Rapport h/l:</translation>
     </message>
@@ -8549,22 +10298,19 @@
         <translation type="unfinished">Dimensions:</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Extra Video Properties</source>
-        <translation type="unfinished">Informations supp</translation>
+        <translation type="obsolete">Informations supp</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation type="unfinished">Taille:</translation>
+        <translation type="obsolete">Taille:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation type="unfinished">Infos:</translation>
+        <translation type="obsolete">Infos:</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+156"/>
         <source>Frequency:</source>
         <translation type="unfinished">Fréquence:</translation>
     </message>
@@ -8579,26 +10325,37 @@
         <translation type="unfinished">Canaux:</translation>
     </message>
     <message>
-        <location line="-236"/>
+        <location line="-250"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
+        <location line="+59"/>
+        <source>Codec 4CC:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>Codec 4CC:</source>
+        <source>Extradata:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8645,7 +10402,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Sélectionner un fichier audio</translation>
     </message>
@@ -8666,7 +10423,7 @@
         <translation>Certaines pistes sont utilisées plusieurs fois</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Piste </translation>
     </message>
@@ -8681,7 +10438,7 @@
         <translation>Fichier </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>... Ajouter une piste audio</translation>
     </message>
@@ -8706,22 +10463,22 @@
         <translation>Les privilèges root sont requis pour effectuer cette opération.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>L&apos;encodage est en pause. Voulez vous reprendre ou abandonner ?</translation>
     </message>
@@ -8759,12 +10516,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Nouvelle version disponible&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Publié le %2.&lt;br&gt;Vous pouvez la télécharger ici&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Vous pouvez désactiver autoupdate dans les préférences.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Fichiers Récents</translation>
     </message>
@@ -8774,12 +10531,17 @@
         <translation>Projets Récents</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8814,6 +10576,16 @@
         <translation>Mettre le marqueur B</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Aller au début</translation>
@@ -8844,24 +10616,34 @@
         <translation>Avancer d&apos;une minute</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>L&apos;application a rencontré un problème fatal
 L&apos;édition en cours a été enregistrée et sera rechargée au prochain démarrage</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -8918,9 +10700,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
-        <translation type="unfinished"></translation>
+        <translation>Restaurer la session précédente</translation>
     </message>
 </context>
 <context>
@@ -8943,12 +10725,12 @@
     <message>
         <location line="+0"/>
         <source>Deleted</source>
-        <translation type="unfinished">Supprimé</translation>
+        <translation>Supprimé</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Running</source>
-        <translation type="unfinished"></translation>
+        <translation>Traitement en cours</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -8963,18 +10745,18 @@
     <message>
         <location line="+0"/>
         <source>Start Time</source>
-        <translation type="unfinished">Date de départ</translation>
+        <translation>Date de départ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>End Time</source>
-        <translation type="unfinished">Date de fin</translation>
+        <translation>Date de fin</translation>
     </message>
     <message>
         <location line="+64"/>
         <location line="+15"/>
         <source>Sure!</source>
-        <translation type="unfinished">Sur!</translation>
+        <translation>Sur !</translation>
     </message>
     <message>
         <location line="-15"/>
@@ -8984,7 +10766,7 @@
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete %s job?</source>
-        <translation>Êtes vous sur de vouloir détruire %s job ?</translation>
+        <translation>Êtes-vous sûr de vouloir détruire %s job ?</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -9018,28 +10800,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Partiel</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Ce filtre ne peut pas être partiel</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
@@ -9049,29 +10832,70 @@
         <translation>Déplacer vers le haut</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation>Prévisualisation</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation>Désactivé</translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Déplacer vers le bas</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Faire partiel</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation>Active/désactive</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation>Désactive</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation>Active</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
-        <translation>Charger les filtres vidéo..</translation>
+        <translation>Charger les filtres vidéos..</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save video filters..</source>
-        <translation>Enregistrer les filtres vidéo..</translation>
+        <translation>Enregistrer les filtres vidéos..</translation>
     </message>
 </context>
 <context>
@@ -9082,7 +10906,7 @@
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>&amp;Reprendre</translation>
     </message>
@@ -9110,18 +10934,33 @@
         <translation>Oui</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="-55"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9130,95 +10969,56 @@
         </translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Vidéo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Taille image : </translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Ratio : </translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Fréquence : </translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Durée totale : </translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Propriétés vidéos étendues</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Canaux : </translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Débit : </translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas d&apos;audio</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Stereo</source>
-        <translation type="unfinished">Stéréo</translation>
+        <translation>Stéréo</translation>
     </message>
 </context>
 <context>
@@ -9280,7 +11080,7 @@
     <message>
         <location line="-7"/>
         <source>Question?</source>
-        <translation type="unfinished"></translation>
+        <translation>Question ?</translation>
     </message>
 </context>
 <context>
@@ -9292,11 +11092,68 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
         <source>Select Idx File</source>
-        <translation>Choix du Fichie Idx</translation>
+        <translation>Choix du fichier Idx</translation>
     </message>
 </context>
 <context>
@@ -9312,14 +11169,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauver une vidéo brute</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun</translation>
     </message>
 </context>
 <context>
@@ -9373,9 +11230,9 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
-        <translation type="unfinished">Manuel</translation>
+        <translation>Manuel</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9383,24 +11240,44 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished">Re-échantillonner le nombre d&apos;I/S</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
-        <translation type="unfinished">Change le nombre d&apos;i/s, conserve la synchronisation et la durée</translation>
+        <translation>Change le nombre d&apos;i/s, conserve la synchronisation et la durée</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>_New frame rate:</source>
-        <translation type="unfinished">_Nouveau nombre d&apos;i/s:</translation>
+        <translation>_Nouveau nombre d&apos;i/s:</translation>
     </message>
     <message>
-        <location line="-322"/>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-400"/>
         <source>25  (PAL)</source>
-        <translation type="unfinished">25  (PAL/SECAM)</translation>
+        <translation>25 (PAL/SECAM)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9418,25 +11295,25 @@
         <translation type="unfinished">50 (PAL/SECAM)</translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>_Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>Resample fps</source>
-        <translation type="unfinished">Re-échantillonnage du nombre d&apos;i/s</translation>
+        <translation>Ré-échantillonnage du nombre d&apos;i/s</translation>
     </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>La largeur ou la hauteur ne peuvent être impaires</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9461,7 +11338,7 @@
     <message>
         <location line="+21"/>
         <source>Lock Aspect Ratio</source>
-        <translation>Vérrouiller le rapport h/l</translation>
+        <translation>Verrouiller le rapport h/l</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -9472,7 +11349,7 @@
         <location line="+8"/>
         <location line="+32"/>
         <source>1:1 (square pixels)</source>
-        <translation type="unfinished"></translation>
+        <translation>1:1 (pixel carré)</translation>
     </message>
     <message>
         <location line="-8"/>
@@ -9487,12 +11364,12 @@
     <message>
         <location line="+38"/>
         <source>Width:</source>
-        <translation>Largeur:</translation>
+        <translation>Largeur :</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Height:</source>
-        <translation>Hauteur:</translation>
+        <translation>Hauteur :</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -9507,12 +11384,12 @@
     <message>
         <location line="+5"/>
         <source>Round to the Nearest Multiple of 8</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrondir au multiple de 8</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Round to the Nearest Multiple of 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrondir au multiple de 4</translation>
     </message>
     <message>
         <location line="+114"/>
@@ -9522,12 +11399,22 @@
     <message>
         <location line="+79"/>
         <source>Error X / Y:</source>
-        <translation>Erreur X/Y:</translation>
+        <translation>Erreur X/Y :</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+40"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
-        <translation>Méthode:</translation>
+        <translation>Méthode :</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -9537,7 +11424,7 @@
     <message>
         <location line="+5"/>
         <source>Bicubic</source>
-        <translation>Bicuibique</translation>
+        <translation>Bicubique</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9550,7 +11437,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-189"/>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-221"/>
         <source>1%</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9569,54 +11461,49 @@
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Rotation</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
-        <translation>Angle de rotation (90/180/270);</translation>
+        <translation>Angle de rotation (90°, 180°, 270°).</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>90 degrees</source>
-        <translation type="unfinished"></translation>
+        <translation>90 degrés</translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>90°</source>
+        <source>90° clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>180 degrees</source>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>180°</source>
-        <translation type="unfinished"></translation>
+        <location line="-1"/>
+        <source>180 degrees</source>
+        <translation>180 degrés</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>270 degrees</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>270°</source>
-        <translation type="unfinished"></translation>
+        <translation>270 degrés</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Angle:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Angle :</translation>
     </message>
 </context>
 <context>
@@ -9627,7 +11514,17 @@
         <translation>Aperçu</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation>Afficher l&apos;entrée non traitée</translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9639,12 +11536,12 @@
     <message>
         <location line="+1"/>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next image</source>
-        <translation type="unfinished"></translation>
+        <translation>Image suivante</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9659,7 +11556,7 @@
     <message>
         <location line="+1"/>
         <source>Forward one minute</source>
-        <translation type="unfinished"></translation>
+        <translation>Avancer d&apos;une minute</translation>
     </message>
 </context>
 <context>
@@ -9706,31 +11603,31 @@
     <message>
         <location line="+1"/>
         <source>Put even lines on top, odd lines at bottom.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mettre les lignes paires en haut, les lignes impaires en bas.</translation>
     </message>
 </context>
 <context>
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished">_Début:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Duration:</source>
-        <translation type="unfinished">_Fin:</translation>
+        <translation type="unfinished">_Fin :</translation>
     </message>
 </context>
 <context>
@@ -9841,37 +11738,37 @@
     <message>
         <location line="+1"/>
         <source>_Field order:</source>
-        <translation>&amp;Ordre champ:</translation>
+        <translation>&amp;Ordre champ :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Postprocessing:</source>
-        <translation>&amp;Post-traitement:</translation>
+        <translation>&amp;Post-traitement :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Try backward:</source>
-        <translation>&amp;Essayer en arrière:</translation>
+        <translation>&amp;Essayer en arrière :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Direct threshold:</source>
-        <translation>Seuil &amp;direct:</translation>
+        <translation>Seuil &amp;direct :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Backward threshold:</source>
-        <translation>Seuil en &amp;arrière</translation>
+        <translation>Seuil en &amp;arrière :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Noise threshold:</source>
-        <translation>Seuil de b&amp;ruit</translation>
+        <translation>Seuil de b&amp;ruit :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postp_rocessing threshold:</source>
-        <translation>Seuil de post-t&amp;raitement</translation>
+        <translation>Seuil de post-t&amp;raitement :</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9902,7 +11799,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9920,7 +11817,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9939,7 +11836,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Il existe plusieurs fichiers avec des noms de fichiers séquentiels. Devraient-ils tous être chargés?</translation>
@@ -10508,6 +12405,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10533,7 +12512,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10544,17 +12523,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Manuel</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Bitrate cible :</translation>
     </message>
@@ -10590,7 +12579,7 @@
         <translation>Bitrate moyen:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11913,7 +13902,7 @@
         <translation>Manuel</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Bitrate cible :</translation>
     </message>
@@ -12030,7 +14019,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12272,12 +14261,12 @@
     <message>
         <location line="+5"/>
         <source>Exhaustive Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche exhaustive</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>1 (Fast)</source>
-        <translation type="unfinished"></translation>
+        <translation>1 (rapide)</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -12287,7 +14276,7 @@
     <message>
         <location line="+20"/>
         <source>7 (Best)</source>
-        <translation type="unfinished"></translation>
+        <translation>7 (meilleur)</translation>
     </message>
     <message>
         <location line="+78"/>
@@ -12317,7 +14306,7 @@
     <message>
         <location line="+7"/>
         <source>Rectangular</source>
-        <translation type="unfinished"></translation>
+        <translation>Rectangulaire</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -12439,12 +14428,12 @@
     <message>
         <location line="+9"/>
         <source>Minimum:</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimum :</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Maximum:</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximum:</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -12495,7 +14484,7 @@
     <message>
         <location line="+7"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Profondeur</translation>
     </message>
     <message>
         <location line="+330"/>
@@ -12506,7 +14495,7 @@
         <location line="+22"/>
         <location line="+88"/>
         <source>Level:</source>
-        <translation type="unfinished"></translation>
+        <translation>Niveau :</translation>
     </message>
     <message>
         <location line="-54"/>
@@ -12553,7 +14542,7 @@
         <location line="+10"/>
         <location line="+1080"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editer</translation>
     </message>
     <message>
         <location line="-1033"/>
@@ -12584,7 +14573,7 @@
     <message>
         <location line="-598"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Activé</translation>
     </message>
     <message>
         <location line="+277"/>
@@ -12639,7 +14628,7 @@
     <message>
         <location line="+13"/>
         <source>Normal</source>
-        <translation type="unfinished">Normale</translation>
+        <translation>Normale</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -12680,18 +14669,18 @@
         <location line="+12"/>
         <source>Unspecified</source>
         <comment>PAR</comment>
-        <translation type="unfinished"></translation>
+        <translation>Non spécifié</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Custom Aspect Ratio:</source>
         <comment>PAR</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratio personnalisé :</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Same as Input</source>
-        <translation type="unfinished"></translation>
+        <translation>Comme l&apos;entrée</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -12761,7 +14750,7 @@
     <message>
         <location line="+20"/>
         <source>Add</source>
-        <translation type="unfinished">Ajouter</translation>
+        <translation>Ajouter</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -12781,7 +14770,7 @@
     <message>
         <location line="+7"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">Détection auto</translation>
+        <translation>Détection auto</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -12808,7 +14797,7 @@
         <location line="+59"/>
         <location line="+6"/>
         <source>Output</source>
-        <translation type="unfinished">Sortie</translation>
+        <translation>Sortie</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -12818,7 +14807,7 @@
     <message>
         <location line="-606"/>
         <source>Pixel Aspect Ratio</source>
-        <translation type="unfinished"></translation>
+        <translation>Ratio de pixel</translation>
     </message>
     <message>
         <location line="+81"/>
@@ -12828,7 +14817,7 @@
     <message>
         <location line="-53"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ratio d&apos;image prédéfini</translation>
     </message>
     <message>
         <location line="+588"/>
@@ -12836,12 +14825,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <source>Overscan:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12849,22 +14833,22 @@
         <location line="-785"/>
         <location line="+795"/>
         <source>Undefined</source>
-        <translation type="unfinished"></translation>
+        <translation>Non défini</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Montrer</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Crop</source>
-        <translation type="unfinished"></translation>
+        <translation>Recadrer</translation>
     </message>
     <message>
         <location line="-818"/>
         <source>Video Format:</source>
-        <translation type="unfinished"></translation>
+        <translation>Format vidéo :</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -12907,7 +14891,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+724"/>
+        <location line="+653"/>
+        <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+71"/>
         <source>HRD Parameters:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12981,7 +14970,7 @@
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation type="unfinished"></translation>
+        <translation>Charger un fichier</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -12991,7 +14980,7 @@
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Annuler</translation>
+        <translation>Annuler</translation>
     </message>
 </context>
 <context>
@@ -13000,42 +14989,42 @@
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
-        <translation type="unfinished">Aucun</translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location line="-23"/>
         <source>Low</source>
-        <translation type="unfinished">BAsse</translation>
+        <translation>Basse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium</source>
-        <translation type="unfinished">Moyenne</translation>
+        <translation>Moyenne</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Full</source>
-        <translation type="unfinished">Complète</translation>
+        <translation>Complète</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Custom</source>
-        <translation type="unfinished">Manuel</translation>
+        <translation>Manuel</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>One thread</source>
-        <translation type="unfinished">Un thread</translation>
+        <translation>Un thread</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation type="unfinished">Deux threads</translation>
+        <source>Two threads</source>
+        <translation>Deux threads</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation type="unfinished">Trois threads</translation>
+        <translation>Trois threads</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -13060,12 +15049,12 @@
     <message>
         <location line="+28"/>
         <source>Aspect Ratio:</source>
-        <translation type="unfinished">Rapport h/l:</translation>
+        <translation>Rapport h/l :</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Aspect Ratio</source>
-        <translation type="unfinished">Rapport hauteur/largeur</translation>
+        <translation>Rapport hauteur/largeur</translation>
     </message>
     <message>
         <location line="-111"/>
@@ -13130,7 +15119,7 @@
     <message>
         <location line="+1"/>
         <source>_Number of B frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Nombre d&apos;image B</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -13155,7 +15144,7 @@
     <message>
         <location line="+2"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil :</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -13176,7 +15165,7 @@
         <location line="+35"/>
         <location line="+17"/>
         <source>Encoding Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Mode d&apos;encodage</translation>
     </message>
     <message>
         <location line="-13"/>
@@ -13201,7 +15190,7 @@
     <message>
         <location line="+12"/>
         <source>Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Contrôle du débit</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -13282,4 +15271,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts Changed

@@ -4,12 +4,12 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>A %s megnyitása sikertelen!</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,17 +62,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+125"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -89,19 +89,19 @@
 Eldobjuk ezeket az időszinkron adatokat ?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-102"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-104"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Nem található szétbontó ehhez: %s</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+79"/>
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-244"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -499,7 +499,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Másolás</translation>
@@ -533,6 +533,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -542,7 +544,17 @@
         <translation>…</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-542"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+201"/>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
@@ -568,7 +580,7 @@
         <translation>000000</translation>
     </message>
     <message>
-        <location line="-1437"/>
+        <location line="-1486"/>
         <source>&amp;Help</source>
         <translation>&amp;Súgó</translation>
     </message>
@@ -578,7 +590,7 @@
         <translation>Vi&amp;deó</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation>H&amp;ang</translation>
     </message>
@@ -593,7 +605,7 @@
         <translation>&amp;Eszközök</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation>Sz&amp;erkesztés</translation>
     </message>
@@ -603,7 +615,7 @@
         <translation>&amp;Nézet</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation>&amp;Egyéni</translation>
     </message>
@@ -613,7 +625,7 @@
         <translation>U&amp;grás</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1463"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -678,12 +690,12 @@
         <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1213"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
-        <location line="+772"/>
+        <location line="+820"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -703,7 +715,7 @@
         <translation>&amp;Kimenet</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
         <translation>Ol&amp;dal</translation>
     </message>
@@ -713,22 +725,22 @@
         <translation>Fen&amp;t</translation>
     </message>
     <message>
-        <location line="-565"/>
+        <location line="-579"/>
         <source>Frame type:</source>
         <translation>Képkocka típus:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
         <translation>&amp;Szeparált</translation>
     </message>
     <message>
-        <location line="-1812"/>
+        <location line="-1875"/>
         <source>&amp;Toolbars</source>
         <translation>Eszköz&amp;tárak</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Automatikus</translation>
     </message>
@@ -759,7 +771,7 @@
         <translation>&lt;b&gt;Kimeneti formátum&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1099"/>
+        <location line="+1147"/>
         <source>&amp;Codec Options</source>
         <translation>&amp;Kódek beállítás</translation>
     </message>
@@ -769,8 +781,8 @@
         <translation>Alt+Ctrl+C</translation>
     </message>
     <message>
-        <location line="-976"/>
-        <location line="+987"/>
+        <location line="-1024"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigálás</translation>
     </message>
@@ -796,6 +808,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>H&amp;ang méter</translation>
     </message>
@@ -805,7 +827,7 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1712"/>
+        <location line="-1774"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -860,7 +882,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1073,7 +1095,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1093,7 +1115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>Nem szabványos DVD hangsáv frekvencia elfogadása</translation>
     </message>
@@ -1168,7 +1190,27 @@
         <translation>SSSE3 engedélyezése</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>Lavc szálak:</translation>
     </message>
@@ -1198,7 +1240,7 @@
         <translation>Normál alatti</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Encoding priority:</source>
         <translation>Kódolási prioritás:</translation>
     </message>
@@ -1223,7 +1265,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1238,22 +1285,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation>XVideo (legjobb)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation>SDL (jó)</translation>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="vanished">XVideo (legjobb)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="vanished">SDL (jó)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>Vi_deó megjelenítés:</translation>
     </message>
@@ -1319,22 +1415,22 @@
         <translation>Hangeszköz</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation>Deringing</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Default Postprocessing</source>
         <translation>Alapértelmezett utómunkálatok</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Kezelőfelület</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Kimenet</translation>
     </message>
@@ -1349,13 +1445,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1363,7 +1459,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1373,18 +1469,17 @@
         <translation>Szálak</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
         <source>Preferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
         <source>Open</source>
         <translation>Megnyitás</translation>
     </message>
@@ -1502,6 +1597,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1523,6 +1628,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Szűrők</translation>
@@ -1600,6 +1710,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Előző fekete képkocka</translation>
     </message>
@@ -1634,6 +1754,46 @@
         <translation>Időpontra ugrás</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -1756,7 +1916,7 @@
         <translation>Kézi (dB)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Gain mode:</source>
         <translation>Erősítés mód:</translation>
     </message>
@@ -1777,8 +1937,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Újrakeverő:</translation>
+        <source>Remix</source>
+        <translation>Újrakeverő</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1791,7 +1951,7 @@
         <translation>Eltolás mértéke (ms):</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>Hangszűrők</translation>
     </message>
@@ -1812,16 +1972,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1936,12 +2099,12 @@
         <translation>Bővítmények infó</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-295"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+180"/>
         <source>Enable openGl support</source>
         <translation>OpenGL engedélyezés</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-232"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+4"/>
         <source>High</source>
         <translation>Magas</translation>
@@ -1953,17 +2116,15 @@
         <translation>Alacsony</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (legjobb)</translation>
+        <translation type="vanished">VDPAU (legjobb)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (legjobb)</translation>
+        <translation type="vanished">OpenGL (legjobb)</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+101"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation>PCM</translation>
@@ -1975,7 +2136,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+29"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+92"/>
         <source>_Horizontal deblocking</source>
         <translation>Vízszintes blokkbontás</translation>
     </message>
@@ -2054,17 +2215,17 @@
 A PSP kompatibilis videóhoz szükséges.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+188"/>
+        <location filename="../../common/gui_main.cpp" line="+189"/>
         <source>Select script to save</source>
         <translation>Mentendő szkript választás</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+181"/>
         <source>Not coded in this version</source>
         <translation>Nem kódolt ebben a verzióban</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2083,7 +2244,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Biztos benne?</translation>
     </message>
@@ -2148,7 +2309,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Hozzáférési hiba</translation>
     </message>
@@ -2200,19 +2361,19 @@
         <translation>A hozzáfűzésnél valami nem sikerült</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Valami rossz történt (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Videó ellenőrzés</translation>
     </message>
@@ -2247,7 +2408,7 @@
         <translation>Valami rossz történt</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>Sáv videóból:</translation>
     </message>
@@ -2386,8 +2547,8 @@
         <translation>%d kép mentve.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2666,7 +2827,7 @@
         <translation>Xvid4 beállítás</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2676,7 +2837,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-180"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+72"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2696,12 +2857,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2711,18 +2872,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+48"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2732,7 +2888,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2742,24 +2908,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2769,14 +2938,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-80"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2810,7 +2979,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2830,8 +2999,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2851,14 +3020,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2869,7 +3038,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2900,7 +3069,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Hopp</translation>
     </message>
@@ -2910,7 +3079,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Probléma a hangeszköz inicializálásánál</translation>
     </message>
@@ -3007,13 +3176,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3035,20 +3204,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3076,17 +3245,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation type="unfinished">Tiltva</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Automatikus felismerés</translation>
     </message>
@@ -3137,6 +3308,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3216,6 +3392,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3241,7 +3422,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3348,7 +3529,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3396,6 +3577,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3424,6 +3654,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3470,6 +3757,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3576,6 +4005,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3607,9 +4144,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3627,35 +4190,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3751,12 +4319,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3804,12 +4367,12 @@
         <translation>Alsó margó:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3829,12 +4392,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3912,6 +4475,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4064,7 +4647,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Fekete szegélyek</translation>
     </message>
@@ -4120,17 +4703,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4159,6 +4733,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4186,7 +4826,7 @@
         <translation>50 (PAL N Argentína)</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+189"/>
         <source>Source Fps:</source>
         <translation>Forrás FPS:</translation>
     </message>
@@ -4216,7 +4856,7 @@
         <translation>Érvénytelen fps</translation>
     </message>
     <message>
-        <location line="-166"/>
+        <location line="-175"/>
         <source>Change FPS</source>
         <translation type="unfinished">Fps valtas</translation>
     </message>
@@ -4231,7 +4871,7 @@
         <translation type="unfinished">Az fps valtas gyorsitja/lassítja a filmet.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+174"/>
         <source>Error</source>
         <translation type="unfinished">Hiba</translation>
     </message>
@@ -4268,6 +4908,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4430,14 +5130,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>kontraszt</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4466,12 +5166,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4539,7 +5234,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4549,7 +5244,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Figyelem, a levágás túl széles ! Szélesség visszáll !</translation>
@@ -4561,12 +5256,13 @@
         <translation>Figyelem, a levágás túl magas ! Magasság visszáll !</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4581,13 +5277,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4598,13 +5294,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4614,17 +5310,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4670,7 +5366,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4689,6 +5385,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4780,6 +5512,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4864,6 +5712,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4879,35 +5740,45 @@
         <translation>Kódolás...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Ffázis:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation>Videó kodek:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4981,17 +5852,17 @@
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation>Számítógép leállítása befejezés után</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation>Prioritás:</translation>
     </message>
@@ -5021,17 +5892,17 @@
         <translation>Alacsony</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation>Szünet / Megszakít</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-218"/>
         <source>Main</source>
         <translation type="unfinished">Általános</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+198"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5054,7 +5925,7 @@
         <translation>Kontraszt, fenyero, telitettseg es gamma beallitasa.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,12 +5939,12 @@
         <translation type="unfinished">kontraszt</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5083,7 +5954,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5107,11 +5978,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5132,9 +5998,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Elhalvanyodas</translation>
@@ -5380,7 +6735,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation>Normál (4:3)</translation>
     </message>
@@ -5431,8 +6786,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>kétszál)</translation>
+        <source>Two threads</source>
+        <translation>kétszál</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5583,7 +6938,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5614,8 +6969,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>Kétszál)</translation>
+        <source>Two threads</source>
+        <translation>Kétszál</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6088,7 +7443,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">mpeg PS (ff) mentés</translation>
     </message>
@@ -6141,12 +7496,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6184,7 +7539,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">mpeg TS (ff) mentés</translation>
     </message>
@@ -6205,9 +7560,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6299,6 +7717,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+88"/>
@@ -6812,16 +8402,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6831,7 +8416,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
@@ -6855,6 +8440,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6907,8 +8568,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Teljes</translation>
     </message>
@@ -6925,8 +8586,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Képkockasebesség váltás:</translation>
     </message>
@@ -7102,7 +8763,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7112,14 +8773,18 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation>Kvantáló:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>Színtér:</translation>
+        <translation type="vanished">Színtér:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7274,7 +8939,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">Bitsebesség:</translation>
     </message>
@@ -7440,6 +9105,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7460,17 +9181,22 @@
         <translation>Videószűrő kezelő</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Aktív szűrők:&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-122"/>
+        <location line="-131"/>
         <source>Transform</source>
         <translation>Átalakítás</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Váltottsoros</translation>
     </message>
@@ -7533,12 +9259,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7644,7 +9370,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8008,12 +9734,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Probléma a SVQ3 fejek olvasásánál</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8021,7 +9748,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8056,7 +9783,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished">mp4 mentés</translation>
     </message>
@@ -8071,6 +9798,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8201,7 +9933,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">Hang</translation>
     </message>
@@ -8226,7 +9958,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8311,7 +10048,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8342,22 +10079,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8367,7 +10099,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8375,22 +10107,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Hiba</translation>
     </message>
@@ -8499,9 +10231,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Hibás formátumú fejléc</translation>
     </message>
@@ -8514,7 +10246,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8583,27 +10315,22 @@
         <translation>Videó</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Szövegcímke</translation>
+        <translation type="vanished">Szövegcímke</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Képkockaszám:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Teljes időtartam:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-163"/>
         <source>Aspect Ratio:</source>
         <translation>Méretarány:</translation>
     </message>
@@ -8618,12 +10345,11 @@
         <translation>Kodek 4CC:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>Extra Videó tulajdonságok</translation>
+        <translation type="vanished">Extra Videó tulajdonságok</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+217"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8638,7 +10364,44 @@
         <translation>Hang</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-139"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Frequency:</source>
         <translation>Frekvencia:</translation>
     </message>
@@ -8663,14 +10426,12 @@
         <translation>Kódolás:</translation>
     </message>
     <message>
-        <location line="-125"/>
         <source>ExtraDataSize:</source>
-        <translation>Extra Adat Méret:</translation>
+        <translation type="vanished">Extra Adat Méret:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Extra adatok :</translation>
+        <translation type="vanished">Extra adatok :</translation>
     </message>
 </context>
 <context>
@@ -8695,7 +10456,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8716,7 +10477,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8731,7 +10492,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8756,22 +10517,22 @@
         <translation type="unfinished">Root jogosultság szükséges a művelet végrehajtásához.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">A kódolás szünetel. Folytassuk, vagy hagyjuk abba??</translation>
     </message>
@@ -8809,12 +10570,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished">Legutóbbi fájlok</translation>
     </message>
@@ -8824,12 +10585,17 @@
         <translation type="unfinished">Legutóbbi projektek</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8864,6 +10630,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8894,23 +10670,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8966,7 +10752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9066,28 +10852,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished">Hozzáadás</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished">Eltávolítás</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Beállítás</translation>
     </message>
@@ -9097,22 +10884,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9130,7 +10958,7 @@
         <translation type="unfinished">Ismeretlen</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9158,107 +10986,51 @@
         <translation>Igen</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
-        <translation>%02d:%02d:%02d.%03d</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation>Monó</translation>
     </message>
@@ -9338,6 +11110,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9358,7 +11187,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9419,7 +11248,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>Mód:</translation>
     </message>
@@ -9429,12 +11258,12 @@
         <translation>Új képkockasebesség:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>FPS ujraepites</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Egyéni</translation>
     </message>
@@ -9464,7 +11293,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>Fps ujraepites</translation>
     </message>
@@ -9473,16 +11302,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>FPS ujraepites, hossz, szinkron marad.</translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>swsResize</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">A szélesség és magasság nem lehet páratlan szám</translation>
     </message>
@@ -9598,7 +11447,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9622,22 +11481,27 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Forgat</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>90, 180 vagy 270 fokkal forgat.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
@@ -9647,6 +11511,11 @@
         <translation>90 fok</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 fok</translation>
@@ -9657,24 +11526,26 @@
         <translation>270 fok</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>Szög:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
 </context>
 <context>
@@ -9685,7 +11556,17 @@
         <translation>Előnézet</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9771,17 +11652,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9960,7 +11841,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9978,7 +11859,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9997,7 +11878,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10566,6 +12447,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10591,7 +12554,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10602,17 +12565,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">Egyéni</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Cél bitsebesség:</translation>
     </message>
@@ -10648,7 +12621,7 @@
         <translation type="unfinished">Átlagos bitsebesség:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11969,7 +13942,7 @@
         <translation type="unfinished">Egyéni</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Cél bitsebesség:</translation>
     </message>
@@ -12085,7 +14058,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13166,8 +15139,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>kétszál)</translation>
+        <source>Two threads</source>
+        <translation>kétszál</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -13389,4 +15362,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -4,12 +4,12 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>Tentativo di aprire %s fallito!</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62,17 +62,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+124"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+125"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -89,19 +89,19 @@
 Eliminare le informazioni temporali?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-102"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="-104"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Impossibile trovare un demuxer per %s</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+79"/>
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-193"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-244"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -499,7 +499,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Copia</translation>
@@ -533,6 +533,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -542,7 +544,17 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-318"/>
+        <location line="-542"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+201"/>
         <source>Time:</source>
         <translation>Tempo:</translation>
     </message>
@@ -568,7 +580,7 @@
         <translation>000000</translation>
     </message>
     <message>
-        <location line="-1437"/>
+        <location line="-1486"/>
         <source>&amp;Help</source>
         <translation>A&amp;iuto</translation>
     </message>
@@ -578,7 +590,7 @@
         <translation>Vi&amp;deo</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation>&amp;Audio</translation>
     </message>
@@ -593,7 +605,7 @@
         <translation>&amp;Strumenti</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
@@ -603,7 +615,7 @@
         <translation>Visua&amp;lizza</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation>&amp;Preferiti</translation>
     </message>
@@ -613,7 +625,7 @@
         <translation>&amp;Vai</translation>
     </message>
     <message>
-        <location line="+1612"/>
+        <location line="+1660"/>
         <source>&amp;Open...</source>
         <translation>&amp;Apri...</translation>
     </message>
@@ -683,7 +695,7 @@
         <translation>&amp;Output</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
         <translation>&amp;Affiancati lateralmente</translation>
     </message>
@@ -693,22 +705,22 @@
         <translation>Affiancati ver&amp;ticalmente</translation>
     </message>
     <message>
-        <location line="-565"/>
+        <location line="-579"/>
         <source>Frame type:</source>
         <translation>Tipo di fotogramma:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
         <translation>&amp;Separati</translation>
     </message>
     <message>
-        <location line="-1205"/>
+        <location line="-1267"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
-        <location line="+772"/>
+        <location line="+820"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -718,12 +730,12 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="-1386"/>
+        <location line="-1435"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Barre degli strumenti</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>A&amp;uto</translation>
     </message>
@@ -754,7 +766,7 @@
         <translation>&lt;b&gt;Contenitore output&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1099"/>
+        <location line="+1147"/>
         <source>&amp;Codec Options</source>
         <translation>Opzioni &amp;codec</translation>
     </message>
@@ -764,8 +776,8 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-976"/>
-        <location line="+987"/>
+        <location line="-1024"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigazione</translation>
     </message>
@@ -796,6 +808,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Audiometro</translation>
     </message>
@@ -805,7 +827,7 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1712"/>
+        <location line="-1774"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -860,7 +882,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1073,7 +1095,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1093,7 +1115,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Accetta frequenze audio non standard per DVD</translation>
     </message>
@@ -1168,7 +1190,27 @@
         <translation>Attiva SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>Thread _lavc:</translation>
     </message>
@@ -1210,7 +1252,7 @@
         <translation>Bassa</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>Priorità di _codifica:</translation>
     </message>
@@ -1235,7 +1277,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1250,7 +1297,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1260,22 +1337,41 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>XVideo (best)</source>
-        <translation>XVideo (migliore)</translation>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation>SDL (buono)</translation>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="vanished">XVideo (migliore)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="vanished">SDL (buono)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>_Visualizzazione video:</translation>
     </message>
@@ -1353,7 +1449,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
         <source>_Horizontal deblocking</source>
         <translation>Deblocking o_rizzontale</translation>
     </message>
@@ -1379,17 +1475,17 @@
         <translation>_Intensità:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Postprocessing predefinito</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Interfaccia utente</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Output</translation>
     </message>
@@ -1404,13 +1500,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1418,7 +1514,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1428,18 +1524,17 @@
         <translation>Threading</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-50"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
@@ -1557,6 +1652,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1577,6 +1682,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtri</translation>
@@ -1653,6 +1763,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Fotogramma nero precedente</translation>
     </message>
@@ -1687,6 +1807,46 @@
         <translation>Vai al tempo</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -1809,7 +1969,7 @@
         <translation>Manuale (dB)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>_Gain mode:</source>
         <translation>Modalità _guadagno:</translation>
     </message>
@@ -1830,8 +1990,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Remix:</translation>
+        <source>Remix</source>
+        <translation>Remix</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1844,7 +2004,7 @@
         <translation>Valore ritardo (ms):</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>Filtri audio</translation>
     </message>
@@ -1865,16 +2025,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1989,19 +2152,17 @@
         <translation>Info plugin</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-295"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+180"/>
         <source>Enable openGl support</source>
         <translation>Attiva supporto OpenGL</translation>
     </message>
     <message>
-        <location line="+85"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (migliore)</translation>
+        <translation type="vanished">VDPAU (migliore)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (migliore)</translation>
+        <translation type="vanished">OpenGL (migliore)</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+48"/>
@@ -2062,17 +2223,17 @@
 È necessario per creare un video compatibile con PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+188"/>
+        <location filename="../../common/gui_main.cpp" line="+189"/>
         <source>Select script to save</source>
         <translation>Seleziona lo script da salvare</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+181"/>
         <source>Not coded in this version</source>
         <translation>Non incluso in questa versione</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -2091,7 +2252,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
@@ -2156,7 +2317,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Errore di permesso</translation>
     </message>
@@ -2208,19 +2369,19 @@
         <translation>Errore durante l&apos;aggiunta</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>C&apos;è stato qualche errore (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Verifica video in corso</translation>
     </message>
@@ -2255,7 +2416,7 @@
         <translation>C&apos;è stato qualche errore</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>_Traccia dal video:</translation>
     </message>
@@ -2394,8 +2555,8 @@
         <translation>%d immagini salvate.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2439,7 +2600,7 @@
         <translation>Il file %s NON è stato salvato correttamente.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation type="unfinished">Amplificazione</translation>
     </message>
@@ -2479,7 +2640,7 @@
         <translation type="unfinished">Due passate</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished">Salvataggio in corso</translation>
     </message>
@@ -2494,7 +2655,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+40"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2514,23 +2675,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+154"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+48"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2540,7 +2696,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2550,24 +2716,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2577,14 +2746,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-68"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-80"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2618,7 +2787,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2638,8 +2807,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2659,14 +2828,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2677,7 +2846,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2708,7 +2877,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Ops</translation>
     </message>
@@ -2718,7 +2887,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2815,13 +2984,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2843,20 +3012,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2884,17 +3053,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Rilevamento automatico</translation>
     </message>
@@ -3145,6 +3316,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished">WMA</translation>
     </message>
@@ -3224,6 +3400,11 @@
         <translation type="unfinished">PCM 8-bit</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished">Codec sconosciuto</translation>
@@ -3346,7 +3527,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3394,6 +3575,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3422,6 +3652,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3468,6 +3755,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3574,6 +4003,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3605,9 +4142,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3625,35 +4188,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3749,12 +4317,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3810,12 +4373,12 @@
         <translation type="unfinished">_Margine inferiore:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation type="unfinished">ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3835,12 +4398,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3918,6 +4481,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4070,7 +4653,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished">Annerimento bordi</translation>
     </message>
@@ -4126,17 +4709,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4165,6 +4739,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+45"/>
@@ -4172,7 +4812,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+188"/>
         <source>Source Fps:</source>
         <translation>Fps sorgente:</translation>
     </message>
@@ -4197,7 +4837,7 @@
         <translation>Cambiamento fps</translation>
     </message>
     <message>
-        <location line="-198"/>
+        <location line="-207"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
@@ -4232,7 +4872,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+174"/>
         <source>Error</source>
         <translation type="unfinished">Errore</translation>
     </message>
@@ -4274,6 +4914,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4431,8 +5131,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished">Contrasto</translation>
     </message>
@@ -4442,8 +5142,8 @@
         <translation type="unfinished">Regola contrasto, luminosità e colori.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4482,12 +5182,7 @@
         <translation type="unfinished">Croma V</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4545,7 +5240,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +5250,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4567,12 +5262,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4587,13 +5283,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished">Destra:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished">Alto:</translation>
     </message>
@@ -4604,13 +5300,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished">Basso:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished">Sinistra:</translation>
     </message>
@@ -4620,17 +5316,17 @@
         <translation type="unfinished">Crop automatico</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4676,7 +5372,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4695,6 +5391,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4786,6 +5518,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+57"/>
@@ -4870,6 +5718,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4885,25 +5746,25 @@
         <translation>Codifica in corso...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Fase:</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+324"/>
         <source>Video Codec:</source>
         <translation>Codec video:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
@@ -4932,7 +5793,7 @@
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation>Arresta il sistema al termine</translation>
     </message>
@@ -4972,7 +5833,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4997,12 +5868,12 @@
         <translation>Tempo trascorso:</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-505"/>
         <source>Time Remaining:</source>
         <translation>Tempo rimanente:</translation>
     </message>
     <message>
-        <location line="+528"/>
+        <location line="+529"/>
         <source>Frames/sec:</source>
         <translation>Fotogrammi/sec:</translation>
     </message>
@@ -5042,7 +5913,7 @@
         <translation type="unfinished">Avanzate</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5060,7 +5931,7 @@
         <translation type="unfinished">Regola contrasto, luminosità, saturazione e gamma.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,7 +5939,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+267"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+260"/>
         <source>Green</source>
         <translation type="unfinished">Verde</translation>
     </message>
@@ -5078,7 +5949,7 @@
         <translation type="unfinished">Rosso</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation type="unfinished">Contrasto</translation>
@@ -5094,7 +5965,7 @@
         <translation type="unfinished">Luminosità</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation type="unfinished">Blu</translation>
     </message>
@@ -5104,12 +5975,7 @@
         <translation type="unfinished">Peso</translation>
     </message>
     <message>
-        <location line="-86"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+155"/>
+        <location line="+69"/>
         <source>Initial</source>
         <translation type="unfinished">Iniziale</translation>
     </message>
@@ -5138,9 +6004,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished">Dissolvenza</translation>
@@ -5386,7 +6741,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">Predefinito</translation>
     </message>
@@ -5472,7 +6827,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5589,7 +6944,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5640,7 +6995,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6094,7 +7449,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished">Salvataggio mpeg PS (ff) in corso</translation>
     </message>
@@ -6147,12 +7502,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6190,7 +7545,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished">Salvataggio mpeg TS (ff) in corso</translation>
     </message>
@@ -6211,9 +7566,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6307,6 +7725,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6820,16 +8410,11 @@
         <source>Saturation</source>
         <translation type="unfinished">Saturazione</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6839,7 +8424,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6863,6 +8448,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+92"/>
@@ -6915,8 +8576,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Completo</translation>
     </message>
@@ -6933,8 +8594,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7110,12 +8771,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">_Quantizzatore:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7125,8 +8786,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7282,7 +8943,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Bitrate:</translation>
     </message>
@@ -7448,6 +9109,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7474,6 +9191,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Interlacciamento</translation>
     </message>
@@ -7541,12 +9263,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7652,7 +9374,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8016,12 +9738,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problema di lettura delle intestazioni SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8029,7 +9752,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">Non supportato</translation>
     </message>
@@ -8064,7 +9787,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished">Salvataggio mp4 in corso</translation>
     </message>
@@ -8079,6 +9802,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8209,7 +9937,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
@@ -8234,7 +9962,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8319,7 +10052,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8350,22 +10083,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8375,7 +10103,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8383,22 +10111,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Errore</translation>
     </message>
@@ -8507,9 +10235,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Intestazione errata</translation>
     </message>
@@ -8522,7 +10250,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8591,27 +10319,22 @@
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Etichetta di testo</translation>
+        <translation type="vanished">Etichetta di testo</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Frame rate:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Durata totale:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-163"/>
         <source>Aspect Ratio:</source>
         <translation>Proporzioni:</translation>
     </message>
@@ -8626,12 +10349,11 @@
         <translation>4CC codec:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>Proprietà video extra</translation>
+        <translation type="vanished">Proprietà video extra</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+217"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,7 +10368,44 @@
         <translation>Audio</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-139"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-163"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Frequency:</source>
         <translation>Frequenza:</translation>
     </message>
@@ -8671,14 +10430,12 @@
         <translation>Codec:</translation>
     </message>
     <message>
-        <location line="-125"/>
         <source>ExtraDataSize:</source>
-        <translation>Dimensione dati extra:</translation>
+        <translation type="vanished">Dimensione dati extra:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Dati extra:</translation>
+        <translation type="vanished">Dati extra:</translation>
     </message>
 </context>
 <context>
@@ -8703,7 +10460,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8724,7 +10481,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8739,7 +10496,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8764,22 +10521,22 @@
         <translation type="unfinished">Sono richesti i privilegi di amministratore per eseguire questa operazione.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished">La codifica è in pausa. Vuoi ripristinarla o annullarla?</translation>
     </message>
@@ -8817,12 +10574,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished">File recenti</translation>
     </message>
@@ -8832,12 +10589,17 @@
         <translation type="unfinished">Progetti recenti</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8872,6 +10634,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8902,23 +10674,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8975,7 +10757,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9530,28 +11312,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished">Parziale</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished">Aggiungi</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished">Rimuovi</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Configura</translation>
     </message>
@@ -9561,22 +11344,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9594,7 +11418,7 @@
         <translation type="unfinished">Sconosciuto</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9622,108 +11446,52 @@
         <translation type="unfinished">Sì</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation type="unfinished">%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
-        <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
-    </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+83"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation type="unfinished">%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished">%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation type="unfinished">Mono</translation>
     </message>
@@ -9803,6 +11571,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9823,7 +11648,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9884,7 +11709,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Modalità:</translation>
     </message>
@@ -9894,12 +11719,12 @@
         <translation>_Nuovo frame rate:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>Ricampionamento fps</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
@@ -9929,7 +11754,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9938,16 +11763,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Larghezza e altezza non possono essere dispari</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10071,7 +11916,17 @@
         <translation type="unfinished">0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished">Metodo di ridimensionamento:</translation>
     </message>
@@ -10095,12 +11950,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">Rotazione</translation>
     </message>
@@ -10111,18 +11971,26 @@
     </message>
     <message>
         <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 gradi</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10130,9 +11998,8 @@
         <translation type="unfinished">270 gradi</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -10140,12 +12007,12 @@
         <translation type="unfinished">_Angolo:</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-158"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10158,7 +12025,17 @@
         <translation>Anteprima</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10244,17 +12121,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10433,7 +12310,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10451,7 +12328,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10470,7 +12347,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -11039,6 +12916,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -11064,7 +13023,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11075,17 +13034,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">Personalizzato</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Bitrate finale:</translation>
     </message>
@@ -11121,7 +13090,7 @@
         <translation type="unfinished">Bitrate medio:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12438,7 +14407,7 @@
         <translation type="unfinished">Personalizzato</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished">Bitrate finale:</translation>
     </message>
@@ -12550,7 +14519,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13843,7 +15812,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13995,4 +15964,167 @@
         <translation type="unfinished">yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s を開く試みは失敗しました!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -493,7 +493,7 @@
         <translation type="unfinished">Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">コピー</translation>
@@ -518,7 +518,7 @@
         <translation type="unfinished">フィルタ</translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+708"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -549,7 +549,7 @@
         <translation type="unfinished">フレームタイプ:</translation>
     </message>
     <message>
-        <location line="-1278"/>
+        <location line="-1327"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -574,7 +574,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,12 +646,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -670,6 +670,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -679,7 +681,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -709,7 +711,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -779,12 +781,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,6 +900,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1051,7 +1073,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1071,7 +1093,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">DVDに標準でない音声周波数を受け付ける(_A)</translation>
     </message>
@@ -1156,7 +1178,27 @@
             </translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished">
             </translation>
@@ -1200,7 +1242,7 @@
         <translation type="unfinished">低い</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">エンコードの優先度(_E):</translation>
     </message>
@@ -1226,7 +1268,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1241,24 +1288,73 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation type="unfinished">
-            </translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="obsolete">
+            </translation>
+    </message>
+    <message>
         <source>SDL (good)</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation type="unfinished">映像表示(_D):</translation>
     </message>
@@ -1333,7 +1429,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">水平デブロック(_H)</translation>
     </message>
@@ -1359,17 +1455,17 @@
         <translation type="unfinished">強さ(_S):</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished">デフォルトの後処理</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation type="unfinished">ユーザインタフェース</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation type="unfinished">出力</translation>
     </message>
@@ -1384,13 +1480,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished">音声</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1398,7 +1494,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation type="unfinished">CPU</translation>
     </message>
@@ -1409,8 +1505,7 @@
             </translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+3"/>
+        <location line="+18"/>
         <source>Preferences</source>
         <translation type="unfinished">設定</translation>
     </message>
@@ -1420,7 +1515,7 @@
         <translation type="unfinished">コピー</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+30"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">フィルタ</translation>
@@ -1508,7 +1603,7 @@
         <translation type="unfinished">ドルビープロロジックII</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation type="unfinished">利得モード(_G):</translation>
     </message>
@@ -1523,7 +1618,7 @@
         <translation type="unfinished">ミキサー(_M):</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation type="unfinished">音声フィルタ</translation>
     </message>
@@ -1534,11 +1629,13 @@
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation type="unfinished">SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished">XVideo</translation>
     </message>
@@ -1589,7 +1686,7 @@
         <translation type="unfinished">このバージョンではコード化されていません</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1608,7 +1705,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished">本当ですか&#xa0;?</translation>
     </message>
@@ -1673,7 +1770,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished">パーミッション エラー</translation>
     </message>
@@ -1725,19 +1822,19 @@
         <translation type="unfinished">追加時に何かが失敗しました</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">何か悪いことが起きました (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished">映像をチェック中</translation>
     </message>
@@ -1772,7 +1869,7 @@
         <translation type="unfinished">何か悪いことが起きました</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished">映像からのトラック(_T):</translation>
     </message>
@@ -1876,8 +1973,8 @@
         <translation type="unfinished">%d 画像を保存.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -1931,12 +2028,12 @@
         <translation type="unfinished">中くらい</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation type="unfinished">利得</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-8"/>
         <source>DRC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1951,13 +2048,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1987,6 +2084,7 @@
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2081,7 +2179,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2096,22 +2194,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2121,22 +2219,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>OpenGL (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
@@ -2147,7 +2230,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+7"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2157,7 +2240,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2167,24 +2260,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2194,7 +2290,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2307,6 +2403,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2337,6 +2443,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
@@ -2408,6 +2519,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2442,6 +2563,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2467,8 +2628,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2546,7 +2707,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2571,8 +2732,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2592,14 +2753,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2610,7 +2771,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2641,7 +2802,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">しまった</translation>
     </message>
@@ -2651,7 +2812,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">音声デバイス初期化トラブル</translation>
     </message>
@@ -2773,13 +2934,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2801,20 +2962,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2842,17 +3003,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">
             </translation>
@@ -3129,6 +3292,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3208,6 +3376,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3233,7 +3406,7 @@
         <translation type="unfinished">メモリエラー</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3340,7 +3513,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3388,6 +3561,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3416,6 +3638,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3462,6 +3741,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3568,6 +3989,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3599,9 +4128,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3619,35 +4174,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3743,12 +4303,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3816,12 +4371,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3904,6 +4459,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4056,7 +4631,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4112,17 +4687,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4151,6 +4717,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4193,7 +4825,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4262,6 +4894,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4419,8 +5111,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished">コントラスト</translation>
     </message>
@@ -4430,8 +5122,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4475,12 +5167,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4533,7 +5220,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4543,7 +5230,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4555,12 +5242,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4580,25 +5268,25 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4608,17 +5296,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4664,7 +5352,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4683,6 +5371,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4774,6 +5498,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4858,6 +5698,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4873,25 +5726,35 @@
         <translation type="unfinished">エンコード中...</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+247"/>
+        <location line="+24"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">なし</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4965,17 +5828,17 @@
         <translation type="unfinished">0 kB/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">終了したらコンピュータをシャットダウンする</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation type="unfinished">優先度:</translation>
     </message>
@@ -5005,7 +5868,7 @@
         <translation type="unfinished">低い</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">休止 / 中止</translation>
     </message>
@@ -5015,17 +5878,17 @@
         <translation type="unfinished">拡張</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+15"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+183"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5049,7 +5912,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,17 +5931,17 @@
         <translation type="unfinished">明るさ</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+122"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5102,11 +5965,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5127,9 +5985,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5375,7 +6722,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">デフォルト</translation>
     </message>
@@ -5447,7 +6794,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5579,7 +6926,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5631,7 +6978,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6087,7 +7434,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6140,12 +7487,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6183,7 +7530,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6204,9 +7551,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6298,6 +7708,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6787,16 +8369,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6806,7 +8383,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6830,6 +8407,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6882,8 +8535,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">
             </translation>
@@ -6901,8 +8554,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">フレームレート変換(_F):</translation>
     </message>
@@ -7078,12 +8731,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">量子化度(_Q):</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7093,8 +8746,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7250,7 +8903,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">ビットレート(_B):</translation>
     </message>
@@ -7416,6 +9069,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7442,6 +9151,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished">インタレース</translation>
     </message>
@@ -7509,12 +9223,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7620,7 +9334,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7984,12 +9698,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">SVQ3ヘッダ読取に問題</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7997,7 +9712,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">未サポート</translation>
     </message>
@@ -8032,7 +9747,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8047,6 +9762,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8177,7 +9897,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">音声</translation>
     </message>
@@ -8202,7 +9922,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8287,7 +10012,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8318,22 +10043,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8343,7 +10063,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8351,22 +10071,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">エラー</translation>
     </message>
@@ -8475,9 +10195,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">誤った形式のヘッダ</translation>
     </message>
@@ -8490,7 +10210,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8559,18 +10279,35 @@
         <translation type="unfinished">映像</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation type="unfinished">フレームレート:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation type="unfinished">合計時間:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">アスペクト比:</translation>
     </message>
@@ -8585,7 +10322,27 @@
         <translation type="unfinished">コーデック4CC:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished">音声</translation>
     </message>
@@ -8615,31 +10372,7 @@
         <translation type="unfinished">コーデック:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>ExtraDataSize:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8671,7 +10404,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8692,7 +10425,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8707,7 +10440,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8732,22 +10465,22 @@
         <translation type="unfinished">この操作を実行するにはRoot特権が要求される</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8785,12 +10518,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8800,12 +10533,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8840,6 +10578,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8870,23 +10618,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8942,7 +10700,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9043,28 +10801,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished">部分適用</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">構成</translation>
     </message>
@@ -9074,22 +10833,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9107,7 +10907,7 @@
         <translation type="unfinished">不明</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9134,8 +10934,23 @@
         <source>Yes</source>
         <translation type="unfinished">はい</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9153,94 +10968,23 @@
         <translation type="unfinished">ステレオ</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9315,6 +11059,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9335,7 +11136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9396,7 +11197,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation type="unfinished">モード(_M):</translation>
     </message>
@@ -9406,7 +11207,7 @@
         <translation type="unfinished">新規フレームレート(_N):</translation>
     </message>
     <message>
-        <location line="-323"/>
+        <location line="-400"/>
         <source>Custom</source>
         <translation type="unfinished">カスタム</translation>
     </message>
@@ -9436,7 +11237,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9446,7 +11247,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9454,12 +11275,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">幅や高さは 奇数にはできません</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9499,7 +11320,7 @@
         <translation type="unfinished">200%</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation type="unfinished">
             </translation>
@@ -9511,7 +11332,7 @@
             </translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9587,7 +11408,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9601,12 +11432,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">回転</translation>
     </message>
@@ -9621,6 +11457,11 @@
         <translation type="unfinished">90 度</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 度</translation>
@@ -9631,24 +11472,26 @@
         <translation type="unfinished">270 度</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished">角度(_A):</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9664,7 +11507,17 @@
         <translation type="unfinished">プレビュー</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9750,17 +11603,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9939,7 +11792,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9957,7 +11810,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9976,7 +11829,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10545,6 +12398,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10570,7 +12505,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10581,17 +12516,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">カスタム</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10627,7 +12572,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11946,7 +13891,7 @@
         <translation type="unfinished">カスタム</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12058,7 +14003,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13203,7 +15148,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13370,4 +15315,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_ko.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>%s용 디먹서를 찾을 수 없습니다</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>%s 열기 실패!</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -76,7 +76,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>타임스탬프가 유효한지 검사 중..</translation>
     </message>
@@ -86,12 +86,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -496,12 +496,12 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+141"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+142"/>
         <source>&amp;Auto</source>
         <translation>자동(&amp;U)</translation>
     </message>
     <message>
-        <location line="-126"/>
+        <location line="-127"/>
         <source>Avidemux</source>
         <translation>Avidemux</translation>
     </message>
@@ -531,7 +531,7 @@
         <translation>도구바(&amp;T)</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>&amp;Custom</source>
         <translation>사용자(&amp;C)</translation>
     </message>
@@ -623,12 +623,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>탐색(&amp;N)</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation>재생 [SPACE]</translation>
     </message>
@@ -647,6 +647,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -656,7 +658,7 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>이전 프레임으로 가기 [LEFT]</translation>
     </message>
@@ -686,7 +688,7 @@
         <translation>끝 표시 설정 [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>이전 검정 프레임 찾기</translation>
     </message>
@@ -787,12 +789,22 @@
         <translation>볼륨(&amp;M)</translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation> (0 트랙)</translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -908,6 +920,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>오디오 미터(&amp;A)</translation>
     </message>
@@ -1173,6 +1195,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>표시 초기화</translation>
     </message>
@@ -1199,6 +1231,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>필터</translation>
@@ -1234,7 +1271,17 @@
         <translation>정보</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
         <translation>첫 프레임</translation>
     </message>
@@ -1259,6 +1306,46 @@
         <translation>시간으로 이동</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>배율 1:4</translation>
@@ -1327,7 +1414,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+396"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+445"/>
         <source>Stereo</source>
         <translation>스테레오</translation>
     </message>
@@ -1387,7 +1474,7 @@
         <translation>수동 (dB)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
         <translation>게인</translation>
     </message>
@@ -1413,8 +1500,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>리믹스:</translation>
+        <source>Remix</source>
+        <translation>리믹스</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1432,7 +1519,7 @@
         <translation>이동 값 (ms):</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>오디오 필터</translation>
     </message>
@@ -1453,16 +1540,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1483,7 +1573,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1529,7 +1619,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1538,7 +1628,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
@@ -1619,7 +1709,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Horizontal deblocking</source>
         <translation>수평 깍두기 제거 (deblocking)</translation>
     </message>
@@ -1640,7 +1730,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-184"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>DXVA2로 비디오 디코드 (윈도우)</translation>
     </message>
@@ -1660,12 +1750,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation>OpenGL 지원 활성화하기</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>하드웨어 디코딩시, 일치하는 디스플레이 드라이버 사용</translation>
     </message>
@@ -1685,7 +1775,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>DVD에 대해 비표준 오디오 주파수 받아들이기 </translation>
     </message>
@@ -1765,7 +1855,27 @@
         <translation>SSSE3 활성화</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>lavc 쓰레드:</translation>
     </message>
@@ -1807,7 +1917,7 @@
         <translation>낮음</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>인코딩 우선권:</translation>
     </message>
@@ -1832,7 +1942,12 @@
         <translation>최근 읽은 파일의 폴더를 저장용 폴더로 사용하기</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1847,7 +1962,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1857,37 +2002,36 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>XVideo (best)</source>
-        <translation>XVideo (최상)</translation>
+        <translation type="vanished">XVideo (최상)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (최상)</translation>
+        <translation type="vanished">VDPAU (최상)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (최상)</translation>
+        <translation type="vanished">DXVA2 (최상)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (최상)</translation>
+        <translation type="vanished">OpenGL (최상)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (최상)</translation>
+        <translation type="vanished">LIBVA (최상)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>SDL (good)</source>
-        <translation>SDL (좋음)</translation>
+        <translation type="vanished">SDL (좋음)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+25"/>
         <source>Video _display:</source>
         <translation>비디오 디스플레이:</translation>
     </message>
@@ -1959,7 +2103,7 @@
         <translation>오디오 장치</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation>물결현상 제거 (Deringing)</translation>
     </message>
@@ -1969,12 +2113,12 @@
         <translation>강도:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>기본 후처리</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-64"/>
         <source>System language</source>
         <translation>시스템 언어</translation>
     </message>
@@ -1984,17 +2128,27 @@
         <translation>언어</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>User Interface</source>
         <translation>사용자 인터페이스</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Output</source>
         <translation>출력</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+46"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>갱신 속도 제한</translation>
     </message>
@@ -2004,19 +2158,22 @@
         <translation>갱신 속도 한도 (ms)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>GUI 렌더링 옵션</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>디스플레이</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>HW 가속</translation>
     </message>
@@ -2026,7 +2183,7 @@
         <translation>쓰레딩</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation>사용할 포트 항상 묻기</translation>
     </message>
@@ -2036,13 +2193,33 @@
         <translation>기본 사용 포트</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+12"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+262"/>
         <source>Preferences</source>
         <translation>환경 설정</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-128"/>
         <source>Save as BMP</source>
         <translation>BMP로 저장</translation>
     </message>
@@ -2062,12 +2239,12 @@
         <translation>실행 취소</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+18"/>
         <source>Pr&amp;eferences</source>
         <translation>환경 설정</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>&amp;Advanced</source>
         <translation>고급(&amp;A)</translation>
     </message>
@@ -2107,7 +2284,7 @@
         <translation>다음 인트라 프레임</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
         <translation>이전 검정 프레임</translation>
     </message>
@@ -2117,13 +2294,13 @@
         <translation>다음 검정 프레임</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+1571"/>
+        <location filename="../../common/gui_main.cpp" line="+1621"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2137,8 +2314,8 @@
         <translation>오류</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+49"/>
+        <location line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>*모든* 비디오를 삭제할 수는 없습니다</translation>
@@ -2230,7 +2407,7 @@
         <translation>FAAC 코덱이 없습니다! PSP 호환 비디오를 만들 때 필요합니다.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>실행할 스크립트/프로젝트 선택</translation>
     </message>
@@ -2255,13 +2432,13 @@
         <translation>최근 파일과 프로젝트의 목록을 지우려고 합니다. 이 작업은 복구할 수 없습니다. 진행할까요?</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+114"/>
         <source>Not coded in this version</source>
         <translation>이 버전에 코딩되어 있지 않습니다</translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+73"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>비디오 파일 선택...</translation>
     </message>
@@ -2281,7 +2458,7 @@
         <translation>덧붙일 비디오 파일 선택...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2307,7 +2484,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>확실한가요?</translation>
     </message>
@@ -2383,7 +2560,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>권한 오류</translation>
     </message>
@@ -2435,19 +2612,19 @@
         <translation>덧붙이는 중 뭔가 잘못됐습니다</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>잘못된 일이 발생했습니다 (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation>TinyPY 플러그인이 없습니다. 문제가 생길 수 있습니다.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>비디오 검사 중</translation>
     </message>
@@ -2482,7 +2659,7 @@
         <translation>잘못된 일이 발생했습니다</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>비디오의 트랙:</translation>
     </message>
@@ -2554,7 +2731,7 @@
         <translation>프레임 헥스 덤프</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+113"/>
         <source>Oops</source>
         <translation>웁스</translation>
     </message>
@@ -2564,7 +2741,7 @@
         <translation>이 기능이 비활성화되었거나 더 이상 유효하지 않습니다</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>오디오 장치 초기화 중 문제 발생</translation>
     </message>
@@ -2763,14 +2940,14 @@
         <translation>%s 작업을 추가할 수 없습니다</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-251"/>
+        <location filename="../../common/gui_savenew.cpp" line="-253"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>이전의 첫 패스 데이터를 재사용할까요? 경고, 설정을 닫어야 합니다.</translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+170"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -2805,20 +2982,20 @@
 어쨌든 계속할까요?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>먹서</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>먹서를 인스턴스화할 수 없습니다</translation>
     </message>
@@ -2846,17 +3023,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>열 수 없습니다</translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-113"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>비활성화</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>자동 감지</translation>
     </message>
@@ -3142,6 +3321,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -3221,6 +3405,11 @@
         <translation>8-bit PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>알 수 없는 코덱</translation>
@@ -3246,7 +3435,7 @@
         <translation>메모리 오류</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>저장 중</translation>
     </message>
@@ -3353,7 +3542,7 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3402,6 +3591,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3430,6 +3668,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3476,6 +3771,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3582,6 +4019,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3613,9 +4158,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3633,35 +4204,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3757,12 +4333,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3842,12 +4413,12 @@
         <translation>하단 여백:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3932,6 +4503,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>먹싱 형식</translation>
     </message>
@@ -4084,7 +4675,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>경계선 검은색으로 만들기</translation>
     </message>
@@ -4140,17 +4731,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>검정프레임</translation>
+        <translation type="vanished">검정프레임</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>이 기능은 당분간 지원되지 않습니다</translation>
+        <translation type="vanished">이 기능은 당분간 지원되지 않습니다</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>검정 프레임 찾는 중..</translation>
     </message>
@@ -4179,6 +4769,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4221,7 +4877,7 @@
         <translation>마치 FPS를 변경하듯이 비디오 속도를 빠르게/느리게 합니다. 이 필터는 재생시간을 변경합니다.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation>원본 FPS:</translation>
     </message>
@@ -4288,6 +4944,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4445,8 +5161,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>대비</translation>
     </message>
@@ -4456,8 +5172,8 @@
         <translation>대비, 밝기와 색상을 조정합니다.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>밝기</translation>
     </message>
@@ -4486,12 +5202,11 @@
         <translation>루마</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Process</source>
-        <translation>처리</translation>
+        <translation type="vanished">처리</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4559,7 +5274,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>잘라내기</translation>
     </message>
@@ -4569,7 +5284,7 @@
         <translation>잘라내기 필터</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>경고: 너비를 너무 많이 잘라냈습니다! 너비 초기화!</translation>
@@ -4581,12 +5296,13 @@
         <translation>경고: 높이를 너무 많이 잘라냈습니다! 높이 초기화!</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4601,13 +5317,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>오른쪽:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>위쪽:</translation>
     </message>
@@ -4618,13 +5334,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>아래쪽:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>왼쪽:</translation>
     </message>
@@ -4634,17 +5350,17 @@
         <translation>자동 잘라내기</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4690,7 +5406,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4709,6 +5425,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4800,6 +5552,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4884,6 +5752,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4905,29 +5786,29 @@
     </message>
     <message>
         <location line="+32"/>
-        <location line="+254"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+247"/>
+        <location line="-310"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-310"/>
         <source>Phase:</source>
         <translation>페이즈:</translation>
     </message>
     <message>
-        <location line="-31"/>
+        <location line="+24"/>
         <source>Time Remaining:</source>
         <translation>남은 시간:</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+11"/>
         <source>Shut down computer when finished</source>
         <translation>종료시 컴퓨터 끄기</translation>
     </message>
@@ -4967,7 +5848,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>트레이로 최소화하기</translation>
     </message>
@@ -5074,7 +5965,7 @@
         <translation>대비, 밝기, 채도와 감마를 조정합니다.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>초기화</translation>
     </message>
@@ -5088,12 +5979,12 @@
         <translation>대비</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;감마&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>채도</translation>
     </message>
@@ -5103,7 +5994,7 @@
         <translation>밝기</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation>파란색</translation>
     </message>
@@ -5127,11 +6018,6 @@
         <source>Green</source>
         <translation>녹색</translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5152,9 +6038,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>페이드</translation>
@@ -5400,7 +6775,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation>보통 (4:3)</translation>
     </message>
@@ -5451,7 +6826,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>2개 쓰레드</translation>
     </message>
     <message>
@@ -5603,7 +6978,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5634,7 +7009,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>2개 쓰레드</translation>
     </message>
     <message>
@@ -6116,7 +7491,7 @@
         <translation>[불일치]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Mpeg PS 저장 중 (ff)</translation>
     </message>
@@ -6169,12 +7544,12 @@
         <translation>[ffPS] DVD: MP2/AC3/DTS만 사용 가능합니다</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>자유</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>먹싱 형식</translation>
     </message>
@@ -6212,7 +7587,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Mpeg TS 저장 중 (ff)</translation>
     </message>
@@ -6233,9 +7608,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6329,6 +7767,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6843,16 +8453,11 @@
         <source>Saturation</source>
         <translation>채도 (Saturation)</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6862,7 +8467,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>형식:</translation>
     </message>
@@ -6886,6 +8491,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6938,8 +8619,8 @@
         <translation>중복 제거:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>전체</translation>
     </message>
@@ -6956,8 +8637,8 @@
         <translation>매우 빠르게</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>프레임 속도 변경:</translation>
     </message>
@@ -7133,7 +8814,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7143,14 +8824,18 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation>양자화기:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>색공간:</translation>
+        <translation type="vanished">색공간:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7305,7 +8990,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>비트레이트:</translation>
     </message>
@@ -7479,6 +9164,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7499,7 +9240,7 @@
         <translation>비디오 필터 관리자</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;사용 중인 필터&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -7509,12 +9250,17 @@
         <translation>&lt;big&gt;&lt;b&gt;이용 가능한 필터&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation>변환</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>인터레이싱</translation>
     </message>
@@ -7572,12 +9318,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Matroska 이미지</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Matroska 클러스터</translation>
     </message>
@@ -7683,7 +9429,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8055,12 +9801,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>SVQ3 헤더를 읽는 중 문제 발생</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8068,7 +9815,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>미지원</translation>
     </message>
@@ -8103,7 +9850,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>MP4 저장 중</translation>
     </message>
@@ -8118,6 +9865,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>먹싱 형식</translation>
@@ -8248,7 +10000,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
@@ -8273,7 +10025,12 @@
         <translation>비디오에 충분한 타이밍 정보가 없습니다. AVI에서 복사 중인가요?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation>파일 이름을 바꿀 수 없습니다 (최적화)</translation>
     </message>
@@ -8358,7 +10115,7 @@
         <translation>미리보기. 네모 좌표를 대충 정하기 위해 위 이미지에서 클릭하세요 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>그립을 이용해 빨간 직사각형의 크기를 조절할 수 있습니다</translation>
     </message>
@@ -8389,22 +10146,17 @@
         <translation>MSharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>마스크</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>강도</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>임계값</translation>
     </message>
@@ -8414,7 +10166,7 @@
         <translation>고품질</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8422,22 +10174,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>다음 키프레임으로 이동할 수 없습니다</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>이전 키프레임으로 이동할 수 없습니다</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>탐색</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
@@ -8546,9 +10298,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>잘못된 형식의 헤더</translation>
     </message>
@@ -8561,7 +10313,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8634,27 +10386,39 @@
         <translation>비디오</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>텍스트레이블</translation>
+        <translation type="vanished">텍스트레이블</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>프레임 속도:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>전체 시간:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>화면 비율:</translation>
     </message>
@@ -8669,22 +10433,39 @@
         <translation>코덱 4CC:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>추가 비디오 속성</translation>
+        <translation type="vanished">추가 비디오 속성</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>추가데이터크기:</translation>
+        <translation type="vanished">추가데이터크기:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>추가 데이터:</translation>
+        <translation type="vanished">추가 데이터:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>오디오</translation>
     </message>
@@ -8746,7 +10527,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>오디오 파일 선택</translation>
     </message>
@@ -8767,7 +10548,7 @@
         <translation>몇몇 트랙이 중복 사용되었습니다</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>트랙</translation>
     </message>
@@ -8782,7 +10563,7 @@
         <translation>파일</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>... 오디오 트랙 추가</translation>
     </message>
@@ -8807,22 +10588,26 @@
         <translation>이 동작을 수행하려면 루트 권한이 필요합니다.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>첫 패스</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pass 1</source>
-        <translation>패스 1</translation>
+        <translation type="vanished">패스 1</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>인코딩...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>인코딩을 일시 중지했습니다. 재시작하거나 취소할까요?</translation>
     </message>
@@ -8860,12 +10645,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;새 버전이 나왔습니다!&lt;/b&gt;&lt;br&gt; 버전 %1&lt;br&gt;%2에 배포.&lt;br&gt;여기에서 다운로드할 수 있습니다&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; 자동 업데이트는 환경 설정에서 끌 수 있습니다.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>최근 파일</translation>
     </message>
@@ -8875,12 +10660,17 @@
         <translation>최근 프로젝트</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>재생/정지</translation>
     </message>
@@ -8915,6 +10705,16 @@
         <translation>끝 표시 설정</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>첫 프레임으로 가기</translation>
@@ -8945,24 +10745,34 @@
         <translation>1분 앞으로</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>프로그램에서 치명적인 문제가 발생했습니다
 현재 편집 중인 것을 저장하고 다음 시작시에 다시 불러올 것입니다</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9018,7 +10828,7 @@
         <translation>참고</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9118,28 +10928,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>일부분</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>이 필터는 부분적으로 만들 수 없습니다</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>추가</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>설정</translation>
     </message>
@@ -9149,22 +10960,63 @@
         <translation>위로 이동</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>아래로 이동</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>부분적으로 만들기</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>비디오 필터 불러오기..</translation>
     </message>
@@ -9182,7 +11034,7 @@
         <translation>알 수 없음</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>다시 시작</translation>
     </message>
@@ -9210,18 +11062,33 @@
         <translation>예</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
+    <message>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="-55"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9229,88 +11096,73 @@
         </translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Video</source>
-        <translation>비디오</translation>
+        <translation type="vanished">비디오</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>코덱 4CC:	</translation>
+        <translation type="vanished">코덱 4CC:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>이미지 크기:	</translation>
+        <translation type="vanished">이미지 크기:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>화면 비율:	</translation>
+        <translation type="vanished">화면 비율:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>프레임 속도:	</translation>
+        <translation type="vanished">프레임 속도:	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>전체 재생시간:	</translation>
+        <translation type="vanished">전체 재생시간:	</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>추가 비디오 속성</translation>
+        <translation type="vanished">추가 비디오 속성</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>추가날짜크기:	</translation>
+        <translation type="vanished">추가날짜크기:	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>추가 날짜:	</translation>
+        <translation type="vanished">추가 날짜:	</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>오디오</translation>
+        <translation type="vanished">오디오</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>코덱:		</translation>
+        <translation type="vanished">코덱:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>채널:	</translation>
+        <translation type="vanished">채널:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>비트레이트:	</translation>
+        <translation type="vanished">비트레이트:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>주파수:	</translation>
+        <translation type="vanished">주파수:	</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation>오디오 없음</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation>모노</translation>
     </message>
@@ -9390,6 +11242,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9410,7 +11319,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9471,7 +11380,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
         <translation>사용자 정의</translation>
     </message>
@@ -9501,7 +11410,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>FPS 리샘플</translation>
     </message>
@@ -9511,7 +11420,22 @@
         <translation>FPS를 강제로 변경합니다. 재생시간과 싱크를 유지합니다.</translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation>모드:</translation>
     </message>
@@ -9521,6 +11445,11 @@
         <translation>새 프레임 속도:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Resample fps</source>
         <translation>FPS 리샘플</translation>
@@ -9529,12 +11458,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>너비와 높이는 홀수가 될 수 없습니다</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>SW 스케일 크기조절</translation>
     </message>
@@ -9658,7 +11587,17 @@
         <translation>0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>크기조절 방법:</translation>
     </message>
@@ -9682,22 +11621,27 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>회전</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>이미지를 90/180/270도로 회전합니다.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation>없음</translation>
     </message>
@@ -9708,18 +11652,26 @@
     </message>
     <message>
         <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>180 degrees</source>
         <translation>180도</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9727,9 +11679,8 @@
         <translation>270도</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9745,7 +11696,17 @@
         <translation>미리보기</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>1분 뒤로</translation>
     </message>
@@ -9831,17 +11792,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10020,7 +11981,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10038,7 +11999,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,7 +12018,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>연속적인 파일 이름을 가진 파일이 여럿 있습니다. 전부 불러올까요?</translation>
@@ -10626,6 +12587,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10682,7 +12725,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>코딩되지 않았습니다</translation>
     </message>
@@ -10693,17 +12736,27 @@
         <translation>이 모드는 구현되지 않았습니다</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>사용자 정의</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>대상 비트레이트:</translation>
     </message>
@@ -10739,7 +12792,7 @@
         <translation>평균 비트레이트:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12061,7 +14114,7 @@
         <translation>사용자 정의</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>대상 비트레이트:</translation>
     </message>
@@ -12174,7 +14227,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>x265 설정</translation>
     </message>
     <message>
@@ -13396,7 +15449,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>2개 쓰레드</translation>
     </message>
     <message>
@@ -13619,4 +15672,167 @@
         <translation>Yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>Nie udało się otworzyć %s!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>Nie można znaleźć demuksera dla %s</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation>szerokość</translation>
     </message>
@@ -76,7 +76,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Sprawdzanie, czy znaczniki czasu są prawidłowe...</translation>
     </message>
@@ -86,12 +86,12 @@
         <translation>Ten film wideo zawiera klatki B, ale znaczniki czasu prezentacji (PTS) są albo nieobecne, albo rosną monotonicznie. Avidemux może spróbować zrekonstruować poprawne PTS przez dekodowanie całego wideo. To może zająć dużo czasu. Kontynuować?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Dekodowanie wideo...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -501,7 +501,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
@@ -531,7 +531,17 @@
         <translation>ms</translation>
     </message>
     <message>
-        <location line="+601"/>
+        <location line="+406"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -557,7 +567,7 @@
         <translation>Typ klatki:</translation>
     </message>
     <message>
-        <location line="-1278"/>
+        <location line="-1327"/>
         <source>&amp;Help</source>
         <translation>Po&amp;moc</translation>
     </message>
@@ -582,7 +592,7 @@
         <translation>Paski &amp;narzędzi</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation></translation>
     </message>
@@ -649,12 +659,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>Nawigacja</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation>Odtwórz [SPACJA]</translation>
     </message>
@@ -673,6 +683,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -682,7 +694,7 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>Poprzednia klatka [STRZAŁKA W LEWO]</translation>
     </message>
@@ -712,7 +724,7 @@
         <translation>Ustaw znacznik końcowy [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Wyszukaj poprzednią czarną klatkę</translation>
     </message>
@@ -787,12 +799,12 @@
         <translation>Głośność</translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+1055"/>
         <source>Selection: 000000</source>
         <translation>Zaznaczenie: 000000</translation>
     </message>
@@ -908,6 +920,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>Miernik poziomu dźwięku</translation>
     </message>
@@ -1075,7 +1097,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Dekoduj wideo używając DXVA2 (windows)</translation>
     </message>
@@ -1095,7 +1117,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Akceptuj niestandardową częstotliwość dźwięku dla DVD</translation>
     </message>
@@ -1170,7 +1192,27 @@
         <translation>Włącz obsługę instrukcji SSSE3 procesora</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>Wątki _lavc:</translation>
     </message>
@@ -1212,7 +1254,7 @@
         <translation>Niski</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>Prioryt_et kodowania:</translation>
     </message>
@@ -1237,7 +1279,12 @@
         <translation>Domyślnie do zapisu użyj katalog, z którego wczytano ostatni plik</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1252,22 +1299,75 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>XVideo (best)</source>
-        <translation>XVideo (najlepszy)</translation>
+        <translation type="vanished">XVideo (najlepszy)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (najlepsze)</translation>
+        <translation type="vanished">DXVA2 (najlepsze)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>SDL (good)</source>
-        <translation>SDL (dobry)</translation>
+        <translation type="vanished">SDL (dobry)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>Wyświetlanie _obrazu:</translation>
     </message>
@@ -1345,7 +1445,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+66"/>
         <source>_Horizontal deblocking</source>
         <translation>Rozblokowanie _poziome</translation>
     </message>
@@ -1371,17 +1471,17 @@
         <translation>_Natężenie:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Przetwarzanie domyślne</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Interfejs użytkownika</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Wyjście</translation>
     </message>
@@ -1396,13 +1496,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1410,7 +1510,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation>Procesor</translation>
     </message>
@@ -1420,18 +1520,17 @@
         <translation>Wątkowanie</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>Preferencje</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
         <source>Preferences</source>
         <translation>Preferencje</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-12"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-14"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
@@ -1442,7 +1541,7 @@
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtry</translation>
@@ -1530,7 +1629,7 @@
         <translation>Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation>Tryb wzmocnienia:</translation>
     </message>
@@ -1545,7 +1644,7 @@
         <translation>_Mikser dźwięku:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation>Filtry dźwięku</translation>
     </message>
@@ -1561,11 +1660,13 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
@@ -1666,7 +1767,7 @@
         <translation>Nie zaimplementowane w tej wersji</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1685,7 +1786,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Na pewno?</translation>
     </message>
@@ -1754,7 +1855,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Błąd: Brak uprawnień</translation>
     </message>
@@ -1806,12 +1907,12 @@
         <translation>Dołączanie się nie powiodło</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Stało się coś złego (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -1819,7 +1920,7 @@
 Spodziewaj się problemów.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Sprawdzanie wideo</translation>
     </message>
@@ -1854,7 +1955,7 @@
         <translation>Stało się coś złego</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>Ścieżka z wideo:</translation>
     </message>
@@ -1963,8 +2064,8 @@
         <translation>Zapisano %d obrazów.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -2018,12 +2119,12 @@
         <translation>Średni</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation>Wzmocnienie</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Zapisywanie</translation>
     </message>
@@ -2033,7 +2134,7 @@
         <translation>Zapisany plik wideo jest niekompletny. Błąd wystąpił w %s (%d%). Przyczyną może być nieprawidłowy znacznik czasu w wideo.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-7"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-8"/>
         <source>DRC</source>
         <translation>DRC</translation>
     </message>
@@ -2048,13 +2149,13 @@
         <translation>Ręcznie (dB)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2079,6 +2180,7 @@
     </message>
     <message>
         <location line="+4"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -2118,7 +2220,7 @@
         <translation>Multipleksery</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Dekoduj wideo używając VDPAU (NVIDIA)</translation>
     </message>
@@ -2133,22 +2235,22 @@
         <translation>Dekoduj wideo używając VideoToolbox (macOS)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation>Włącz obsługę OpenGL</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>Jeśli używasz dekodowania sprzętowego, lepiej jest używać zgodny sterownik graficzny</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation>Sprawdź czy jest nowe wydanie</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2158,28 +2260,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (najlepsze)</translation>
+        <translation type="vanished">VDPAU (najlepsze)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (najlepsze)</translation>
+        <translation type="vanished">OpenGL (najlepsze)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (najlepsze)</translation>
+        <translation type="vanished">LIBVA (najlepsze)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation>Sterownik SDL</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+48"/>
         <source>System language</source>
         <translation>Język systemu</translation>
     </message>
@@ -2189,7 +2288,17 @@
         <translation>Język</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>Ogranicz szybkość odświeżania</translation>
     </message>
@@ -2199,24 +2308,27 @@
         <translation>Limit szybkości odświeżania (ms)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>Opcje renderowania interfejsu</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Wyświetlanie</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>Akceleracja sprzętowa</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation>Zawsze pytaj, który port użyć</translation>
     </message>
@@ -2226,7 +2338,7 @@
         <translation>Domyślny port do użycia</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
@@ -2333,6 +2445,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>Zresetuj znaczniki</translation>
     </message>
@@ -2358,6 +2480,11 @@
         <translation>Przetwarzanie końcowe</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation>Odtwórz filtrowane</translation>
@@ -2429,6 +2556,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation>Poprzednia czarna klatka</translation>
     </message>
@@ -2463,6 +2600,46 @@
         <translation>Przejdź do czasu</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Skala 1:4 (mały)</translation>
@@ -2488,8 +2665,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Nie możesz usunąć *całego* wideo
@@ -2574,7 +2751,7 @@
 Jest on wymagany do tworzenia wideo kompatybilnego z PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>Wybierz skrypt/projekt do uruchomienia</translation>
     </message>
@@ -2599,8 +2776,8 @@
         <translation>Zamierzasz wyczyścić listę ostatnich plików i projektów. Tego nie można cofnąć. Kontynuować?</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Wybierz plik wideo...</translation>
     </message>
@@ -2620,7 +2797,7 @@
         <translation>Wybierz plik wideo do dołączenia...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2629,7 +2806,7 @@
 Czy kontynuować mimo to?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Przycinanie</translation>
@@ -2640,7 +2817,7 @@
         <translation>Błąd podczas wycinania.</translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Podano nieprawidłowy indeks audio</translation>
@@ -2671,7 +2848,7 @@
         <translation>Ustawienie języka dla podanego indeksu ścieżki nie jest możliwe: Nieprawidłowy indeks ścieżki!</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -2681,7 +2858,7 @@
         <translation>Ta funkcja jest wyłączona lub nie jest już obowiązująca</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Problem z zainicjowaniem urządzenia audio</translation>
     </message>
@@ -2804,14 +2981,14 @@
         <translation>Nie można dodać zadania %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Ponownie użyć poprzednich danych pierwszego przebiegu?
 Ostrzeżenie: ustawienia muszą być zbliżone.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation>Nie można utworzyć instancji łańcucha wideo</translation>
     </message>
@@ -2839,20 +3016,20 @@
 Czy kontynuować mimo to?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Mukser</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Nie można utworzyć instancji muksera</translation>
     </message>
@@ -2880,17 +3057,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>Nie można otworzyć </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation>Wyłączony</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Automatyczne wykrycie</translation>
     </message>
@@ -3166,6 +3345,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -3245,6 +3429,11 @@
         <translation>8-bit PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>Nieznany kodek</translation>
@@ -3373,7 +3562,7 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3422,6 +3611,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation>Skrypt &quot;%s&quot; nie istnieje.</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3452,6 +3690,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3498,6 +3793,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3604,6 +4041,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3635,9 +4180,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3655,35 +4226,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3790,12 +4366,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-134"/>
+        <location line="-116"/>
         <source>ASharp</source>
         <translation>Asharp</translation>
     </message>
@@ -3837,12 +4408,12 @@
         <translation>Margines _dolny:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation>SSA/ASS/SRT</translation>
     </message>
@@ -3862,12 +4433,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3947,6 +4518,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Format muksowania</translation>
     </message>
@@ -4099,7 +4690,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Zaczernij krawędzie</translation>
     </message>
@@ -4155,17 +4746,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>Czarna klatka</translation>
+        <translation type="vanished">Czarna klatka</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Ta funkcja nie jest wspierana w tej chwili</translation>
+        <translation type="vanished">Ta funkcja nie jest wspierana w tej chwili</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Wyszukiwanie czarnej klatki...</translation>
     </message>
@@ -4194,6 +4784,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4236,7 +4892,7 @@
         <translation>Przyśpiesz/zwolnij wideo, zmieniając jego FPS. Ten filr zmieni także długość.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation>Źródłowy FPS:</translation>
     </message>
@@ -4303,6 +4959,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4465,14 +5181,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Jasność</translation>
     </message>
@@ -4516,12 +5232,11 @@
         <translation>Chrominancja V</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Process</source>
-        <translation>Przetwarzaj</translation>
+        <translation type="vanished">Przetwarzaj</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4574,7 +5289,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Kadrowanie</translation>
     </message>
@@ -4584,7 +5299,7 @@
         <translation>Filtr kadrowania</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Ostrzeżenie! Kadrowanie zbyt dużej szerokości! Szerokość zresetowana!</translation>
@@ -4596,12 +5311,13 @@
         <translation>Ostrzeżenie! Kadrowanie zbyt dużej wysokości! Wysokość zresetowana!</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Rozmiar: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4621,13 +5337,13 @@
     </message>
     <message>
         <location line="-108"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Prawa:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Góra:</translation>
     </message>
@@ -4638,28 +5354,28 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Dół:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Lewa:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Rozmiar: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4705,7 +5421,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4724,6 +5440,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4815,6 +5567,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+57"/>
@@ -4899,6 +5767,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4914,25 +5795,35 @@
         <translation>Kodowanie...</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+247"/>
+        <location line="+24"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation>Kodek dźwięku:</translation>
     </message>
@@ -5006,17 +5897,17 @@
         <translation>Kwantyzator:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation>Wyłącz komputer po zakończeniu</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation>Pozostały czas:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
@@ -5046,22 +5937,22 @@
         <translation>Niski</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation>Wstrzymaj / Przerwij</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-218"/>
         <source>Main</source>
         <translation>Główne</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+15"/>
         <source>Phase:</source>
         <translation>Faza:</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+183"/>
         <source>Minimize to Tray</source>
         <translation>Minimalizuj do zasobnika</translation>
     </message>
@@ -5089,7 +5980,7 @@
         <translation>Dostosuj kontrast, jasność, nasycenie i gammę.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Resetuj</translation>
     </message>
@@ -5108,17 +5999,17 @@
         <translation>Jasność</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Gamma&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>Nasycenie</translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+122"/>
         <source>Blue</source>
         <translation>Niebieski</translation>
     </message>
@@ -5142,11 +6033,6 @@
         <source>Green</source>
         <translation>Zielony</translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5167,9 +6053,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Zanikanie</translation>
@@ -5415,7 +6790,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation>Domyślna</translation>
     </message>
@@ -5486,7 +6861,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dwa wątki</translation>
     </message>
     <message>
@@ -5618,7 +6993,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5669,7 +7044,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dwa wątki</translation>
     </message>
     <message>
@@ -6131,7 +7506,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Zapisywanie mpeg PS (ff)</translation>
     </message>
@@ -6192,12 +7567,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Swobodny</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Format muksowania</translation>
     </message>
@@ -6235,7 +7610,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Zapisywanie mpeg TS (ff)</translation>
     </message>
@@ -6256,9 +7631,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6352,6 +7790,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6866,16 +8476,11 @@
         <source>Saturation</source>
         <translation>Saturacja</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6885,7 +8490,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
@@ -6909,6 +8514,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6961,8 +8642,8 @@
         <translation>Usuń duplikat:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>Pełna</translation>
     </message>
@@ -6979,8 +8660,8 @@
         <translation>Bardzo szybko</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>Zmiana liczby _klatek na sekundę:</translation>
     </message>
@@ -7156,12 +8837,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation>_Kwantyzator:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7171,9 +8852,13 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>Przestrzeń barw:</translation>
+        <translation type="vanished">Przestrzeń barw:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7328,7 +9013,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>_Przepływność:</translation>
     </message>
@@ -7503,6 +9188,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7523,7 +9264,7 @@
         <translation>Menedżer filtrów wideo</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+106"/>
         <source>Interlacing</source>
         <translation>Przeplot</translation>
     </message>
@@ -7553,11 +9294,16 @@
         <translation>&lt;big&gt;&lt;b&gt;Dostępne filtry&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation>Transformacja</translation>
     </message>
     <message>
+        <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+27"/>
         <source>Noise</source>
         <translation>Szum</translation>
@@ -7596,12 +9342,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Obrazy Matroska</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Klastry Matroska</translation>
     </message>
@@ -7707,7 +9453,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8079,12 +9825,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Wystąpił problem podczas czytania nagłówków SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8092,7 +9839,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Nie wspierane</translation>
     </message>
@@ -8127,7 +9874,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Zapisywanie MP4</translation>
     </message>
@@ -8142,6 +9889,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Format muksowania</translation>
@@ -8272,7 +10024,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
@@ -8297,7 +10049,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8382,7 +10139,7 @@
         <translation>Podgląd. Kliknij powyższy obrazek, aby zgrubnie ustawić współrzędne bloku</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Możesz zmienić rozmiar czerwonego prostokąta za pomocą uchwytów</translation>
     </message>
@@ -8413,22 +10170,17 @@
         <translation>Msharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Maska</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Natężenie</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Próg</translation>
     </message>
@@ -8438,7 +10190,7 @@
         <translation>Wysoka jakość</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8446,22 +10198,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Nie można przejść do następnej klatki kluczowej</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Nie można przejść do poprzedniej klatki kluczowej</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
@@ -8570,9 +10322,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Zdeformowany nagłówek</translation>
     </message>
@@ -8585,7 +10337,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8658,18 +10410,35 @@
         <translation>Obraz</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Liczba klatek/sekundę:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Całkowity czas trwania:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>Proporcje obrazu:</translation>
     </message>
@@ -8684,7 +10453,27 @@
         <translation>Kod 4CC kodeka:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>Dźwięk</translation>
     </message>
@@ -8714,31 +10503,23 @@
         <translation>Kodek:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Etykieta</translation>
+        <translation type="vanished">Etykieta</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Extra Video Properties</source>
-        <translation>Dodatkowe właściwości wideo</translation>
+        <translation type="vanished">Dodatkowe właściwości wideo</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Rozmiar dodatkowych danych:</translation>
+        <translation type="vanished">Rozmiar dodatkowych danych:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Dodatkowe dane:</translation>
+        <translation type="vanished">Dodatkowe dane:</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
         <translation>Kopiuj do schowka</translation>
     </message>
@@ -8770,7 +10551,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Wybierz plik dźwiękowy</translation>
     </message>
@@ -8791,7 +10572,7 @@
         <translation>Niektóre ścieżki są używane wielokrotnie</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Ścieżka </translation>
     </message>
@@ -8806,7 +10587,7 @@
         <translation>Plik </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>.... Dodaj ścieżkę dźwiękową</translation>
     </message>
@@ -8831,22 +10612,26 @@
         <translation>Aby wykonać to działanie wymagane są uprawnienia administracyjne.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Pierwszy przebieg</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pass 1</source>
-        <translation>Przebieg 1</translation>
+        <translation type="vanished">Przebieg 1</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Kodowanie...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kodowanie jest wstrzymane. Chcesz je wznowić, czy przerwać?</translation>
     </message>
@@ -8884,12 +10669,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Dostępna jest nowa wersja&lt;/b&gt;&lt;br&gt;Wersja %1&lt;br&gt;Wydana %2&lt;br&gt;Możesz pobrać ją tutaj:&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Możesz wyłączyć automatyczne aktualizacje w preferencjach.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Ostatnie pliki</translation>
     </message>
@@ -8899,12 +10684,17 @@
         <translation>Ostatnie projekty</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Odtwórz/Zatrzymaj</translation>
     </message>
@@ -8939,6 +10729,16 @@
         <translation>Ustaw znacznik końcowy</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Pierwsza klatka</translation>
@@ -8969,24 +10769,34 @@
         <translation>Do przodu jedna minuta</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Aplikacja napotkała fatalny problem!
 Bieżąca edycja została zapisana i zostanie ponownie załadowana przy następnym uruchomieniu</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -9044,7 +10854,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9144,28 +10954,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Częściowy</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Ten filtr nie może zostać zastosowany częściowo</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
@@ -9175,22 +10986,63 @@
         <translation>Przesuń w górę</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Przesuń w dół</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Zastosuj częściowo</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>Wczytaj filtry wideo...</translation>
     </message>
@@ -9208,7 +11060,7 @@
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>Wznów</translation>
     </message>
@@ -9235,8 +11087,23 @@
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9256,94 +11123,79 @@
         <translation>Stereo</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Video</source>
-        <translation>Obraz</translation>
+        <translation type="vanished">Obraz</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>Kod 4CC kodeka:	</translation>
+        <translation type="vanished">Kod 4CC kodeka:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Rozmiar obrazu:	</translation>
+        <translation type="vanished">Rozmiar obrazu:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>Proporcje obrazu:</translation>
+        <translation type="vanished">Proporcje obrazu:</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>Liczba kl/sek.:	</translation>
+        <translation type="vanished">Liczba kl/sek.:	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Całkowita długość:</translation>
+        <translation type="vanished">Całkowita długość:</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Dodatkowe właściwości wideo</translation>
+        <translation type="vanished">Dodatkowe właściwości wideo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>Rozmiar dodatkowych danych:</translation>
+        <translation type="vanished">Rozmiar dodatkowych danych:</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>Dodatkowe dane:	</translation>
+        <translation type="vanished">Dodatkowe dane:	</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>Dźwięk</translation>
+        <translation type="vanished">Dźwięk</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>Kodek:		</translation>
+        <translation type="vanished">Kodek:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Kanały:		</translation>
+        <translation type="vanished">Kanały:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>Przepływność:	</translation>
+        <translation type="vanished">Przepływność:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Częstotliwość:	</translation>
+        <translation type="vanished">Częstotliwość:	</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation>Brak dźwięku</translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
@@ -9418,6 +11270,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9438,7 +11347,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9499,7 +11408,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Tryb:</translation>
     </message>
@@ -9509,12 +11418,12 @@
         <translation>_Nowa liczba klatek na sekundę:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>Zmień liczbę klatek/s</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Własna</translation>
     </message>
@@ -9544,7 +11453,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>Konwertowanie FPS</translation>
     </message>
@@ -9553,16 +11462,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>Zmień i wymuś FPS. Zachowaj długość i synchronizację.</translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Szerokość i wysokość nie mogą być nieparzyste</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>Zmiana rozmiaru</translation>
     </message>
@@ -9602,7 +11531,7 @@
         <translation>200%</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation>Dwuliniowa (bilinear)</translation>
     </message>
@@ -9612,7 +11541,7 @@
         <translation>Dwusześcienna (bicubic)</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation>Proporcje obrazu</translation>
     </message>
@@ -9696,7 +11625,17 @@
         <translation>0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Metoda skalowania:</translation>
     </message>
@@ -9710,12 +11649,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Obrót</translation>
     </message>
@@ -9730,6 +11674,11 @@
         <translation>90 stopni</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 stopni</translation>
@@ -9740,24 +11689,26 @@
         <translation>270 stopni</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>_Kąt:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9773,7 +11724,17 @@
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>Wstecz jedna minuta</translation>
     </message>
@@ -9859,17 +11820,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Nieruchomy obraz</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Duplikuj klatki przez zadany czas.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>Cza_s początkowy:</translation>
     </message>
@@ -10048,7 +12009,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation> g</translation>
     </message>
@@ -10066,7 +12027,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10085,7 +12046,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Istnieje kilka plików z sekwencyjnymi nazwami plików. Czy wszystkie powinny być załadowane?</translation>
@@ -10654,6 +12615,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Saving Webm</source>
@@ -10690,7 +12733,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10702,17 +12745,27 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>brak</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Własne</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Docelowa przepływność:</translation>
     </message>
@@ -10748,7 +12801,7 @@
         <translation>Średnia przepływność:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12067,7 +14120,7 @@
         <translation type="unfinished">Własna</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Docelowa przepływność:</translation>
     </message>
@@ -12180,7 +14233,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>Konfiguracja x265</translation>
     </message>
     <message>
@@ -13408,7 +15461,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dwa wątki</translation>
     </message>
     <message>
@@ -13575,4 +15628,167 @@
         <translation>yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -518,7 +518,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -615,12 +615,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -639,6 +639,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -648,7 +650,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -678,7 +680,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -779,12 +781,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,6 +900,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1051,7 +1073,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+473"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+511"/>
         <source>Output</source>
         <translation type="unfinished">Saida</translation>
     </message>
@@ -1099,7 +1121,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-77"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-66"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,7 +1181,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1185,7 +1207,7 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1204,7 +1226,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1225,16 +1247,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1255,7 +1280,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1301,7 +1326,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1310,7 +1335,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1391,7 +1416,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1412,7 +1437,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-184"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1432,12 +1457,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,7 +1482,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1537,7 +1562,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1579,7 +1624,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1604,7 +1649,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1619,47 +1669,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Caching of decoded pictures</source>
+        <location line="+6"/>
+        <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Cache size:</source>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>XVideo (best)</source>
+        <location line="+4"/>
+        <source>Avisynth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>VDPAU (best)</source>
+        <location line="+187"/>
+        <source>HDR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>DXVA2 (best)</source>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>OpenGL (best)</source>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
+        <location line="-178"/>
+        <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>SDL (good)</source>
+        <location line="+1"/>
+        <source>_Cache size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+25"/>
         <source>Video _display:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1731,7 +1786,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1741,12 +1796,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-64"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1756,12 +1811,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+6"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1771,19 +1836,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1793,7 +1861,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1803,8 +1871,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+12"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+262"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1927,6 +2015,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1958,6 +2056,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
@@ -2034,6 +2137,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2068,6 +2181,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2093,13 +2246,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+1571"/>
+        <location filename="../../common/gui_main.cpp" line="+1621"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2113,8 +2266,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+49"/>
+        <location line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2203,7 +2356,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2228,13 +2381,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+114"/>
         <source>Not coded in this version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+73"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2254,7 +2407,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2280,7 +2433,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2356,7 +2509,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2407,19 +2560,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2454,7 +2607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2526,7 +2679,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+113"/>
         <source>Oops</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2536,7 +2689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2735,14 +2888,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-251"/>
+        <location filename="../../common/gui_savenew.cpp" line="-253"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
-        <location line="+170"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -2771,20 +2924,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2812,17 +2965,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-113"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3108,6 +3263,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3187,6 +3347,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3212,7 +3377,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3319,7 +3484,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3367,6 +3532,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3395,6 +3609,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3441,6 +3712,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3547,6 +3960,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3578,9 +4099,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3598,35 +4145,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3722,12 +4274,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3775,7 +4322,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+13"/>
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3787,7 +4334,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-169"/>
+        <location line="-175"/>
         <source>Hardcode ASS/SSA/SRT subtitles using libass.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3807,12 +4354,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3883,6 +4430,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4035,7 +4602,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4091,17 +4658,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4130,6 +4688,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4172,7 +4796,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4239,6 +4863,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4396,8 +5080,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4407,8 +5091,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4437,12 +5121,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4508,7 +5187,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4518,7 +5197,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4530,12 +5209,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4550,13 +5230,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4567,13 +5247,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4583,17 +5263,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4639,7 +5319,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4658,6 +5338,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4749,6 +5465,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4825,6 +5657,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4835,14 +5680,14 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+67"/>
-        <location line="+247"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+50"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Nenhuma</translation>
     </message>
     <message>
-        <location line="-309"/>
+        <location line="-341"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4853,22 +5698,22 @@
     </message>
     <message>
         <location line="+32"/>
-        <location line="+254"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-303"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-31"/>
+        <location line="+24"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+11"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4908,7 +5753,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5015,7 +5870,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5029,12 +5884,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5044,7 +5899,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,11 +5923,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5093,9 +5943,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5341,7 +6680,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5392,7 +6731,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5544,7 +6883,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5575,7 +6914,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6049,7 +7388,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6102,12 +7441,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6145,7 +7484,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6166,9 +7505,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6260,6 +7662,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6738,16 +8312,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6757,7 +8326,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6781,6 +8350,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6833,8 +8478,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6851,8 +8496,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7028,7 +8673,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7038,13 +8683,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_ColorSpace:</source>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7200,7 +8845,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7366,6 +9011,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7386,7 +9087,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7396,12 +9097,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7459,12 +9165,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7570,7 +9276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7934,12 +9640,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7947,7 +9654,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7982,7 +9689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7997,6 +9704,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8127,7 +9839,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8152,7 +9864,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8237,7 +9954,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8268,22 +9985,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8293,7 +10005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8301,22 +10013,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8425,9 +10137,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8440,7 +10152,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8509,27 +10221,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
+        <location line="+66"/>
+        <source>Frame Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-49"/>
-        <source>Frame Rate:</source>
+        <location line="-14"/>
+        <location line="+142"/>
+        <source>Total Duration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-170"/>
         <location line="+14"/>
-        <location line="+135"/>
-        <source>Total Duration:</source>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8544,22 +10264,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Extra Video Properties</source>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
-        <source>ExtraDataSize:</source>
+        <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
+        <location line="+7"/>
+        <source>Extradata:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8621,7 +10346,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8642,7 +10367,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8657,7 +10382,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8682,22 +10407,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8735,12 +10460,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8750,12 +10475,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8790,6 +10520,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8820,23 +10560,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8893,7 +10643,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8993,28 +10743,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,169 +10775,154 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <source>Make partial</source>
+        <source>DISABLED </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
-        <source>Press %s to accept the dialog</source>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
-        <source>Load video filters..</source>
+        <location line="+164"/>
+        <source>Move down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Save video filters..</source>
+        <location line="+2"/>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>qprocessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
-        <source>Unknown</source>
+        <location line="+2"/>
+        <location line="+80"/>
+        <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
-        <source>_Resume</source>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The processing is paused.</source>
+        <location line="+74"/>
+        <source>Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Cancel it ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>qprops</name>
-    <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
-        <source>No</source>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Yes</source>
+        <location line="+3"/>
+        <source>Make global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>%2.3f fps</source>
+        <location line="+146"/>
+        <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
+        <location line="+148"/>
+        <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <location line="-55"/>
-        <location line="+2"/>
-        <source>Audio (%n active track(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+83"/>
-        <source>Video</source>
+        <location line="+15"/>
+        <source>Save video filters..</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>qprocessing</name>
     <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+69"/>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
+        <location line="+96"/>
+        <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
+        <location line="+1"/>
+        <source>The processing is paused.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
+        <location line="+1"/>
+        <source>Cancel it ?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>qprops</name>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_props.cpp" line="+26"/>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
+        <location line="+0"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
+        <location line="+36"/>
+        <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
+        <location line="+4"/>
+        <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Audio</source>
+        <location line="+4"/>
+        <source>%d kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
+        <location line="+5"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
+    <message numerus="yes">
+        <location line="+24"/>
         <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
+        <source>Audio (%n active track(s))</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9266,6 +11002,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9286,7 +11079,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9347,7 +11140,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9377,7 +11170,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9387,7 +11180,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,6 +11205,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
@@ -9405,12 +11218,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9514,7 +11327,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9538,43 +11361,48 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+206"/>
         <source>None</source>
         <translation type="unfinished">Nenhuma</translation>
     </message>
     <message>
-        <location line="-156"/>
-        <location line="+163"/>
+        <location line="-154"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+156"/>
+        <location line="+154"/>
         <source>90 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>90°</source>
+        <source>90° clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>180 degrees</source>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>180°</source>
+        <location line="-1"/>
+        <source>180 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9583,11 +11411,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>270°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished"></translation>
@@ -9601,7 +11424,17 @@
         <translation type="unfinished">Visualizar</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9687,17 +11520,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9876,7 +11709,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9894,7 +11727,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9913,7 +11746,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10482,6 +12315,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10507,7 +12422,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10518,17 +12433,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10564,7 +12489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11881,7 +13806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11993,7 +13918,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13022,7 +14947,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13245,4 +15170,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -4,94 +4,97 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
-        <translation type="unfinished">Ошибка при открытии %s!</translation>
+        <translation>Ошибка при открытии %s!</translation>
     </message>
     <message>
         <location line="-36"/>
         <source>Cannot find a demuxer for %s</source>
-        <translation type="unfinished">Невозможно найти демультиплексор для %s</translation>
+        <translation>Невозможно найти демультиплексор для %s</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
-        <translation type="unfinished">ширина</translation>
+        <translation>ширина</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>%sheight</source>
-        <translation type="unfinished">%sвысота</translation>
+        <translation>%sвысота</translation>
     </message>
     <message>
         <location line="+1"/>
         <source> and </source>
-        <translation type="unfinished"> и </translation>
+        <translation> и </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%sdifferent between first and this video stream</source>
-        <translation type="unfinished"> у первого видеопотока %s от этого</translation>
+        <translation> у первого видеопотока %s от этого</translation>
     </message>
     <message>
         <location line="+1"/>
         <source> are </source>
-        <translation type="unfinished">отличны</translation>
+        <translation> отличны </translation>
     </message>
     <message>
         <location line="+0"/>
         <source> is </source>
-        <translation type="unfinished">отлична</translation>
+        <translation> отлична </translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
-        <translation type="unfinished">Видеопотоки различного разрешения не объединяются. Использование частичного фильтра видео не исправит эту проблему. Выход следующий:
-1) &quot;изменить размер&quot; / &quot;добавить рамки&quot; / &quot;обрезать&quot; потоки, приведя их к одному разрешению
+        <translation>Видеопотоки различного разрешения не объединяются. Использование частичного фильтра видео не исправит эту проблему. Выход следующий:
+1) «изменить размер» / «добавить рамки» / «обрезать» потоки, приведя их к единому разрешению
 2) склеить их вместе</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>The width of the video %u px exceeds maximum supported width %u.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ширина видео %u px превышает максимально поддерживаемую в %u.
+</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The height of the video %u px exceeds maximum supported height %u.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Высота видео %u px превышает максимально поддерживаемую в %u.
+</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Video dimensions %ux%u exceed maximum supported size %ux%u.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Разрешение видео %ux%u превышает максимально поддерживаемое в %ux%u.
+</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Unsupported size</source>
-        <translation type="unfinished"></translation>
+        <translation>Неподдерживаемый размер</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
-        <translation type="unfinished">Проверка правильности временных меток...</translation>
+        <translation>Проверка правильности временных меток...</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
-        <translation>Это видео содержит двунаправленные кадры (B-frames), в то время как метки времени показа (PTS) либо отсутствуют, либо монотонно возрастают. Авидемукс может попытаться восстановить правильные PTS путём декодирования всего видео. Это может занять много времени. Продолжить?</translation>
+        <translation>Это видео содержит двунаправленные кадры (B-frames), в то время как метки времени показа (PTS) либо отсутствуют, либо монотонно возрастают. Avidemux может попытаться восстановить правильные PTS путём декодирования всего видео. Это может занять много времени. Продолжить?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
-        <translation>Декодирую видео...</translation>
+        <translation>Декодирование видео...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -99,10 +102,10 @@
 If you just copy the video without reencoding,
  you should keep them.
 Drop timing informations ?</source>
-        <translation type="unfinished">Некоторые тайминги неправильны.
+        <translation>Отдельные тайминги неправильны.
 Это случается при использовании некоторых программ для видеозахвата.
 При перекодировке эта информация будет сброшена,
- иначе произойдет потеря кадров или порча видео.
+ иначе произойдёт потеря кадров или порча видео.
 При прямом копировании видео без его перекодировки
  они сохранятся.
 Сбросить информацию о таймингах?</translation>
@@ -113,27 +116,27 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/calculator.ui" line="+16"/>
         <source>Calculator</source>
-        <translation type="unfinished">Калькулятор</translation>
+        <translation>Калькулятор</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>Duration:</source>
-        <translation type="unfinished">Длительность:</translation>
+        <translation>Длительность:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Custom</source>
-        <translation type="unfinished">Вручную</translation>
+        <translation>Вручную</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Custom Size:</source>
-        <translation type="unfinished">Размер:</translation>
+        <translation>Ручной размер:</translation>
     </message>
     <message>
         <location line="+196"/>
         <source>Video Size:</source>
-        <translation type="unfinished">Размер видео:</translation>
+        <translation>Размер видео:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -142,73 +145,72 @@
         <location line="+68"/>
         <location line="+18"/>
         <source>0</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="-101"/>
         <source>Total Size:</source>
-        <translation type="unfinished">Общий размер:</translation>
+        <translation>Общий размер:</translation>
     </message>
     <message>
         <location line="-416"/>
         <source>Target</source>
-        <translation type="unfinished">Цель</translation>
+        <translation>Цель</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>AVI</source>
-        <translation type="unfinished"></translation>
+        <translation>AVI</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>OGM</source>
-        <translation type="unfinished"></translation>
+        <translation>OGM</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>MPEG</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Medium:</source>
-        <translation type="unfinished"></translation>
+        <translation>Среднее:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Format:</source>
-        <translation type="unfinished"></translation>
+        <translation>Формат:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>1 x 80 minute CD</source>
-        <translation type="unfinished">1 CD (80 мин)</translation>
+        <translation>1 CD (80 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2 x 80 minute CD</source>
-        <translation type="unfinished">2 CD (80 мин)</translation>
+        <translation>2 CD (80 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1 x 74 minute CD</source>
-        <translation type="unfinished">1 CD (74 мин)</translation>
+        <translation>1 CD (74 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2 x 74 minute CD</source>
-        <translation type="unfinished">2 CD (74 мин)</translation>
+        <translation>2 CD (74 мин)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>DVD-5</source>
-        <translation type="unfinished"></translation>
+        <translation>DVD-5</translation>
     </message>
     <message>
         <location line="+86"/>
@@ -216,59 +218,59 @@
         <location line="+27"/>
         <location line="+34"/>
         <source>MB</source>
-        <translation type="unfinished">Мб</translation>
+        <translation>МБ</translation>
     </message>
     <message>
         <location line="-217"/>
         <source>Audio Bitrate</source>
-        <translation type="unfinished">Битрейт Аудио</translation>
+        <translation>Битрейт аудио</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Track 1:</source>
-        <translation type="unfinished">Дорожка 1:</translation>
+        <translation>Дорожка 1:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+37"/>
         <location line="+232"/>
         <source>kbps</source>
-        <translation type="unfinished">Кб/с</translation>
+        <translation>кбит/с</translation>
     </message>
     <message>
         <location line="-246"/>
         <source>Track 2:</source>
-        <translation type="unfinished">Дорожка 2:</translation>
+        <translation>Дорожка 2:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Result</source>
-        <translation type="unfinished">Результат</translation>
+        <translation>Результат</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Audio Size:</source>
-        <translation type="unfinished">Размер аудио:</translation>
+        <translation>Размер аудио:</translation>
     </message>
     <message>
         <location line="+188"/>
         <source>Bits Per Pixel:</source>
-        <translation type="unfinished">Биты на пиксель:</translation>
+        <translation>Бит на пиксель:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Video Bitrate:</source>
-        <translation type="unfinished">Битрейт видео:</translation>
+        <translation>Битрейт видео:</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>OK</source>
-        <translation type="unfinished">ОК</translation>
+        <translation>Да</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
 </context>
 <context>
@@ -276,17 +278,17 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+64"/>
         <source>Indexing</source>
-        <translation type="unfinished">Индексирование</translation>
+        <translation>Индексация</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Time Left : Infinity</source>
-        <translation type="unfinished">Осталось времени : бесконечно</translation>
+        <translation>Осталось времени: бесконечно</translation>
     </message>
     <message>
         <location line="+1"/>
         <source># Images :</source>
-        <translation type="unfinished"># изображений :</translation>
+        <translation># изображений:</translation>
     </message>
 </context>
 <context>
@@ -297,7 +299,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Configure</source>
-        <translation type="unfinished">&amp;Настройка</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location line="-116"/>
@@ -305,12 +307,12 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Filters</source>
-        <translation type="unfinished">&amp;Фильтры</translation>
+        <translation>Фильтры</translation>
     </message>
     <message>
         <location line="-164"/>
         <source>Audio Tracks Configuration</source>
-        <translation type="unfinished">Настройка аудиодорожек</translation>
+        <translation>Настройки аудиодорожек</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -323,7 +325,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Enabled</source>
-        <translation type="unfinished">&amp;Включена</translation>
+        <translation>Включена</translation>
     </message>
     <message>
         <location line="-89"/>
@@ -346,57 +348,57 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_ocr/ocr.ui" line="+13"/>
         <source>Dialog</source>
-        <translation type="unfinished">Диалог</translation>
+        <translation>Диалог</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Skip Glyph</source>
-        <translation type="unfinished">Пропустить символ</translation>
+        <translation>Пропустить символ</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ignore</source>
-        <translation type="unfinished">Игнорировать</translation>
+        <translation>Игнорировать</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>Timecode:</source>
-        <translation type="unfinished">Время:</translation>
+        <translation>Временной код:</translation>
     </message>
     <message>
         <location line="-76"/>
         <source>Calibrate</source>
-        <translation type="unfinished">Калибровать</translation>
+        <translation>Калибровать</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Skip All</source>
-        <translation type="unfinished">Пропустить все</translation>
+        <translation>Пропустить все</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Ok</source>
-        <translation type="unfinished">ОК</translation>
+        <translation>Да</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>00:00:00/000</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00/000</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>0/0</source>
-        <translation type="unfinished"></translation>
+        <translation>0/0</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Nb Lines :</source>
-        <translation type="unfinished">№ линий :</translation>
+        <translation>№ линий:</translation>
     </message>
 </context>
 <context>
@@ -419,7 +421,7 @@
     <message>
         <location line="+28"/>
         <source>ProcessImages</source>
-        <translation>Количество изображений</translation>
+        <translation>Изображений</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -442,7 +444,7 @@
     <message>
         <location filename="../ADM_jobs/src/uiProgress.ui" line="+17"/>
         <source>Progress</source>
-        <translation type="unfinished">Прогресс</translation>
+        <translation>Прогресс</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -457,12 +459,12 @@
     <message>
         <location line="+7"/>
         <source>File being written </source>
-        <translation type="unfinished">Файл записывается</translation>
+        <translation>Файл записывается </translation>
     </message>
     <message>
         <location line="+7"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -480,27 +482,27 @@
     <message>
         <location line="+2"/>
         <source>SBR enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>SBR включён</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Afterburner</source>
-        <translation type="unfinished"></translation>
+        <translation>Улучшенный алгоритм (afterburner)</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>FDK-AAC Configuration</source>
-        <translation type="unfinished">Настройка FDK-AAC</translation>
+        <translation>Настройки FDK-AAC</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+475"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+476"/>
         <location line="+169"/>
         <source>Copy</source>
-        <translation type="unfinished">Копировать</translation>
+        <translation>Копировать</translation>
     </message>
     <message>
         <location line="-294"/>
@@ -508,68 +510,68 @@
         <location line="+169"/>
         <location line="+181"/>
         <source>Configure</source>
-        <translation type="unfinished">Настройка</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location line="-334"/>
         <location line="+169"/>
         <source>Filters</source>
-        <translation type="unfinished">Фильтры</translation>
+        <translation>Фильтры</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>&amp;Shift:</source>
-        <translation type="unfinished">Сдв&amp;иг:</translation>
+        <translation>Сдв&amp;иг:</translation>
     </message>
     <message>
-        <location line="+614"/>
+        <location line="+662"/>
         <source>Time:</source>
-        <translation type="unfinished">Время:</translation>
+        <translation>Время:</translation>
     </message>
     <message>
-        <location line="-1208"/>
+        <location line="-1257"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">Сп&amp;равка</translation>
+        <translation>Сп&amp;равка</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Vi&amp;deo</source>
-        <translation type="unfinished">Ви&amp;део</translation>
+        <translation>Ви&amp;део</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
-        <translation type="unfinished">&amp;Аудио</translation>
+        <translation>&amp;Аудио</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;File</source>
-        <translation type="unfinished">&amp;Файл</translation>
+        <translation>&amp;Файл</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>&amp;Tools</source>
-        <translation type="unfinished">&amp;Инструменты</translation>
+        <translation>&amp;Инструменты</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Правка</translation>
+        <translation>&amp;Правка</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;View</source>
-        <translation type="unfinished">&amp;Вид</translation>
+        <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
-        <translation type="unfinished">&amp;Своё</translation>
+        <translation>&amp;Мои скрипты</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>&amp;Go</source>
-        <translation type="unfinished">Перех&amp;од</translation>
+        <translation>Перех&amp;од</translation>
     </message>
     <message>
         <location line="+408"/>
@@ -577,47 +579,57 @@
         <translation> (0 дорожек)</translation>
     </message>
     <message>
-        <location line="+1204"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation>Перейти к предыдущему разрезу [SHIFT+DOWN]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation>Перейти к следующему разрезу [SHIFT+UP]</translation>
+    </message>
+    <message>
+        <location line="+646"/>
         <source>&amp;Open...</source>
-        <translation type="unfinished">&amp;Открыть...</translation>
+        <translation>&amp;Открыть...</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&amp;Information...</source>
-        <translation type="unfinished">&amp;Информация...</translation>
+        <translation>&amp;Информация...</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Save &amp;Video...</source>
-        <translation type="unfinished">Сохранить &amp;Видео...</translation>
+        <translation>Сохранить &amp;видео...</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Save Video</source>
-        <translation type="unfinished">Сохранить видео</translation>
+        <translation>Сохранить видео</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>&amp;Load/Run Project...</source>
-        <translation type="unfinished">&amp;Загрузить/Запустить проект...</translation>
+        <translation>&amp;Загрузить/запустить проект...</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Load/Run Project</source>
-        <translation type="unfinished">Загрузить/запустить проект</translation>
+        <translation>Загрузить/запустить проект</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Save &amp;Project</source>
-        <translation type="unfinished">Сохранить &amp;Проект</translation>
+        <translation>Сохранить &amp;проект</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+3"/>
         <source>Save Project</source>
-        <translation type="unfinished">Сохранить проект</translation>
+        <translation>Сохранить проект</translation>
     </message>
     <message>
         <source>&amp;Calculator...</source>
@@ -626,104 +638,104 @@
     <message>
         <location line="+15"/>
         <source>&amp;Input</source>
-        <translation type="unfinished">&amp;Вход</translation>
+        <translation>&amp;Вход</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>&amp;Output</source>
-        <translation type="unfinished">&amp;Выход</translation>
+        <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+120"/>
         <source>Si&amp;de</source>
-        <translation type="unfinished">С&amp;боку</translation>
+        <translation>С&amp;боку</translation>
     </message>
     <message>
         <location line="-12"/>
         <source>&amp;Top</source>
-        <translation type="unfinished">&amp;Сверху</translation>
+        <translation>&amp;Сверху</translation>
     </message>
     <message>
-        <location line="-1703"/>
+        <location line="-1765"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Декодер видео&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1138"/>
+        <location line="+1186"/>
         <source>Frame type:</source>
-        <translation type="unfinished">Тип кадра:</translation>
+        <translation>Тип кадра:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
-        <translation type="unfinished">&amp;Отделить</translation>
+        <translation>&amp;Отделить</translation>
     </message>
     <message>
-        <location line="-1926"/>
+        <location line="-1989"/>
         <source>Avidemux</source>
-        <translation type="unfinished"></translation>
+        <translation>Avidemux</translation>
     </message>
     <message>
         <location line="+114"/>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished">&amp;Панели</translation>
+        <translation>&amp;Панели</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
-        <translation type="unfinished">Ав&amp;томатика</translation>
+        <translation>Ав&amp;томатика</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>&amp;Recent</source>
-        <translation type="unfinished">&amp;Недавно</translation>
+        <translation>&amp;Недавнее</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Codec O&amp;ptions</source>
-        <translation type="unfinished">На&amp;стройки кодека</translation>
+        <translation>Па&amp;раметры кодека</translation>
     </message>
     <message>
         <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
-        <translation type="unfinished"></translation>
+        <translation>XXXX</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Видео на выходе&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Видео на выходе&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+160"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Аудио на выходе&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Аудио на выходе&lt;/b&gt;</translation>
     </message>
     <message>
         <location line="+187"/>
         <source>ms</source>
-        <translation type="unfinished">мс</translation>
+        <translation>мс</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Выходной формат&lt;b&gt;</translation>
+        <translation>&lt;b&gt;Выходной формат&lt;b&gt;</translation>
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
-        <translation type="unfinished">&amp;Навигация</translation>
+        <translation>&amp;Навигация</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
-        <translation type="unfinished">Воспроизвести [SPACE]</translation>
+        <translation>Воспроизвести [SPACE]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Play</source>
-        <translation type="unfinished">Воспроизвести</translation>
+        <translation>Воспроизвести</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -735,33 +747,35 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
         <location line="+373"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
-        <translation type="unfinished">Предыдущий кадр [LEFT]</translation>
+        <translation>Предыдущий кадр [LEFT]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to next frame [RIGHT]</source>
-        <translation type="unfinished">Следующий кадр [RIGHT]</translation>
+        <translation>Следующий кадр [RIGHT]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to previous keyframe [DOWN]</source>
-        <translation type="unfinished">Предыдущий ключевой кадр [DOWN]</translation>
+        <translation>Предыдущий ключевой кадр [DOWN]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to next keyframe [UP]</source>
-        <translation type="unfinished">Следующий ключевой кадр [UP]</translation>
+        <translation>Следующий ключевой кадр [UP]</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -774,59 +788,59 @@
         <translation>Поставить метку конца [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
-        <translation type="unfinished">Предыдущий черный кадр</translation>
+        <translation>Предыдущий чёрный кадр</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Search next black frame</source>
-        <translation type="unfinished">Следующий черный кадр</translation>
+        <translation>Следующий чёрный кадр</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to first frame [HOME]</source>
-        <translation type="unfinished">Первый кадр [HOME]</translation>
+        <translation>Первый кадр [HOME]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to last frame [END]</source>
-        <translation type="unfinished">Последний кадр [END]</translation>
+        <translation>Последний кадр [END]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Backward one minute [CTRL+DOWN]</source>
-        <translation type="unfinished">Назад на 1 минуту [CTRL+DOWN]</translation>
+        <translation>Назад на 1 минуту [CTRL+DOWN]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Forward one minute [CTRL+UP]</source>
-        <translation type="unfinished">Вперед на 1 минуту [CTRL+UP]</translation>
+        <translation>Вперёд на 1 минуту [CTRL+UP]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Forward one minute</source>
-        <translation type="unfinished">Вперед на 1 минуту</translation>
+        <translation>Вперёд на 1 минуту</translation>
     </message>
     <message>
         <location line="+77"/>
         <source>00:00:00.000</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00.000</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>/ 00:00:00.000</source>
-        <translation type="unfinished"></translation>
+        <translation>/ 00:00:00.000</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>?</source>
-        <translation type="unfinished"></translation>
+        <translation>?</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Se&amp;lection</source>
-        <translation type="unfinished">&amp;Выбор</translation>
+        <translation>&amp;Выборка</translation>
     </message>
     <message>
         <location line="+57"/>
@@ -847,7 +861,7 @@
         <location line="+3"/>
         <location line="+16"/>
         <source>000000</source>
-        <translation type="unfinished"></translation>
+        <translation>000000</translation>
     </message>
     <message>
         <location line="-3"/>
@@ -857,12 +871,12 @@
     <message>
         <location line="+258"/>
         <source>Play filtered</source>
-        <translation type="unfinished">Включить фильтр</translation>
+        <translation>Воспроизвести с фильтром</translation>
     </message>
     <message>
         <location line="-199"/>
         <source>Vol&amp;ume</source>
-        <translation type="unfinished">&amp;Громкость</translation>
+        <translation>&amp;Громкость</translation>
     </message>
     <message>
         <location line="-37"/>
@@ -872,57 +886,67 @@
     <message>
         <location line="+150"/>
         <source>Audio &amp;Metre</source>
-        <translation type="unfinished">&amp;Аудиометр</translation>
+        <translation>&amp;Аудиометр</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Open Video</source>
-        <translation type="unfinished">Открыть видео</translation>
+        <translation>Открыть видео</translation>
     </message>
     <message>
         <location line="+104"/>
         <source>&amp;Codec Options</source>
-        <translation type="unfinished">&amp;Настройки кодека</translation>
+        <translation>&amp;Параметры кодека</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+Alt+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Ctrl+Alt+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+N</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&amp;Selection</source>
-        <translation type="unfinished">&amp;Выбор</translation>
+        <translation>&amp;Выборка</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+Alt+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&amp;Volume</source>
-        <translation type="unfinished">&amp;Громкость</translation>
+        <translation>&amp;Громкость</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+Alt+V</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+V</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation>&amp;Панель</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation>Ctrl+Alt+B</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&amp;Audio Metre</source>
-        <translation type="unfinished">&amp;Аудиометр</translation>
+        <translation>&amp;Аудиометр</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ctrl+Alt+M</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+M</translation>
     </message>
 </context>
 <context>
@@ -938,17 +962,17 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_shell/shell.ui" line="+17"/>
         <source>Shell</source>
-        <translation type="unfinished">Командная строка</translation>
+        <translation>Командная строка</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Clear</source>
-        <translation type="unfinished">Очистить</translation>
+        <translation>Очистить</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Evaluate</source>
-        <translation type="unfinished">Выполнить</translation>
+        <translation>Выполнить</translation>
     </message>
 </context>
 <context>
@@ -956,27 +980,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vs.ui" line="+14"/>
         <source>VapourSynth Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>Прокси VapourSynth</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Select VS file</source>
-        <translation type="unfinished">Выбрать файл VS</translation>
+        <translation>Выбрать файл VS</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Port to use: </source>
-        <translation type="unfinished"></translation>
+        <translation>Используемый порт: </translation>
     </message>
     <message>
         <location line="+24"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Run!</source>
-        <translation type="unfinished">Запуск!</translation>
+        <translation>Запуск!</translation>
     </message>
 </context>
 <context>
@@ -984,37 +1008,37 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/about.ui" line="+14"/>
         <source>About Avidemux</source>
-        <translation type="unfinished">О программе</translation>
+        <translation>О программе</translation>
     </message>
     <message>
         <location line="+112"/>
         <source>Multi-platform Video Editor</source>
-        <translation type="unfinished">Мультиплатформенный видеоредактор</translation>
+        <translation>Мультиплатформенный видеоредактор</translation>
     </message>
     <message>
         <location line="-19"/>
         <source>Avidemux </source>
-        <translation type="unfinished"></translation>
+        <translation>Avidemux </translation>
     </message>
     <message>
         <location line="+29"/>
         <source>© 2001 - 2021  Mean / eumagga0x2a</source>
-        <translation type="unfinished"></translation>
+        <translation>© 2001 - 2021  Mean / eumagga0x2a</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>http://www.avidemux.org</source>
-        <translation type="unfinished"></translation>
+        <translation>http://www.avidemux.org</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>&amp;License</source>
-        <translation type="unfinished">&amp;Лицензия</translation>
+        <translation>&amp;Лицензия</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Да</translation>
     </message>
 </context>
 <context>
@@ -1022,61 +1046,61 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.cpp" line="+183"/>
         <source>_Left border:</source>
-        <translation type="unfinished">Слева:</translation>
+        <translation>Поле с_лева:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Right border:</source>
-        <translation type="unfinished">Справа:</translation>
+        <translation>Поле с_права:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Top border:</source>
-        <translation type="unfinished">Сверху:</translation>
+        <translation>_Поле с_верху:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Bottom border:</source>
-        <translation type="unfinished">Снизу:</translation>
+        <translation>Поле с_низу:</translation>
     </message>
     <message>
         <location line="+3"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+42"/>
         <source>Add Borders</source>
-        <translation type="unfinished">Добавление полей</translation>
+        <translation>Добавить поля</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Incorrect parameters</source>
-        <translation type="unfinished">Неверные параметры</translation>
+        <translation>Неверные параметры</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>All parameters must be even and within range.</source>
-        <translation type="unfinished">Все параметры должны быть четными и укладываться в пределы</translation>
+        <translation>Все параметры должны быть чётными и укладываться в пределы.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h" line="+1"/>
         <source>Add black borders around the image.</source>
-        <translation type="unfinished">Добавить черные полосы вокруг изображения.</translation>
+        <translation>Добавить чёрные поля вокруг изображения.</translation>
     </message>
 </context>
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Декодировать видео посредством DXVA2 (Windows)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ignore driver blacklist (Intel)</source>
-        <translation type="unfinished"></translation>
+        <translation>Игнорировать чёрный список (Intel)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Игнорировать чёрный список (Intel, HEVC 10bit)</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1084,14 +1108,14 @@
         <translation>Включение аппаратного ускорения отключает многопоточность, изменения требуют перезапуск приложения</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation type="unfinished">_Разрешать нестандартную частоту звука для DVD</translation>
+        <translation>_Разрешать нестандартную частоту звука для DVD</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Revert to saved default output settings on video load</source>
-        <translation type="unfinished">_Сброс настроек вывода при загрузке видео на сохранённые</translation>
+        <translation>_Сбрасывать настройки вывода на сохранённые при загрузке видео</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1111,52 +1135,72 @@
     <message>
         <location line="+6"/>
         <source>Enable all SIMD</source>
-        <translation type="unfinished">Включить все SIMD</translation>
+        <translation>Включить все SIMD</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable MMX</source>
-        <translation type="unfinished">Включить MMX</translation>
+        <translation>Включить MMX</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable MMXEXT</source>
-        <translation type="unfinished">Включить MMXEXT</translation>
+        <translation>Включить MMXEXT</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable 3DNOW</source>
-        <translation type="unfinished">Включить 3DNOW</translation>
+        <translation>Включить 3DNOW</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable 3DNOWEXT</source>
-        <translation type="unfinished">Включить 3DNOWEXT</translation>
+        <translation>Включить 3DNOWEXT</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE</source>
-        <translation type="unfinished">Включить SSE</translation>
+        <translation>Включить SSE</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE2</source>
-        <translation type="unfinished">Включить SSE2</translation>
+        <translation>Включить SSE2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSE3</source>
-        <translation type="unfinished">Включить SSE3</translation>
+        <translation>Включить SSE3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Enable SSSE3</source>
-        <translation type="unfinished">Включить SSSE3</translation>
+        <translation>Включить SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation>Включить SSE4</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation>Включить SSE4.2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation>Включить AVX</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation>Включить AVX2</translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
-        <translation>_Многопоточность декодеров видео в libavcodec:</translation>
+        <translation>_Потоки декодера libavcodec:</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1172,48 +1216,48 @@
         <location line="+5"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+47"/>
         <source>High</source>
-        <translation type="unfinished">Высокий</translation>
+        <translation>Высокий</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Above normal</source>
-        <translation type="unfinished">Выше нормального</translation>
+        <translation>Выше нормального</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Normal</source>
-        <translation type="unfinished">Нормальный</translation>
+        <translation>Нормальный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Below normal</source>
-        <translation type="unfinished">Ниже нормального</translation>
+        <translation>Ниже нормального</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
         <source>Low</source>
-        <translation type="unfinished">Низкий</translation>
+        <translation>Низкий</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
-        <translation type="unfinished">_Кодирование:</translation>
+        <translation>_Приоритет кодирования:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Indexing/unpacking priority:</source>
-        <translation type="unfinished">_Индексация/распаковка:</translation>
+        <translation>_Приоритет индексации/распаковки:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Playback priority:</source>
-        <translation type="unfinished">_Воспроизведение:</translation>
+        <translation>_Приоритет воспроизведения:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Prioritisation</source>
-        <translation type="unfinished">Приоритет</translation>
+        <translation>Приоритет</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1221,7 +1265,12 @@
         <translation>_Сохранять видео в папке с последним прочитанным файлом по умолчанию</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation>_Удалять файлы статистики от первого прохода по умолчанию</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation>Автоматическое объединение расчленённых потоков</translation>
     </message>
@@ -1236,59 +1285,112 @@
         <translation>Размер _фрагментов:</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation>Загрузка изображений</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation>Загружать последовательно именованные файлы в обратном порядке</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation>Avisynth</translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation>HDR</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation>Стандартный метод _тональной компрессии:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation>Целевая пиковая яркость (ниты):</translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation>Использовать _общий кэш</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation>Этот вывод видео лишён аппаратного ускорения</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation>DXVA2</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation>LibVA</translation>
+    </message>
+    <message>
         <source>XVideo (best)</source>
-        <translation type="unfinished">XVideo (лучшее)</translation>
+        <translation type="vanished">XVideo (лучший)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>DXVA2 (best)</source>
-        <translation type="unfinished">DXVA2 (лучшее)</translation>
+        <translation type="vanished">DXVA2 (лучший)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>SDL (good)</source>
-        <translation type="unfinished">SDL (хорошо)</translation>
+        <translation type="vanished">SDL (хороший)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
-        <translation type="unfinished">Метод вывода видео:</translation>
+        <translation>_Метод вывода видео:</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>No alerts</source>
-        <translation type="unfinished">Без сообщений</translation>
+        <translation>Без сообщений</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display only error alerts</source>
-        <translation type="unfinished">Только сообщения об ошибках</translation>
+        <translation>Только сообщения об ошибках</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display all alerts</source>
-        <translation type="unfinished">Все сообщения</translation>
+        <translation>Все сообщения</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Message level:</source>
-        <translation type="unfinished">Уровень сообщений:</translation>
+        <translation>_Уровень сообщений:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Master</source>
-        <translation type="unfinished">Мастер</translation>
+        <translation>Мастер</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Volume control:</source>
-        <translation type="unfinished">Громкость звука управляется:</translation>
+        <translation>_Управление громкостью:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>No downmixing</source>
-        <translation>Никакой</translation>
+        <translation>Без даунмикса</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+49"/>
@@ -1299,7 +1401,7 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Local playback downmixing:</source>
-        <translation>_Даунмиксинг звука при локальном воспроизведении:</translation>
+        <translation>_Даунмикс при локальном воспроизведении:</translation>
     </message>
     <message>
         <source>The options above are effective only for MPEG and DivX with software decoding</source>
@@ -1308,19 +1410,19 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+26"/>
         <source>The options above are effective only for software decoding</source>
-        <translation>Эти параметры действуют только без аппаратного ускорения декодирования</translation>
+        <translation>Эти параметры действуют только для программного декодирования</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
         <source>_Horizontal deblocking</source>
-        <translation type="unfinished">_Горизонтальный деблокинг</translation>
+        <translation>_Горизонтальный деблокинг</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
         <source>_Vertical deblocking</source>
-        <translation type="unfinished">_Вертикальный деблокинг</translation>
+        <translation>_Вертикальный деблокинг</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1328,17 +1430,17 @@
         <translation>_Деинтерлейсинг (ffmpegdeint)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>Default Postprocessing</source>
-        <translation>Постпроцессинг по умолчанию</translation>
+        <translation>Постобработка по умолчанию</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Вывод</translation>
     </message>
@@ -1353,43 +1455,42 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+42"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+112"/>
         <source>Threading</source>
-        <translation type="unfinished">Многопоточность</translation>
+        <translation>Многопоточность</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-37"/>
         <source>Connect to avsproxy</source>
-        <translation type="unfinished">Соединиться с avsproxy</translation>
+        <translation>Соединиться с AvsProxy</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Copy</source>
-        <translation type="unfinished">Копировать</translation>
+        <translation>Копировать</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1402,15 +1503,15 @@
         <translation>Поставить метку B</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <location line="+9"/>
         <source>Filters</source>
-        <translation type="unfinished">Фильтры</translation>
+        <translation>Фильтры</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Play/Stop</source>
-        <translation type="unfinished">Старт/стоп</translation>
+        <translation>Старт/стоп</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1423,96 +1524,96 @@
         <translation>Следующий ключевой кадр</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
-        <translation>Предыдущий черный кадр</translation>
+        <translation>Предыдущий чёрный кадр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Black Frame</source>
-        <translation>Следующий черный кадр</translation>
+        <translation>Следующий чёрный кадр</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-15"/>
         <source>R_esampling (Hz):</source>
-        <translation type="unfinished">Преобразование частоты (Hz):</translation>
+        <translation>Передискретизация (Гц):</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Resampling frequency (Hz)</source>
-        <translation type="unfinished">Новая частота (Hz)</translation>
+        <translation>Новая частота (Гц)</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+25"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-2"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="-20"/>
         <source>_Frame rate change:</source>
-        <translation type="unfinished">Изменить частоту:</translation>
+        <translation>_Изменить кадровую частоту:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>No change</source>
-        <translation type="unfinished">Без изменений</translation>
+        <translation>Без изменений</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mono</source>
-        <translation type="unfinished">Моно</translation>
+        <translation>Моно</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>5 channels</source>
-        <translation type="unfinished">5 каналов</translation>
+        <translation>5 каналов</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>_Gain mode:</source>
-        <translation type="unfinished">Режим:</translation>
+        <translation>_Режим усиления:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>G_ain value:</source>
-        <translation type="unfinished">Значение:</translation>
+        <translation>З_начение усиления:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>_Mixer:</source>
-        <translation type="unfinished">_Микшер</translation>
+        <translation>_Микшер:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
-        <translation type="unfinished">Фильтры аудио</translation>
+        <translation>Фильтры аудио</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+96"/>
         <source>Libraries</source>
-        <translation type="unfinished">Библиотеки</translation>
+        <translation>Библиотеки</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Built-in Support</source>
-        <translation type="unfinished">Поддержка</translation>
+        <translation>Встроенная поддержка</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="+8"/>
         <source>_Job name:</source>
-        <translation type="unfinished">_Имя задания:</translation>
+        <translation>_Имя задания:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Select Video To Write</source>
-        <translation type="unfinished">Выбор видео для записи</translation>
+        <translation>Выбор видео для записи</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save Job</source>
-        <translation type="unfinished">Сохранение задания</translation>
+        <translation>Сохранение задания</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="+64"/>
@@ -1523,15 +1624,15 @@
         <location line="+27"/>
         <location line="+35"/>
         <source>Codec Error</source>
-        <translation type="unfinished">Ошибка аудиокодера</translation>
+        <translation>Ошибка кодека</translation>
     </message>
     <message>
         <location filename="../../common/gui_main.cpp" line="+370"/>
         <source>Not coded in this version</source>
-        <translation type="unfinished">Нет в этой версии</translation>
+        <translation>Нет в этой версии</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Это видео использует кадры прямого доступа без мгновенного обновления декодирования (non-IDR). Счётчик очерёдности показа изображений (POC) на таких ключевых кадрах не сбрасывается. Образовавшиеся точки разреза вставки при сохранении видео в режиме копирования могут привести к задержке воспроизведения из-за нарушенного порядка показа изображений.
@@ -1553,24 +1654,24 @@
 Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
-        <translation type="unfinished">Вы уверены?</translation>
+        <translation>Вы уверены?</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
-        <translation>Вырезать видео целиком недопустимо. Пожалуйста, проверьте положение меток A и B.</translation>
+        <translation>Вырезать всё видео целиком невозможно. Пожалуйста, проверьте положение меток A и B.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Deleting</source>
-        <translation type="unfinished">Удаление</translation>
+        <translation>Удаление</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>It is impossible to delete the entire video. Please recheck the position of markers A and B.</source>
-        <translation>Удалить видео целиком недопустимо. Пожалуйста, проверьте порожение меток A и B.</translation>
+        <translation>Удалить видео целиком недопустимо. Пожалуйста, проверьте положение меток A и B.</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -1625,182 +1726,182 @@
 Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
-        <translation type="unfinished">Ошибка прав доступа</translation>
+        <translation>Ошибка прав доступа</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open &quot;%s&quot;.</source>
-        <translation type="unfinished">Невозможно открыть &quot;%s&quot;.</translation>
+        <translation>Невозможно открыть «%s».</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>File error</source>
-        <translation type="unfinished">Ошибка файла</translation>
+        <translation>Ошибка файла</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>&quot;%s&quot; does not exist.</source>
-        <translation type="unfinished">&quot;%s&quot; не существует.</translation>
+        <translation>«%s» не существует.</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Cannot open project using the video loader.</source>
-        <translation type="unfinished">Невозможно открыть проект, используя загрузчик видео.</translation>
+        <translation>Невозможно открыть проект, используя загрузчик видео.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
-        <translation type="unfinished">Попробуйте &quot;Файл-&gt;Загрузить/Запустить проект...&quot;</translation>
+        <translation>Попробуйте «Файл-&gt;Загрузить/запустить проект...»</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Could not open the file</source>
-        <translation type="unfinished">Невозможно открыть файл</translation>
+        <translation>Невозможно открыть файл</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>Multiple Audio Tracks</source>
-        <translation type="unfinished">Несколько звуковых дорожек</translation>
+        <translation>Несколько звуковых дорожек</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
-        <translation type="unfinished">Файл содержит несколько звуковых дорожек.
-Выберите главную через меню &quot;Аудио-&gt;Главная дорожка&quot;.</translation>
+        <translation>Файл содержит несколько звуковых дорожек.
+Выберите главную через меню «Аудио-&gt;Главная дорожка».</translation>
     </message>
     <message>
         <location line="+106"/>
         <source>Something failed when appending</source>
-        <translation type="unfinished">Ошибка при добавлении видео</translation>
+        <translation>Ошибка при добавлении видео</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
-        <translation type="unfinished">Ошибка при обновлении видео</translation>
+        <translation>Ошибка при обновлении видео (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
-        <translation type="unfinished">Плагин tinypy отсутствует.
+        <translation>Плагин tinyPy отсутствует.
 Возможны проблемы.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
-        <translation type="unfinished">Проверка видео</translation>
+        <translation>Проверка видео</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>No error found</source>
-        <translation type="unfinished">Ошибки не найдены</translation>
+        <translation>Ошибки не найдены</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Errors found in %u frames</source>
-        <translation type="unfinished">Найдены ошибки в %u кадрах</translation>
+        <translation>Найдены ошибки в %u кадрах</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Marker A &gt; B</source>
-        <translation type="unfinished">Метка A &gt; B</translation>
+        <translation>Метка A &gt; B</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot delete the selection.</source>
-        <translation type="unfinished">Невозможно удалить выделенное.</translation>
+        <translation>Невозможно удалить выборку.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>You can&apos;t remove all frames</source>
-        <translation type="unfinished">Вы не можете удалить все кадры.</translation>
+        <translation>Вы не можете удалить все кадры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Something bad happened</source>
-        <translation type="unfinished">Ошибка при открытии файла для записи</translation>
+        <translation>Ошибка при открытии файла для записи</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
-        <translation type="unfinished">Дорожка:</translation>
+        <translation>_Дорожка из видео:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Main Audio Track</source>
-        <translation type="unfinished">Главная звуковая дорожка</translation>
+        <translation>Главная звуковая дорожка</translation>
     </message>
     <message>
         <location line="+264"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
-        <translation type="unfinished">Невозможно соединиться с AvsProxy.
+        <translation>Невозможно соединиться с AvsProxy.
 Он запущен?</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Frame type:</source>
-        <translation type="unfinished">Тип кадра:</translation>
+        <translation>Тип кадра:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame size:</source>
-        <translation type="unfinished">Размер кадра:</translation>
+        <translation>Размер кадра:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Frame Hex Dump</source>
-        <translation type="unfinished">Дамп кадра</translation>
+        <translation>Шестнадцатеричный дамп кадра</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="+36"/>
         <source>Go to Time</source>
-        <translation type="unfinished">Переход</translation>
+        <translation>Переход</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-15"/>
         <source>_Filter strength:</source>
-        <translation type="unfinished">Уровень фильтрации:</translation>
+        <translation>_Уровень фильтрации:</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="-232"/>
         <source>Select Workbench to Save</source>
-        <translation type="unfinished">Выберите файл для сохранения</translation>
+        <translation>Выберите инструмент для сохранения</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+2"/>
         <source>Select File to Save Audio</source>
-        <translation type="unfinished">Выберите файл для сохранения звука</translation>
+        <translation>Выберите файл для сохранения звука</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select JPEG Sequence to Save</source>
-        <translation type="unfinished">Выберите файл для сохранения</translation>
+        <translation>Выберите последовательность JPEG для сохранения</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Select BMP to Save</source>
-        <translation type="unfinished">Выберите файл для сохранения</translation>
+        <translation>Выберите BMP для сохранения</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Select JPEG to Save</source>
-        <translation type="unfinished">Выберите файл для сохранения</translation>
+        <translation>Выберите JPEG для сохранения</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Select File to Save</source>
-        <translation type="unfinished">Укажите файл для сохранения</translation>
+        <translation>Укажите файл для сохранения</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Saving audio</source>
-        <translation type="unfinished">Сохранение аудио</translation>
+        <translation>Сохранение аудио</translation>
     </message>
     <message>
         <location line="+327"/>
@@ -1816,11 +1917,11 @@
     <message>
         <location line="-76"/>
         <source>Saved %d images.</source>
-        <translation>Сохранено изображений: %d</translation>
+        <translation>Сохранено изображений: %d.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -1836,22 +1937,22 @@
         <location line="+20"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="+68"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="-65"/>
         <source>BMP op failed</source>
-        <translation type="unfinished">Ошибка открытия BMP</translation>
+        <translation>Ошибка открытия BMP</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Saving %s as a BMP file failed.</source>
-        <translation type="unfinished">Ошибка сохранения &quot;%s&quot; как BMP.</translation>
+        <translation>Ошибка сохранения «%s» в BMP.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>File %s has been successfully saved.</source>
-        <translation>Файл &quot;%s&quot; успешно сохранен.</translation>
+        <translation>Файл «%s» успешно сохранён.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1861,112 +1962,112 @@
     <message>
         <location line="+0"/>
         <source>File %s was NOT saved correctly.</source>
-        <translation>Файл &quot;%s&quot; сохранен некорректно.</translation>
+        <translation>Файл «%s» сохранён некорректно.</translation>
     </message>
     <message>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+47"/>
         <source>Custom</source>
-        <translation type="unfinished">Вручную</translation>
+        <translation>Вручную</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+3"/>
         <source>Medium</source>
-        <translation type="unfinished">Средне</translation>
+        <translation>Среднее</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Limited Search</source>
-        <translation type="unfinished">Ограниченный поиск</translation>
+        <translation>Ограниченный поиск</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium Search</source>
-        <translation type="unfinished">Средний поиск</translation>
+        <translation>Средний поиск</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Wide Search</source>
-        <translation type="unfinished">Широкий поиск</translation>
+        <translation>Широкий поиск</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
-        <translation type="unfinished">Уровень нормализации</translation>
+        <translation>Усилитель</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-29"/>
         <source>Film to PAL</source>
-        <translation type="unfinished">Из Film в PAL</translation>
+        <translation>Из Film в PAL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL to Film</source>
-        <translation type="unfinished">Из PAL в Film</translation>
+        <translation>Из PAL в Film</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Stereo+surround</source>
-        <translation type="unfinished">Стерео + объемный звук</translation>
+        <translation>Стерео + объёмный звук</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center</source>
-        <translation type="unfinished">Стерео + центр</translation>
+        <translation>Стерео + центр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo+center+surround</source>
-        <translation type="unfinished">Стерео + центр + объемный звук</translation>
+        <translation>Стерео + центр + объёмный звук</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Stereo front+stereo rear</source>
-        <translation type="unfinished">Стерео (передний) + стерео (задний)</translation>
+        <translation>Стерео (передний) + стерео (задний)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>5.1</source>
-        <translation type="unfinished"></translation>
+        <translation>5.1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dolby Pro Logic</source>
-        <translation type="unfinished"></translation>
+        <translation>Dolby Pro Logic</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Dolby Pro Logic II</source>
-        <translation type="unfinished"></translation>
+        <translation>Dolby Pro Logic II</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>DRC</source>
-        <translation type="unfinished"></translation>
+        <translation>Сжатие динамического диапазона (DRC)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Automatic</source>
-        <translation type="unfinished"></translation>
+        <translation>Автоматический</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Manual (dB)</source>
-        <translation type="unfinished">Вручную (дБ)</translation>
+        <translation>Вручную (дБ)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Максимальное значение:</translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
-        <translation type="unfinished">Ремикс:</translation>
+        <source>Remix</source>
+        <translation>Ремикшировать</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mixer</source>
-        <translation type="unfinished">Микшер</translation>
+        <translation>Микшер</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1981,143 +2082,146 @@
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-20"/>
         <source>Fontconfig</source>
-        <translation type="unfinished">Настройка шрифта</translation>
+        <translation>Настройки шрифта</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>FreeType 2</source>
-        <translation type="unfinished"></translation>
+        <translation>FreeType 2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Gettext</source>
-        <translation type="unfinished"></translation>
+        <translation>Gettext</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
-        <translation type="unfinished"></translation>
+        <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
-        <translation type="unfinished"></translation>
+        <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
-        <translation type="unfinished"></translation>
+        <translation>VDPAU</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>x86</source>
-        <translation type="unfinished"></translation>
+        <translation>x86</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>x86-64</source>
-        <translation type="unfinished"></translation>
+        <translation>x86-64</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
-        <translation type="unfinished"></translation>
+        <translation>ЦП</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_gototime.cpp" line="-3"/>
         <source>TimeStamp:</source>
-        <translation type="unfinished">Временная метка:</translation>
+        <translation>Временная метка:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_jobs_save.cpp" line="-3"/>
         <source>Output _File:</source>
-        <translation type="unfinished"></translation>
+        <translation>Выходной _файл:</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-23"/>
         <source>Audio Plugins</source>
-        <translation type="unfinished">Плагины аудио</translation>
+        <translation>Плагины аудио</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Video Encoder Plugins</source>
-        <translation type="unfinished">Плагины видеокодеков</translation>
+        <translation>Плагины видеокодеков</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Video Encoder</source>
-        <translation type="unfinished">Видеокодек</translation>
+        <translation>Видеокодек</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Decoder Plugins</source>
-        <translation type="unfinished">Плагины декодеров видео</translation>
+        <translation>Плагины декодеров видео</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Video Decoder</source>
-        <translation type="unfinished">Декодер видео</translation>
+        <translation>Декодер видео</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Audio Device Plugins</source>
-        <translation type="unfinished">Плагины аудиоустройств</translation>
+        <translation>Плагины аудиоустройств</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Device</source>
-        <translation type="unfinished">Аудиоустройство</translation>
+        <translation>Аудиоустройство</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Audio Encoder Plugins</source>
-        <translation type="unfinished">Плагины аудиокодеков</translation>
+        <translation>Плагины аудиокодеков</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Audio Encoders</source>
-        <translation type="unfinished">Аудиокодеки</translation>
+        <translation>Аудиокодеки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Demuxer Plugins</source>
-        <translation type="unfinished">Плагины демультиплексоров</translation>
+        <translation>Плагины демультиплексоров</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Demuxers</source>
-        <translation type="unfinished">Демультиплексоры</translation>
+        <translation>Демультиплексоры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Muxer Plugins</source>
-        <translation type="unfinished">Плагины мультиплексоров</translation>
+        <translation>Плагины мультиплексоров</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Muxers</source>
-        <translation type="unfinished">Мультиплексоры</translation>
+        <translation>Мультиплексоры</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Plugins Info</source>
-        <translation type="unfinished">Информация о плагинах</translation>
+        <translation>Информация о плагинах</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+14"/>
         <source>_Deringing</source>
-        <translation type="unfinished">_Дерингинг</translation>
+        <translation>_Дерингинг</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-29"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Декодировать видео с помощью VDPAU (NVIDIA)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Decode video using LIBVA (INTEL)</source>
-        <translation type="unfinished">Декодировать видео с помощью LIBVA (INTEL)</translation>
+        <translation>Декодировать видео с помощью LIBVA (INTEL)</translation>
     </message>
     <message>
         <location line="-3"/>
@@ -2125,27 +2229,27 @@
         <translation>Декодировать видео с помощью VideoToolbox (macOS)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation>Включить поддержку OpenGL</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>При включении аппаратного ускорения лучше использовать соответствующий вывод видео</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation>_Проверять обновления</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>SIMD</source>
-        <translation type="unfinished"></translation>
+        <translation>SIMD</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+104"/>
         <source>Caching of decoded pictures</source>
         <translation>Кэширование декодированных кадров</translation>
     </message>
@@ -2155,59 +2259,56 @@
         <translation>Разм_ер кэша:</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>VDPAU (best)</source>
-        <translation type="unfinished">VDPAU (лучшее)</translation>
+        <translation type="vanished">VDPAU (лучший)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation type="unfinished">OpenGL (лучшее)</translation>
+        <translation type="vanished">OpenGL (лучший)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation type="unfinished">LIBVA (лучшее)</translation>
+        <translation type="vanished">LIBVA (лучший)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
-        <translation type="unfinished">Драйвер SDL</translation>
+        <translation>Драйвер SDL</translation>
     </message>
     <message>
         <location line="+15"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
-        <translation type="unfinished"></translation>
+        <translation>PCM</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Pro Logic</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro Logic</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Pro Logic II</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro Logic II</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>_AudioDevice</source>
-        <translation type="unfinished">_Аудиоустройство</translation>
+        <translation>_Аудиоустройство</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
-        <translation type="unfinished">_Дерингинг</translation>
+        <translation>_Дерингинг</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Strength:</source>
-        <translation type="unfinished">Уровень:</translation>
+        <translation>_Уровень:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-62"/>
         <source>System language</source>
         <translation>Системный</translation>
     </message>
@@ -2217,7 +2318,17 @@
         <translation>_Язык</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation>Импорт</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation>Постобработка</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Ограничение частоты обновления</translation>
     </message>
@@ -2227,56 +2338,59 @@
         <translation>Интервал частоты обновления (мс)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation>Для отображения видео и фильтров OpenGL требуется, чтобы OpenGL был включён и работал при запуске приложения</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
-        <translation type="unfinished">Отрисовка графической оболочки</translation>
+        <translation>Отрисовка графической оболочки</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>Аппаратное ускорение</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
-        <translation type="unfinished">_Всегда выбирать порт</translation>
+        <translation>_Всегда выбирать порт</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Default port to use</source>
-        <translation type="unfinished">Порт по умолчанию</translation>
+        <translation>Порт по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-105"/>
         <source>Open</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Append</source>
-        <translation type="unfinished">&amp;Присоединить...</translation>
+        <translation>Присоединить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save</source>
-        <translation type="unfinished">&amp;Сохранить как...</translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Queue</source>
-        <translation type="unfinished">&amp;В очередь</translation>
+        <translation>В очередь</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save as Image</source>
-        <translation type="unfinished">Сохранить как &amp;изображение</translation>
+        <translation>Сохранить в изображение</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2332,7 +2446,7 @@
     <message>
         <location line="+1"/>
         <source>Reset Edit</source>
-        <translation>Сброс</translation>
+        <translation>Сбросить изменения</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2352,94 +2466,119 @@
     </message>
     <message>
         <location line="+5"/>
+        <source>Reset Marker A</source>
+        <translation>Сбросить метку A</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation>Сбросить метку B</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
-        <translation>Сброс меток выборки</translation>
+        <translation>Сбросить метки выборки</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
-        <translation>Сохранить текущие настройки вывода по умолчанию</translation>
+        <translation>Сохранить текущие настройки как стандартные</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Load saved settings</source>
-        <translation>Загрузить настройки вывода по умолчанию</translation>
+        <translation>Загрузить сохранённые настройки</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Decoder Option</source>
-        <translation type="unfinished">Настройки декодера</translation>
+        <translation>Параметр декодера</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PostProcessing</source>
-        <translation type="unfinished">Постпроцессинг</translation>
+        <translation>Постобработка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation>Тональная компрессия HDR</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Play filtered</source>
-        <translation>Воспроизводить фильтрованным</translation>
+        <translation>Воспроизвести с фильтром</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Select Track</source>
-        <translation type="unfinished">Выбрать дорожку...</translation>
+        <translation>Выбрать дорожку</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Save audio</source>
-        <translation type="unfinished">Сохранить аудио...</translation>
+        <translation>Сохранить аудио</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Build Option</source>
-        <translation type="unfinished">Опции сборки...</translation>
+        <translation>Параметры сборки</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Plugins</source>
-        <translation type="unfinished">Плагины...</translation>
+        <translation>Плагины</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>&amp;Advanced</source>
-        <translation type="unfinished">&amp;Дополнительно</translation>
+        <translation>&amp;Дополнительно</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Application &amp;Log</source>
-        <translation type="unfinished">&amp;Открыть журнал приложения</translation>
+        <translation>&amp;Открыть журнал приложения</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open Application Data &amp;Folder</source>
-        <translation type="unfinished">О&amp;ткрыть папку с данными приложения</translation>
+        <translation>О&amp;ткрыть папку с данными приложения</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>About</source>
-        <translation type="unfinished">О программе...</translation>
+        <translation>О программе</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Previous Frame</source>
-        <translation type="unfinished">Предыдущий кадр</translation>
+        <translation>Предыдущий кадр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next Frame</source>
-        <translation type="unfinished">Следующий кадр</translation>
+        <translation>Следующий кадр</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+3"/>
+        <source>Previous Cut Point</source>
+        <translation>Перейти к предыдущему разрезу</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation>Перейти к следующему разрезу</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
-        <translation type="unfinished">Первый кадр</translation>
+        <translation>Первый кадр</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Last Frame</source>
-        <translation type="unfinished">Последний кадр</translation>
+        <translation>Последний кадр</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2454,7 +2593,47 @@
     <message>
         <location line="+2"/>
         <source>Go To Time</source>
-        <translation type="unfinished">Перейти ко времени...</translation>
+        <translation>Перейти ко времени</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation>Назад на 1 секунду</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation>Вперёд на 1 секунду</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation>Назад на 2 секунды</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation>Вперёд на 2 секунды</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation>Назад на 4 секунды</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation>Вперёд на 4 секунды</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation>Назад на 1 минуту</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation>Вперёд на 1 минуту</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2482,109 +2661,110 @@
         <translation>Подогнать под размер окна</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
-        <translation type="unfinished">Нельзя удалить все видео</translation>
+        <translation>Нельзя удалить *все* видео
+</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/utils/ADM_edFrameType.cpp" line="+72"/>
         <source>Updating frametype</source>
-        <translation type="unfinished">Обновление тип фрейма</translation>
+        <translation>Обновление типа фрейма</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+0"/>
         <source>Core has been compiled without LIBVA support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished">Ядро было скомпилировано без поддержки LLBVA, но приложение - с ее поддержкой.
+        <translation>Ядро было скомпилировано без поддержки LLBVA, но приложение — с его поддержкой.
 Ошибка установки</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+0"/>
         <source>Core has been compiled without VDPAU support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished">Ядро было скомпилировано без поддержки VDPAU, но приложение - с ее поддержкой.
+        <translation>Ядро было скомпилировано без поддержки VDPAU, но приложение — с его поддержкой.
 Ошибка установки</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+0"/>
         <source>Core has been compiled without XVBA support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished">Ядро было скомпилировано без поддержки XVBA, но приложение - с ее поддержкой.
+        <translation>Ядро было скомпилировано без поддержки XVBA, но приложение — с его поддержкой.
 Ошибка установки</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-144"/>
         <location filename="../../common/gui_save.cpp" line="-606"/>
         <source>No audio track</source>
-        <translation type="unfinished">Нет звуковой дорожки</translation>
+        <translation>Нет звуковой дорожки</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>An audio track is necessary to create such file</source>
-        <translation type="unfinished">Для создания файла данного типа требуется аудиодорожка</translation>
+        <translation>Для создания файла данного типа требуется аудиодорожка</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cannot select the MPEG-4 SP codec.</source>
-        <translation type="unfinished">Невозможно выбрать кодек MPEG-4 SP.</translation>
+        <translation>Невозможно выбрать кодек MPEG-4 SP.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>No AAC audio encoder plugin found.</source>
-        <translation type="unfinished">Не найден плагин аудиокодека AAC.</translation>
+        <translation>Не найден плагин аудиокодека AAC.</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>The MP3 codec does not allow disabling reservoir.
 Install lame plugin</source>
-        <translation type="unfinished">Кодек MP3 не позволяет отключение источника.
+        <translation>Кодек MP3 не позволяет отключение источника.
 Установите плагин LAME</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>You don&apos;t have LAME!.
 It is needed to create FLV  video.</source>
-        <translation type="unfinished">У вас не установлен плагин LAME!
+        <translation>У вас не установлен плагин LAME!
 Он требуется для создания видео FLV.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot select FLV1  codec.</source>
-        <translation type="unfinished">Невозможно выбрать кодек FLV1</translation>
+        <translation>Невозможно выбрать кодек FLV1.</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Cannot select MPEG-4 SP codec.</source>
-        <translation type="unfinished">Невозможно выбрать кодек MPEG-4 SP</translation>
+        <translation>Невозможно выбрать кодек MPEG-4 SP.</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>You don&apos;t have FAAC!.
 It is needed to create PSP compatible video.</source>
-        <translation type="unfinished">У вас не установлен плагин FAAC!
+        <translation>У вас не установлен плагин FAAC!
 Он требуется для создания видео, совместимого с PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
-        <translation type="unfinished">Выбрать скрипт/проект для запуска</translation>
+        <translation>Выбрать скрипт/проект для запуска</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Select script to run</source>
-        <translation type="unfinished">Выбрать скрипт для запуска</translation>
+        <translation>Выбрать скрипт для запуска</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select script to debug</source>
-        <translation type="unfinished">Выбрать скрипт для отладки</translation>
+        <translation>Выбрать скрипт для отладки</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Select script to save</source>
-        <translation type="unfinished">Выбрать скрипт для сохранения</translation>
+        <translation>Выбрать скрипт для сохранения</translation>
     </message>
     <message>
         <location line="+67"/>
@@ -2592,28 +2772,28 @@
         <translation>Вы собираетесь очистить список недавно открытых файлов и проектов. Этот шаг необратим. Продолжить?</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
-        <translation type="unfinished">Выбрать файл видео...</translation>
+        <translation>Выбрать файл видео...</translation>
     </message>
     <message>
         <location line="-48"/>
         <source>No engine</source>
-        <translation type="unfinished">Нет движка</translation>
+        <translation>Нет движка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>tinyPy script is not enabled in this build</source>
-        <translation type="unfinished">Скрипт tinyPy не включен в эту сборку</translation>
+        <translation>Скрипт tinyPy не включён в эту сборку</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Select Video File to Append...</source>
-        <translation type="unfinished">Выбрать файл видео для присоединения...</translation>
+        <translation>Выбрать файл видео для присоединения...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2621,205 +2801,205 @@
 Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
-        <translation type="unfinished">Обрезка</translation>
+        <translation>Обрезка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Error while cutting out.</source>
-        <translation type="unfinished">Ошибка обрезки</translation>
+        <translation>Ошибка обрезки.</translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
-        <translation type="unfinished">Неверный индекс аудио</translation>
+        <translation>Неверный индекс аудио</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Cannot use that file as audio track</source>
-        <translation type="unfinished">Невозможно использовать файл для аудиодорожки</translation>
+        <translation>Невозможно использовать файл для аудиодорожки</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
-        <translation type="unfinished">Файл аудио не найден в списке, хотя он должен был там быть. Создайте отчет об ошибке!</translation>
+        <translation>Файл аудио не найден в списке, хотя он должен был там быть. Создайте отчёт об ошибке!</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
-        <translation type="unfinished">Невозможно установить язык аудио: видео не загружено</translation>
+        <translation>Невозможно установить язык аудио: видео не загружено!</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
-        <translation type="unfinished">Установка языка дорожки невозможна: в видео нет файла аудио!</translation>
+        <translation>Установка языка дорожки невозможна: в видео нет файла аудио!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
-        <translation type="unfinished">Установка языка дорожки невозможна: неверный индекс дорожки!</translation>
+        <translation>Установка языка дорожки невозможна: неверный индекс дорожки!</translation>
     </message>
     <message>
         <location line="+144"/>
         <source>AvsProxy</source>
-        <translation type="unfinished"></translation>
+        <translation>AvsProxy</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>avsproxy</source>
-        <translation type="unfinished"></translation>
+        <translation>AvsProxy</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+151"/>
         <source>Oops</source>
-        <translation type="unfinished">Предупреждение</translation>
+        <translation>Предупреждение</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This function is disabled or no longer valid</source>
-        <translation type="unfinished">Функция отключена или более недействительна</translation>
+        <translation>Функция отключена или более недействительна</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
-        <translation type="unfinished">Проблема при инициализации аудиоустройства.</translation>
+        <translation>Проблема при инициализации аудиоустройства</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="+10"/>
         <source>Audio encoder index out of bounds</source>
-        <translation type="unfinished"></translation>
+        <translation>Индекс кодека аудио вне пределов</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>No</source>
-        <translation type="unfinished">Нет</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>No file loaded</source>
-        <translation type="unfinished">Файл не загружен</translation>
+        <translation>Файл не загружен</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Job</source>
-        <translation type="unfinished">Операция</translation>
+        <translation>Задание</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot reach database. Do you have Job control running ?</source>
-        <translation type="unfinished">Невозможно подключиться к базе данных. У вас включено управление операциями?</translation>
+        <translation>Невозможно подключиться к базе данных. У вас включено управление заданиями?</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Output file</source>
-        <translation type="unfinished">Выходной файл</translation>
+        <translation>Выходной файл</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Job name</source>
-        <translation type="unfinished">Название операции</translation>
+        <translation>Название задания</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Queue job to jobList</source>
-        <translation type="unfinished">Добавить операцию в очередь</translation>
+        <translation>Добавить задание в очередь</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>Select PNG to Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите PNG для сохранения</translation>
     </message>
     <message>
         <location line="+167"/>
         <source>Function not implemented
 </source>
-        <translation type="unfinished">Функция не включена</translation>
+        <translation>Функция не реализована</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Cannot create stream</source>
-        <translation type="unfinished">Невозможно создать поток</translation>
+        <translation>Невозможно создать поток</translation>
     </message>
     <message>
         <location line="-34"/>
         <location line="+41"/>
         <source>Saving failed</source>
-        <translation type="unfinished">Ошибка при сохранении</translation>
+        <translation>Ошибка при сохранении</translation>
     </message>
     <message>
         <location line="+84"/>
         <source>Jpeg</source>
-        <translation type="unfinished"></translation>
+        <translation>Jpeg</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Failed to save as JPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось сохранить в PNG</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Saving selection as set of JPEG images</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранение выборки в набор изображений JPEG</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Предупреждение</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Saving images failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка при сохранении изображений.</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>PNG</source>
-        <translation type="unfinished"></translation>
+        <translation>PNG</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Failed to save as PNG</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось сохранить в PNG</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Cannot get tinyPy script engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно подключить движок скрипта tinyPy</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Output file not specified</source>
-        <translation type="unfinished"></translation>
+        <translation>Выходной файл не указан</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Job script %s already exists. Overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрипт задания %s уже существует. Перезаписать?</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cannot add job %s</source>
-        <translation type="unfinished">Невозможно добавить операцию %s</translation>
+        <translation>Невозможно добавить задание %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
-        <translation type="unfinished">Использовать предыдущие данные прохода еще раз?
-Предупреждение: настройки могут быть закрыты.</translation>
+        <translation>Использовать данные первого прохода ещё раз?
+Предупреждение: настройки должны быть закрыты.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
-        <translation type="unfinished">Невозможно подтвердить цепочку видео</translation>
+        <translation>Невозможно подтвердить цепочку видео</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Cannot create encoder</source>
-        <translation type="unfinished">Невозможно создать декодер</translation>
+        <translation>Невозможно создать кодек</translation>
     </message>
     <message>
         <source>Cannot setup codec. Bitrate too low?</source>
@@ -2828,7 +3008,7 @@
     <message>
         <location line="+57"/>
         <source>Cannot setup audio encoder, make sure your stream is compatible with audio encoder (number of channels, bitrate, format)</source>
-        <translation type="unfinished">Невозможно настроить аудиокодек, убедитесь в совместимости потока с ним (количество каналов, битрейт, формат)</translation>
+        <translation>Невозможно настроить аудиокодек, убедитесь в совместимости потока с ним (количество каналов, битрейт, формат)</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -2839,27 +3019,27 @@
 Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
-        <translation type="unfinished">Мультиплексор</translation>
+        <translation>Мультиплексор</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удаётся настроить кодировщик для 1 прохода. Возможно, что настройки, переданные кодировщику, несовместимы, или кодировщик нуждается в функциях, не предоставляемых данной системой.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Не удаётся создать экземпляр мультиплексора</translation>
     </message>
     <message>
         <location line="-102"/>
         <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
-        <translation>Не удаётся настроить кодировщик. Возможно, что конфигурация, переданная кодировщику, несовместима, или кодировщик нуждается в функциях, не предоставляемых данной системой.</translation>
+        <translation>Не удаётся настроить кодировщик. Возможно, что настройки, переданные кодировщику, несовместимы, или кодировщик нуждается в функциях, не предоставляемых данной системой.</translation>
     </message>
     <message>
         <location line="+74"/>
@@ -2883,364 +3063,376 @@
 Всё равно продолжить?</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
-        <translation type="unfinished">Невозможно открыть </translation>
+        <translation>Невозможно открыть </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
-        <translation type="unfinished">Выключено</translation>
+        <translation>Отключены</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">Автоопределение</translation>
+        <translation>Автоматически</translation>
     </message>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-23"/>
         <source>_Interlaced</source>
-        <translation type="unfinished">_Режим интерлейсинга</translation>
+        <translation>_Режим чересстрочности</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ca_rtoon mode</source>
-        <translation type="unfinished">Р_ежим анимации</translation>
+        <translation>Р_ежим анимации</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Greyscale</source>
-        <translation type="unfinished">_Оттенки серого</translation>
+        <translation>_Оттенки серого</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turbo mode</source>
-        <translation type="unfinished">_Турборежим</translation>
+        <translation>_Турборежим</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C_hroma optimizer</source>
-        <translation type="unfinished">_Оптимизатор цвета</translation>
+        <translation>_Оптимизатор цвета</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Main</source>
-        <translation type="unfinished">Главный</translation>
+        <translation>Основной</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Very Low</source>
-        <translation type="unfinished">Очень низкий</translation>
+        <translation>Очень низкий</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Very High</source>
-        <translation type="unfinished">Очень высокий</translation>
+        <translation>Очень высокий</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ultra High</source>
-        <translation type="unfinished">Ультравысокий</translation>
+        <translation>Ультравысокий</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Motion Search Precision</source>
-        <translation type="unfinished">Точность поиска движений</translation>
+        <translation>Точность поиска движений</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Off</source>
-        <translation type="unfinished">Выключено</translation>
+        <translation>Отключено</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mode Decision</source>
-        <translation type="unfinished">Точность режима</translation>
+        <translation>Точность режима</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>VHQ Mode</source>
-        <translation type="unfinished">Режим VHQ</translation>
+        <translation>Режим VHQ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Max B Frames</source>
-        <translation type="unfinished">Максимум кадров B</translation>
+        <translation>Максимум B-кадров</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quarter Pixel</source>
-        <translation type="unfinished">Четверть пикселя</translation>
+        <translation>Четверть пикселя</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GMC</source>
-        <translation type="unfinished"></translation>
+        <translation>GMC</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>BVHQ</source>
-        <translation type="unfinished"></translation>
+        <translation>BVHQ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Advanced Simple Profile</source>
-        <translation type="unfinished">Дополнительный простой профиль</translation>
+        <translation>Расширенный простой профиль</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>4MV</source>
-        <translation type="unfinished"></translation>
+        <translation>4MV</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Chroma ME</source>
-        <translation type="unfinished"></translation>
+        <translation>Chroma ME</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>HQ AC</source>
-        <translation type="unfinished"></translation>
+        <translation>HQ AC</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>More Search</source>
-        <translation type="unfinished">Дальнейший поиск</translation>
+        <translation>Дальнейший поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Min Gop Size</source>
-        <translation type="unfinished">Минимальный размер GOP</translation>
+        <translation>Мин. размер группы кадров</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Gop Size</source>
-        <translation type="unfinished">Максимальный размер GOP</translation>
+        <translation>Макс. размер группы кадров</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GOP Size</source>
-        <translation type="unfinished">Размер GOP</translation>
+        <translation>Размер группы кадров</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Motion</source>
-        <translation type="unfinished">Движение</translation>
+        <translation>Движение</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>H263</source>
-        <translation type="unfinished"></translation>
+        <translation>H263</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mpeg</source>
-        <translation type="unfinished"></translation>
+        <translation>Mpeg</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantization Matrix</source>
-        <translation type="unfinished">Матрица квантизации</translation>
+        <translation>Матрица квантования</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Trellis Quantization</source>
-        <translation type="unfinished">Квантизация Треллиса</translation>
+        <translation>Треллис-квантование</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quantization</source>
-        <translation type="unfinished">Квантизация</translation>
+        <translation>Квантование</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Two Pass Tuning</source>
-        <translation type="unfinished">Настройка двух проходов</translation>
+        <translation>Настройка двух проходов</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Key Frame Boost(%)</source>
-        <translation type="unfinished">Ускорение ключевых кадров (%)</translation>
+        <translation>Ускорение ключевых кадров (%)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>I-frames closer than...</source>
-        <translation type="unfinished">Кадры I ближе, чем...</translation>
+        <translation>I-кадры ближе, чем...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>.. are reduced by(%)</source>
-        <translation type="unfinished">... уменьшены на (%)</translation>
+        <translation>... уменьшены на (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Overflow Improvement(%)</source>
-        <translation type="unfinished">Максимальное увеличение переполнения (%)</translation>
+        <translation>Максимальное увеличение переполнения (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Overglow Degradation(%)</source>
-        <translation type="unfinished">Максимальное уменьшение переполнения (%)</translation>
+        <translation>Максимальное уменьшение переполнения (%)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Curve Compression</source>
-        <translation type="unfinished">Сжатие кривых</translation>
+        <translation>Сжатие кривых</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>High Bitrate Scenes (%)</source>
-        <translation type="unfinished">Сцены с высоким битрейтом (%)</translation>
+        <translation>Сцены с высоким битрейтом (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Bitrate Scenes (%)</source>
-        <translation type="unfinished">Сцены с низким битрейтом (%)</translation>
+        <translation>Сцены с низким битрейтом (%)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Overflow Control Strength</source>
-        <translation type="unfinished">Степень управления переполнением</translation>
+        <translation>Степень управления переполнением</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Two Pass</source>
-        <translation type="unfinished">2 прохода</translation>
+        <translation>2 прохода</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Xvid4 Configuration</source>
-        <translation type="unfinished">Настройка Xvid4</translation>
+        <translation>Настройки Xvid4</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
         <source>%d minute(s)</source>
-        <translation type="unfinished">%d мин</translation>
+        <translation>%d мин</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>%d hour(s)</source>
-        <translation type="unfinished">%d ч</translation>
+        <translation>%d ч</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Less than a minute</source>
-        <translation type="unfinished">Меньше минуты</translation>
+        <translation>Меньше минуты</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>A few seconds</source>
-        <translation type="unfinished">Несколько секунд</translation>
+        <translation>Несколько секунд</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-1"/>
         <source>DTS</source>
-        <translation type="unfinished"></translation>
+        <translation>DTS</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>MP2</source>
-        <translation type="unfinished"></translation>
+        <translation>MP2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MP3</source>
-        <translation type="unfinished"></translation>
+        <translation>MP3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>WMAPRO</source>
-        <translation type="unfinished"></translation>
+        <translation>WMAPRO</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation>WMA Lossless</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>WMA</source>
-        <translation type="unfinished"></translation>
+        <translation>WMA</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>LPCM</source>
-        <translation type="unfinished"></translation>
+        <translation>LPCM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>AC3</source>
-        <translation type="unfinished"></translation>
+        <translation>AC3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>OPUS</source>
-        <translation type="unfinished"></translation>
+        <translation>OPUS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>FLAC</source>
-        <translation type="unfinished"></translation>
+        <translation>FLAC</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>E-AC3</source>
-        <translation type="unfinished"></translation>
+        <translation>E-AC3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Float PCM</source>
-        <translation type="unfinished"></translation>
+        <translation>Float PCM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ogg Vorbis</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogg Vorbis</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MP4</source>
-        <translation type="unfinished"></translation>
+        <translation>MP4</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>AAC</source>
-        <translation type="unfinished"></translation>
+        <translation>AAC</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>QDM2</source>
-        <translation type="unfinished"></translation>
+        <translation>QDM2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>AMR-NB</source>
-        <translation type="unfinished"></translation>
+        <translation>AMR-NB</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MSADPCM</source>
-        <translation type="unfinished"></translation>
+        <translation>MSADPCM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>ULAW</source>
-        <translation type="unfinished"></translation>
+        <translation>ULAW</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>IMA ADPCM</source>
-        <translation type="unfinished"></translation>
+        <translation>IMA ADPCM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>8-bit PCM</source>
-        <translation type="unfinished">8-битный PCM</translation>
+        <translation>8-битный PCM</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation>TrueHD</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unknown codec</source>
-        <translation type="unfinished">Неизвестный кодек</translation>
+        <translation>Неизвестный кодек</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStreamMP3.cpp" line="+199"/>
         <source>Building time map</source>
-        <translation type="unfinished">Создание временной карты</translation>
+        <translation>Создание временной карты</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp" line="+87"/>
@@ -3255,60 +3447,61 @@
     <message>
         <location line="+235"/>
         <source>Memory error</source>
-        <translation type="unfinished">Ошибка выделения памяти</translation>
+        <translation>Ошибка выделения памяти</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
-        <translation type="unfinished">Сохранение</translation>
+        <translation>Сохранение</translation>
     </message>
     <message>
         <location line="+181"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранённое видео незакончено. Ошибка возникла на %s (%d%). Это может происходить в результате недопустимых отметок времени в видео.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Too short</source>
-        <translation type="unfinished">Слишком коротко</translation>
+        <translation>Слишком коротко</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp" line="+17"/>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="+382"/>
         <source>Unknown</source>
-        <translation type="unfinished">Неизвестно</translation>
+        <translation>Неизвестно</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-4"/>
         <source>can&apos;t open &quot;%s&quot;: %s
 %s
 </source>
-        <translation type="unfinished">невозможно открыть &quot;%s&quot;: %s
-%s</translation>
+        <translation>невозможно открыть «%s»: %s
+%s
+</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+85"/>
         <source>filesystem full</source>
-        <translation type="unfinished">файловая система переполнена</translation>
+        <translation>файловая система переполнена</translation>
     </message>
     <message>
         <location line="-85"/>
         <location line="+85"/>
         <source>quota exceeded</source>
-        <translation type="unfinished">превышена квота</translation>
+        <translation>превышена квота</translation>
     </message>
     <message>
         <location line="-84"/>
         <location line="+85"/>
         <source>Please free up some space and press RETRY to try again.</source>
-        <translation type="unfinished">Пожалуйста, освободите место и нажмите RETRY, чтобы попробовать заново.</translation>
+        <translation>Пожалуйста, освободите место и нажмите «Повторить», чтобы попробовать заново.</translation>
     </message>
     <message>
         <location line="-78"/>
         <source>can&apos;t open &quot;%s&quot;: %u (%s)
 </source>
-        <translation type="unfinished">невозможно открыть &quot;%s&quot;: %u (%s)
+        <translation>невозможно открыть «%s»: %u (%s)
 </translation>
     </message>
     <message>
@@ -3316,7 +3509,7 @@
         <source>can&apos;t write to file &quot;%s&quot;: %s
 %s
 </source>
-        <translation type="unfinished">невозможно записать в файл &quot;%s&quot;: %s
+        <translation>невозможно записать в файл «%s»: %s
 %s
 </translation>
     </message>
@@ -3324,100 +3517,149 @@
         <location line="+1"/>
         <location line="+11"/>
         <source>__unknown__</source>
-        <translation type="unfinished">__неизвестно__</translation>
+        <translation>__неизвестно__</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Ignore</source>
-        <translation type="unfinished">Игнорировать</translation>
+        <translation>Игнорировать</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Retry</source>
-        <translation type="unfinished">Повторить</translation>
+        <translation>Повторить</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>can&apos;t write to file &quot;%s&quot;: %u (%s)
 </source>
-        <translation type="unfinished">невозможно записать в файл &quot;%s&quot;: %u (%s)
+        <translation>невозможно записать в файл «%s»: %u (%s)
 </translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/avidemutils.cpp" line="-7"/>
         <source>NTSC 4:3</source>
-        <translation type="unfinished"></translation>
+        <translation>NTSC 4:3</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+1"/>
         <source>NTSC 16:9</source>
-        <translation type="unfinished"></translation>
+        <translation>NTSC 16:9</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL 4:3</source>
-        <translation type="unfinished"></translation>
+        <translation>PAL 4:3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL 16:9</source>
-        <translation type="unfinished"></translation>
+        <translation>PAL 16:9</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1:1</source>
-        <translation type="unfinished"></translation>
+        <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
         <source>Codec</source>
-        <translation type="unfinished">Кодек</translation>
+        <translation>Кодек</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="-46"/>
         <source>Internal error finding codec 0x%x</source>
-        <translation type="unfinished">Внутренняя ошибка поиска кодека 0x%x</translation>
+        <translation>Внутренняя ошибка поиска кодека 0x%x</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Internal error opening 0x%x</source>
-        <translation type="unfinished">Внутренняя ошибка открытия 0x%x</translation>
+        <translation>Внутренняя ошибка открытия 0x%x</translation>
     </message>
     <message>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+0"/>
         <source>Core has been compiled without DXVA2 support, but the application has been compiled with it.
 Installation mismatch</source>
-        <translation type="unfinished">Ядро было скомпилировано без поддержки DXVA2, а приложение - с его поддержкой.
-Ошибка установки</translation>
+        <translation>Ядро было скомпилировано без поддержки DXVA2, а приложение — с его поддержкой.
+Несоответствие установки</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="+246"/>
         <source>Cannot compile shader</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно скомпилировать шейдер</translation>
     </message>
     <message>
         <location filename="../../common/ADM_toolkit/automation.cpp" line="+235"/>
         <source>Permission Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка прав доступа</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open script &quot;%s&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно открыть скрипт «%s».</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>File Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка файла</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Script &quot;%s&quot; does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрипт «%s» не существует.</translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation>Изменение параметров выше приведёт к тому, что редактор перейдёт к ближайшему предыдущему ключевому кадру.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation>Быстрый YUV</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation>Отсечение RGB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation>Рейнхард RGB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation>Хейбл RGB</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation>_Тональная компрессия:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation>_Насыщенность:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation>_Увеличение (множитель уровня):</translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation>Сброс</translation>
     </message>
 </context>
 <context>
@@ -3425,12 +3667,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+43"/>
         <source>ADM ivtc.</source>
-        <translation type="unfinished"></translation>
+        <translation>Обратный телесин ADM.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>All in one ivtc.</source>
-        <translation type="unfinished"></translation>
+        <translation>Всё в одном обратном телесине.</translation>
     </message>
 </context>
 <context>
@@ -3438,12 +3680,69 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp" line="+240"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Aften Configuration</source>
-        <translation type="unfinished">Настройка Aften</translation>
+        <translation>Настройки Aften</translation>
+    </message>
+</context>
+<context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation>Анализатор</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation>Нулевой фильтр. Вектороскоп, осциллоскопы и гистограммы в предварительном просмотре.</translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation>Анализатор</translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation>Мультяшный фильтр</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation>Портирован из frei0r.</translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation>Мультяшный фильтр</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation>Порог</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation>Разброс</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation>Уровень цвета</translation>
     </message>
 </context>
 <context>
@@ -3493,6 +3792,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation>Удержание цветности</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation>Монохромный эффект с сохранением цветов.</translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation>Удержание цветности</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation>Третичный</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation>Вторичный</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation>Первичный</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation>Расстояние</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation>Наклон среза</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation>Выбрать цветность</translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation>Хромакей</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation>Замена «зелёного экрана» изображением.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation>Выбрать фоновое изображение</translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation>Хромакей</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation>Первичный</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation>Третичный</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation>Вторичный</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation>Наклон среза</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation>Выбрать цветность</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation>Выбрать изображение</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation>Показать фон калибровки</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation>Контроль утечки</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation>Взвешенная альфа</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation>Средняя альфа</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation>Среднеквадратичная альфа</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation>Минимальная альфа</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation>Расстояние</translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3525,32 +3966,32 @@
     <message>
         <location line="+5"/>
         <source>Vivid</source>
-        <translation type="unfinished"></translation>
+        <translation>Красочный</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>RGB</source>
-        <translation type="unfinished"></translation>
+        <translation>RGB</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Heat</source>
-        <translation type="unfinished"></translation>
+        <translation>Жаркий</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Radium</source>
-        <translation type="unfinished"></translation>
+        <translation>Радиевый</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Red-green</source>
-        <translation type="unfinished"></translation>
+        <translation>Красно-зелёный</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Monochrome</source>
-        <translation type="unfinished"></translation>
+        <translation>Чёрно-белый</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -3570,32 +4011,140 @@
     <message>
         <location line="+5"/>
         <source>Shades</source>
-        <translation type="unfinished"></translation>
+        <translation>Оттенки</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>XPRO</source>
-        <translation type="unfinished"></translation>
+        <translation>XPRO</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Yellow-blue</source>
-        <translation type="unfinished"></translation>
+        <translation>Жёлто-синий</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Yellow-bluish</source>
-        <translation type="unfinished"></translation>
+        <translation>Жёлто-голубоватый</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Chrome</source>
-        <translation type="unfinished"></translation>
+        <translation>Хромовый</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Esses</source>
-        <translation type="unfinished"></translation>
+        <translation>Esses</translation>
+    </message>
+</context>
+<context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation>Динамический порог</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation>Адаптивное пороговое значение яркости </translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation>Динамический порог</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation>Уровни</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation>Смещение</translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation>Сетка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation>Эффект видеостены.</translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation>Сетка</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation>Размер сетки</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation>Прокатить предыдущие кадры</translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation>Отражение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation>Горизонтальное или вертикальное отражение.</translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation>Отражение</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation>Смещение</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation>Горизонтальное - сохранить левое</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation>Горизонтальное - сохранить правое</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation>Вертикальное - сохранить верхнее</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation>Вертикальное - сохранить нижнее</translation>
     </message>
 </context>
 <context>
@@ -3630,9 +4179,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation>Постеризация</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation>Портирован из frei0r.</translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation>Постеризация</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation>Уровни</translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation>VHS</translation>
     </message>
@@ -3650,35 +4225,40 @@
         <translation>VHS</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
-        <translation>Полоса сигнала яркости</translation>
+        <translation>Полоса сигнала яркости (luma)</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
-        <translation>Полоса сигнала цвета</translation>
+        <translation>Полоса сигнала цветности (chroma)</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation>Ошибка синхронизации</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation>Двойная фильтрация цветности</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation>Двойная фильтрация яркости</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation>Фильтр ошибки синхронизации</translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation>Шум</translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3721,12 +4301,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp" line="+64"/>
         <source>Ascii View</source>
-        <translation type="unfinished">ASCII-вид</translation>
+        <translation>ASCII-графика</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ascii view</source>
-        <translation type="unfinished">ASCII-вид</translation>
+        <translation>Вид с использованием символов ASCII</translation>
     </message>
 </context>
 <context>
@@ -3734,19 +4314,19 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp" line="+158"/>
         <source>File Error.</source>
-        <translation type="unfinished">Ошибка файла.</translation>
+        <translation>Ошибка файла.</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open file
 </source>
-        <translation type="unfinished">Невозможно открыть файл
+        <translation>Невозможно открыть файл
 </translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp" line="+468"/>
         <source>Indexing</source>
-        <translation type="unfinished">Индексирование</translation>
+        <translation>Индексация</translation>
     </message>
 </context>
 <context>
@@ -3789,16 +4369,15 @@
         <translation>Учитывать блочность</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Show full preview</source>
-        <translation>Показывать кадр полностью</translation>
+        <translation type="vanished">Показывать кадр полностью</translation>
     </message>
     <message>
         <source>Block Adaptative</source>
         <translation type="obsolete">Блок адаптации</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-116"/>
         <source>ASharp</source>
         <translation>Фильтр резкости ASharp</translation>
     </message>
@@ -3812,116 +4391,116 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+208"/>
         <source>_Subtitle file (ASS/SSA):</source>
-        <translation type="unfinished">_Файл субтитров (ASS/SSA):</translation>
+        <translation>_Файл субтитров (ASS/SSA):</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Select Subtitle File</source>
-        <translation type="unfinished">Выбор файла субтитров</translation>
+        <translation>Выбор файла субтитров</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Line spacing:</source>
-        <translation type="unfinished">М_еждустрочный интервал:</translation>
+        <translation>_Межстрочный интервал:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Font scale:</source>
-        <translation type="unfinished">Масштаб _шрифта:</translation>
+        <translation>Масштаб _шрифта:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Top margin:</source>
-        <translation type="unfinished">Чёрная полоса с_верху:</translation>
+        <translation>Чёрная полоса с_верху:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Botto_m margin:</source>
-        <translation type="unfinished">Чёрная полоса с_низу:</translation>
+        <translation>Чёрная полоса с_низу:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
-        <translation type="unfinished"></translation>
+        <translation>ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
-        <translation type="unfinished"></translation>
+        <translation>SSA/ASS/SRT</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hardcode ASS/SSA/SRT subtitles using libass.</source>
-        <translation type="unfinished">Встроенные файлы субтитров ASS/SSA/SRT с использованием libass.</translation>
+        <translation>Встроить субтитры ASS/SSA/SRT с использованием libass.</translation>
     </message>
     <message>
         <location line="+91"/>
         <source>Format ?</source>
-        <translation type="unfinished">Формат?</translation>
+        <translation>Формат?</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure this is an ASS/SSA file ?</source>
-        <translation type="unfinished">Вы уверены, что это файл ASS/SSA?</translation>
+        <translation>Вы уверены, что это файл ASS/SSA?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
-        <translation type="unfinished">Не учитывать</translation>
+        <translation>Не учитывать</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
-        <translation type="unfinished">Учесть соотношение сторон видео (DAR):</translation>
+        <translation>Учесть соотношение сторон видео (DAR):</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>This is a SRT file. Convert to SSA ?</source>
-        <translation type="unfinished">Это файл SRT. Конвертировать в SSA?</translation>
+        <translation>Это файл SRT. Конвертировать в SSA?</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+5"/>
         <location line="+9"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="-14"/>
         <source>Cannot load this SRT file.</source>
-        <translation type="unfinished">Невозможно загрузить файл SRT.</translation>
+        <translation>Невозможно загрузить файл SRT.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cannot convert to SSA.</source>
-        <translation type="unfinished">Невозможно конвертировать в SSA.</translation>
+        <translation>Невозможно конвертировать в SSA.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot save converted file.</source>
-        <translation type="unfinished">Невозможно сохранить конвертированный файл.</translation>
+        <translation>Невозможно сохранить конвертированный файл.</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Fonts</source>
-        <translation type="unfinished">Шрифты</translation>
+        <translation>Шрифты</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Preparing the fonts can take a few minutes the first time.
 This message will not be displayed again.</source>
-        <translation type="unfinished">В первый раз подготовка шрифтов может занять несколько минут.
+        <translation>В первый раз подготовка шрифтов может занять несколько минут.
 Это сообщение больше показываться не будет.</translation>
     </message>
     <message>
         <location line="+89"/>
         <source>SSA Error</source>
-        <translation type="unfinished">Ошибка SSA</translation>
+        <translation>Ошибка SSA</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>ass_read_file() failed for %s</source>
-        <translation type="unfinished">Метод ass_read_file() для файла %s вернул ошибку.</translation>
+        <translation>Метод ass_read_file() для файла %s вернул ошибку</translation>
     </message>
 </context>
 <context>
@@ -3929,34 +4508,54 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp" line="+75"/>
         <source>Bad Idea</source>
-        <translation type="unfinished">Плохая идея</translation>
+        <translation>Плохая идея</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Using H264/H265 in AVI is a bad idea, MKV is better for that.
  Do you want to continue anyway ?</source>
-        <translation type="unfinished">Использование H264/H265 в AVI — плохая идея, лучше выбрать MKV.
- Вы все равно хотите продолжить?</translation>
+        <translation>Использование H264/H265 в AVI — плохая идея, лучше выбрать MKV.
+ Вы всё равно хотите продолжить?</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot create AVI file</source>
-        <translation type="unfinished">Невозможно создать AVI файл</translation>
+        <translation>Невозможно создать файл AVI</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation>AVI</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation>Автоматически</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation>Начать с устаревшего AVI и переключиться в режим OpenDML при приближении размера файла к 4 ГиБ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation>OpenDML</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
-        <translation type="unfinished">Формат мультиплексирования</translation>
+        <translation>Формат мультиплексирования</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Avi Muxer</source>
-        <translation type="unfinished"></translation>
+        <translation>Мультиплексор AVI</translation>
     </message>
 </context>
 <context>
@@ -3964,42 +4563,42 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/avsfilter/avsfilter.cpp" line="+598"/>
         <source>_wine app file:</source>
-        <translation type="unfinished">_Файл приложения wine</translation>
+        <translation>_Файл приложения wine:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select wine filename[wine/cedega/etc.]</source>
-        <translation type="unfinished">Выберите файл wine [wine/cedega/т.п.]</translation>
+        <translation>Выберите имя файла wine [wine/cedega/т.п.]</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_loader file:</source>
-        <translation type="unfinished">Ф_айл загрузчика</translation>
+        <translation>Ф_айл загрузчика:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select loader filename[avsload.exe]</source>
-        <translation type="unfinished">Выберите файл загрузчика[avsload.exe]</translation>
+        <translation>Выберите имя файла загрузчика [avsload.exe]</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_avs file:</source>
-        <translation type="unfinished">Фа_йл avs</translation>
+        <translation>Фа_йл avs:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select avs filename[*.avs]</source>
-        <translation type="unfinished">Выберите файл avs [*.avs]</translation>
+        <translation>Выберите имя файла avs [*.avs]</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_pipe timeout:</source>
-        <translation type="unfinished">_Таймаут в pipe:</translation>
+        <translation>_Тайм-аут в пайпе:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>AvsFilter config</source>
-        <translation type="unfinished">Настройка AvsFilter</translation>
+        <translation>Настройки AvsFilter</translation>
     </message>
 </context>
 <context>
@@ -4022,7 +4621,7 @@
     <message>
         <location line="+1"/>
         <source>Constant Rate Factor</source>
-        <translation>Постоянное качество (CRF)</translation>
+        <translation>Постоянный фактор битрейта (CRF)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4047,7 +4646,7 @@
     <message>
         <location line="+86"/>
         <source>Target bitrate (kb/s)</source>
-        <translation>Целевой битрейт (кб/с)</translation>
+        <translation>Целевой битрейт (кбит/с)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4058,12 +4657,12 @@
     <message>
         <location line="-14"/>
         <source>Target video size (MB)</source>
-        <translation>Конечный размер видео (МБ)</translation>
+        <translation>Целевой размер видео (МБ)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average bitrate (kb/s)</source>
-        <translation>Средний битрейт (кб/с)</translation>
+        <translation>Средний битрейт (кбит/с)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4102,14 +4701,14 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
-        <translation>Зачернение краёв</translation>
+        <translation>Зачернение границ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove noisy edge by turning them to black.</source>
-        <translation>Удалить шум краёв, заполнив их черным цветом.</translation>
+        <translation>Удалить шум границ, заполнив их чёрным цветом.</translation>
     </message>
 </context>
 <context>
@@ -4118,59 +4717,58 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+14"/>
         <source>Blacken Borders</source>
-        <translation type="unfinished">Зачернение краёв</translation>
+        <translation>Зачернение границ</translation>
     </message>
     <message>
         <location line="+38"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+61"/>
         <source>Right:</source>
-        <translation type="unfinished">Справа:</translation>
+        <translation>Справа:</translation>
     </message>
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+7"/>
         <source>Top:</source>
-        <translation type="unfinished">Сверху:</translation>
+        <translation>Сверху:</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Reset</source>
-        <translation type="unfinished">Сброс</translation>
+        <translation>Сброс</translation>
     </message>
     <message>
         <location line="+21"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="+74"/>
         <source>Bottom:</source>
-        <translation type="unfinished">Снизу:</translation>
+        <translation>Снизу:</translation>
     </message>
     <message>
         <location line="+7"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-14"/>
         <source>Left:</source>
-        <translation type="unfinished">Слева:</translation>
+        <translation>Слева:</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/blackenBorders.ui" line="-30"/>
         <source>&amp;Hide Rubber Band</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Спрятать резиновые линии</translation>
     </message>
 </context>
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation type="unfinished">Черный кадр</translation>
+        <translation type="vanished">Чёрный кадр</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation type="unfinished">В данный момент эта функция не поддерживается</translation>
+        <translation type="vanished">В данный момент эта функция не поддерживается</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
-        <translation type="unfinished">Поиск черного кадра...</translation>
+        <translation>Поиск чёрного кадра...</translation>
     </message>
 </context>
 <context>
@@ -4178,22 +4776,88 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp" line="+50"/>
         <source>Blend Frames</source>
-        <translation type="unfinished"></translation>
+        <translation>Объединить кадры</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Blend groups of N frames into a single frame.  Useful for speeding up slow motion footage or creating timelapses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Объединить группу нескольких кадров в один. Полезно для ускорения замедленной съёмки или создания таймлапса.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Frames</source>
-        <translation type="unfinished"></translation>
+        <translation>Кадры</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Blend</source>
-        <translation type="unfinished"></translation>
+        <translation>Объединить</translation>
+    </message>
+</context>
+<context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation>Размытие</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation>Размытие выделенной области.</translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation>Размытие</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation>радиус</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation>Слева:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation>Сверху:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation>Снизу:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation>Справа:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>&amp;Спрятать резиновые линии</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation>Размытие по рамке</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation>По Гауссу</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation>2 прохода по Гауссу</translation>
     </message>
 </context>
 <context>
@@ -4201,32 +4865,32 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
         <source>Custom</source>
-        <translation type="unfinished">Вручную</translation>
+        <translation>Вручную</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>25  (PAL)</source>
-        <translation type="unfinished"></translation>
+        <translation>25  (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>23.976 (Film)</source>
-        <translation type="unfinished"></translation>
+        <translation>23,976 (Film)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>29.97 (NTSC)</source>
-        <translation type="unfinished"></translation>
+        <translation>29,97 (NTSC)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>50 (Pal)</source>
-        <translation type="unfinished"></translation>
+        <translation>50 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>59.94  (NTSC)</source>
-        <translation type="unfinished"></translation>
+        <translation>59,94  (NTSC)</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -4236,10 +4900,10 @@
     <message>
         <location line="+1"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
-        <translation>Ускорить или замедлить видео за счёт изменения частоты кадров. Этот фильтр изменяет продолжительность видео.</translation>
+        <translation>Ускорить или замедлить видео за счёт изменения частоты кадров. Этот фильтр изменяет длительность видео.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation>Режим исходной частоты кадров:</translation>
     </message>
@@ -4266,7 +4930,7 @@
     <message>
         <location line="+5"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -4279,12 +4943,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift.cpp" line="+36"/>
         <source>Shift chroma U/V to fix badly synced luma/chroma.</source>
-        <translation type="unfinished">Смещение chroma U/V для исправления плохой синхронизации яркости/цвета (luma/chroma).</translation>
+        <translation>Смещение chroma U/V для исправления плохой синхронизации яркости/цветности (luma/chroma).</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>ChromaShift</source>
-        <translation type="unfinished"></translation>
+        <translation>Сдвиг цветности</translation>
     </message>
 </context>
 <context>
@@ -4292,17 +4956,77 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/chromashift.ui" line="+14"/>
         <source>ChromaShift</source>
-        <translation type="unfinished"></translation>
+        <translation>Сдвиг цветности</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>V Shift</source>
-        <translation type="unfinished">Сдвиг V</translation>
+        <translation>Сдвиг V</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>U Shift</source>
-        <translation type="unfinished">Сдвиг U</translation>
+        <translation>Сдвиг U</translation>
+    </message>
+</context>
+<context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation>Цветовой баланс</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation>Настройка тени, полутона и подсветки.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation>Показать зоны</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation>Отображать тени, полутона и подсвеченные участки в чёрном, сером и белом цветах</translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation>Цветовой баланс</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation>Освещённость</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation>Насыщенность</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation>Сдвиг цветности</translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation>Тень</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation>Полутон</translation>
     </message>
 </context>
 <context>
@@ -4341,122 +5065,122 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.cpp" line="+78"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="-16"/>
         <source>Avisynth color filter.</source>
-        <translation type="unfinished">Цветофильтр Avisynth</translation>
+        <translation>Цветовой фильтр Avisynth.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Color management filter.</source>
-        <translation type="unfinished">Фильтр управления цветом.</translation>
+        <translation>Фильтр управления цветом.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>AutoWhite</source>
-        <translation type="unfinished">Автоматически белый</translation>
+        <translation>Автоматически белый</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>AutoGain</source>
-        <translation type="unfinished">Автоусиление</translation>
+        <translation>Автоусиление</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Clip to Tv Range (16-235)</source>
-        <translation type="unfinished">Обрезать до диапазона ТВ (16-235)</translation>
+        <translation>Обрезать до диапазона ТВ (16-235)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>PC-&gt;TV</source>
-        <translation type="unfinished"></translation>
+        <translation>ПК-&gt;ТВ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>TV-&gt;PC</source>
-        <translation type="unfinished"></translation>
+        <translation>ТВ-&gt;ПК</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Levels:</source>
-        <translation type="unfinished">Уровни:</translation>
+        <translation>Уровни:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Y gain</source>
-        <translation type="unfinished">Усиление Y</translation>
+        <translation>Усиление Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Brightness</source>
-        <translation type="unfinished">Яркость Y</translation>
+        <translation>Яркость Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Gamma</source>
-        <translation type="unfinished">Гамма Y</translation>
+        <translation>Гамма Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y Contrast</source>
-        <translation type="unfinished">Контраст Y</translation>
+        <translation>Контраст Y</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>U gain</source>
-        <translation type="unfinished">Усиление U</translation>
+        <translation>Усиление U</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>U Brightness</source>
-        <translation type="unfinished">Яркость U</translation>
+        <translation>Яркость U</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>U Contrast</source>
-        <translation type="unfinished">Контраст U</translation>
+        <translation>Контраст U</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>V gain</source>
-        <translation type="unfinished">Усиление V</translation>
+        <translation>Усиление V</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>V Brightness</source>
-        <translation type="unfinished">Яркость V</translation>
+        <translation>Яркость V</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>V Contrast</source>
-        <translation type="unfinished">Контраст V</translation>
+        <translation>Контраст V</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Flags</source>
-        <translation type="unfinished">Флаги</translation>
+        <translation>Флаги</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation>U</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>V</source>
-        <translation type="unfinished"></translation>
+        <translation>V</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>colorYuv</source>
-        <translation type="unfinished"></translation>
+        <translation>colorYuv</translation>
     </message>
 </context>
 <context>
@@ -4468,14 +5192,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Контраст</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Яркость</translation>
     </message>
@@ -4519,12 +5243,11 @@
         <translation>Компонента V</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Process</source>
-        <translation>Предпросмотр</translation>
+        <translation type="vanished">Предпросмотр</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4534,22 +5257,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/ADM_vidFastConvolution.cpp" line="+136"/>
         <source>_Process luma</source>
-        <translation type="unfinished">Обработать яркость (luma)</translation>
+        <translation>_Обработать яркость (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>P_rocess chroma</source>
-        <translation type="unfinished">Обработать цвет (chroma)</translation>
+        <translation>О_бработать цветность (chroma)</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Process luma plane</source>
-        <translation type="unfinished">Обработать уровень luma</translation>
+        <translation>Обработать плоскость яркости (luma)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Fast Convolution</source>
-        <translation type="unfinished">Быстрая свертка</translation>
+        <translation>Быстрая свёртка</translation>
     </message>
 </context>
 <context>
@@ -4557,27 +5280,27 @@
     <message>
         <location filename="../../common/ADM_osSupport/ADM_crashHook.cpp" line="+84"/>
         <source>Load it</source>
-        <translation type="unfinished">Загрузить</translation>
+        <translation>Загрузить</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Crash file</source>
-        <translation type="unfinished">Крэш-файл</translation>
+        <translation>Файл сбоя</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>I have detected a crash file. 
 Do you want to load it  ?
 (It will be deleted in all cases, you should save it if you want to keep it)</source>
-        <translation type="unfinished">Обнаружен крэш-файл. 
+        <translation>Обнаружен файл сбоя. 
 Хотите загрузить его?
-(Он будет удален в любом случае, поэтому Вам нужно сохранить его, если он потребуется Вам в дальнейшем)</translation>
+(Файл будет удалён в любом случае, поэтому его лучше сохранить, если он вам нужен)</translation>
     </message>
 </context>
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Кадрирование</translation>
     </message>
@@ -4587,26 +5310,27 @@
         <translation>Фильтр кадрирования</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
-        <translation>Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
+        <translation>Предупреждение: ширина слишком сильно обрезана! Её значение восстановлено!
 </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Warning Cropping too much height ! Height reseted !
 </source>
-        <translation>Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
+        <translation>Предупреждение: высота слишком сильно обрезана! Её значение восстановлено!
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Размер: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation>Автоматика</translation>
     </message>
@@ -4631,35 +5355,35 @@
     </message>
     <message>
         <location line="-108"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Справа:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Сверху:</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Снизу:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Слева:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Размер: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>&amp;Спрятать резиновые линии</translation>
     </message>
@@ -4668,7 +5392,7 @@
         <translation type="vanished">Фиксировать соотношение сторон</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation>Свободное</translation>
@@ -4714,9 +5438,9 @@
         <translation>9:16</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
-        <translation>Соотношение сторон:</translation>
+        <translation>Фиксировать соотношение сторон:</translation>
     </message>
 </context>
 <context>
@@ -4724,12 +5448,48 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp" line="+272"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>DcaEnc Configuration</source>
-        <translation type="unfinished">Настройка DcaEnc</translation>
+        <translation>Настройки DcaEnc</translation>
+    </message>
+</context>
+<context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation>Дебандинг</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation>Уменьшение артефактов полосатости.</translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation>Дебандинг</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation>Порог цветности</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation>Порог яркости</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation>Диапазон</translation>
     </message>
 </context>
 <context>
@@ -4737,77 +5497,77 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+75"/>
         <source>Replace (interpolate)</source>
-        <translation type="unfinished">Заменить (интерполировать)</translation>
+        <translation>Заменить (интерполировать)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Pulldown dupe removal</source>
-        <translation type="unfinished">Удаление Pulldown dupe</translation>
+        <translation>Удаление дублей преобразования</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Fastest (no chroma, partial luma)</source>
-        <translation type="unfinished">Быстрый (нет chroma, частичная luma)</translation>
+        <translation>Быстрый (нет chroma, частичная luma)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Medium (full luma, no chroma)</source>
-        <translation type="unfinished">Быстрый (нет chroma, полная luma)</translation>
+        <translation>Быстрый (нет chroma, полная luma)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Режим:</translation>
+        <translation>_Режим:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Quality:</source>
-        <translation type="unfinished">Качество:</translation>
+        <translation>_Качество:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Threshold 1:</source>
-        <translation type="unfinished">Порог 1:</translation>
+        <translation>_Порог 1:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>T_hreshold 2:</source>
-        <translation type="unfinished">Порог 2:</translation>
+        <translation>По_рог 2:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>C_ycle:</source>
-        <translation type="unfinished">Цикл:</translation>
+        <translation>_Цикл:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Decomb Decimate</source>
-        <translation type="unfinished"></translation>
+        <translation>Прореживатель Decomb</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>Decomb decimate</source>
-        <translation type="unfinished"></translation>
+        <translation>Прореживатель Decomb</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Donald Graft decimate. Remove duplicate after telecide.</source>
-        <translation type="unfinished">Donald Graft decimate. Удалите дубликат после telecide.</translation>
+        <translation>Прореживатель Дональда Графта. Удаление дубликатов после восстановления.</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Discard closer</source>
-        <translation type="unfinished">Отменить ближайшее</translation>
+        <translation>Отменить ближайшее</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Discard longer dupe (animés)</source>
-        <translation type="unfinished">Отменить долгий dupe (для аниме)</translation>
+        <translation>Отменить долгий дубль (для аниме)</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Sho_w</source>
-        <translation type="unfinished">_Показать</translation>
+        <translation>_Показать</translation>
     </message>
 </context>
 <context>
@@ -4824,16 +5584,132 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation>DelogoHQ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation>Скрытие логотипа произвольной формы.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation>Выбранное изображение имеет разную ширину / высоту.</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation>Не удалось сохранить!</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation>Найдите в предпросмотре чётко видимый логотип, не сливающийся с фоном.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation>Сохранить этот кадр как изображение PNG.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation>Используйте подходящий редактор изображений, чтобы закрасить область логотипа любой формы в белый цвет, а всё остальное — сплошным чёрным.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation>Это чёрно-белое изображение будет служить маской, где белые пиксели будут соответствовать удаляемому логотипу.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation>Если в логотипе есть полностью прозрачные области, рекомендуется исключить их из маски, сделав их чёрными.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation>Загрузить изображение маски.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation>Примечание: При удалении нескольких отдалённых логотипов (например, в противоположных углах), использование отдельных экземпляров фильтра для каждого логотипа будет намного быстрее.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation>Как использовать DelogoHQ</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation>Сохранить выбранный кадр…</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation>Загрузить маску</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation>Ошибка загрузки!</translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation>DelogoHQ</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation>Маска</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation>Сохранить текущий кадр…</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation>Загрузить маску</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation>Постобработка</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation>Размытие</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation>Градиент</translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+78"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Режим:</translation>
+        <translation>_Режим:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Threshold:</source>
-        <translation type="unfinished">Порог:</translation>
+        <translation>_Порог:</translation>
     </message>
     <message>
         <source>_Extra</source>
@@ -4846,52 +5722,52 @@
     <message>
         <location line="-23"/>
         <source>dgbob</source>
-        <translation type="unfinished"></translation>
+        <translation>dgbob</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Donald Graft Bob.</source>
-        <translation type="unfinished"></translation>
+        <translation>Качение Дональда Графта.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Top</source>
-        <translation type="unfinished">Сверху</translation>
+        <translation>Сверху</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished">Снизу</translation>
+        <translation>Снизу</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Keep nb of frames and fps</source>
-        <translation type="unfinished">Сохранить количество кадров и кадров/с</translation>
+        <translation>Сохранить число кадров и кадров/с</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double nb of frames and fps</source>
-        <translation type="unfinished">Удвоить количество кадров и кадров/с</translation>
+        <translation>Удвоить число кадров и кадров/с</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double nb of frames (slow motion)</source>
-        <translation type="unfinished">Удвоить количество кадров (замедление)</translation>
+        <translation>Удвоить число кадров (замедление)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Top Field First:</source>
-        <translation type="unfinished">_Сначала поле сверху</translation>
+        <translation>_Сначала поле сверху:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Extra artifact protection (may increase flickering, rarely needed)</source>
-        <translation type="unfinished"></translation>
+        <translation>_Экстразащита от артефактов (может увеличить мерцание, редко требуется)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>DGBob</source>
-        <translation type="unfinished"></translation>
+        <translation>DGBob</translation>
     </message>
 </context>
 <context>
@@ -4899,12 +5775,25 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dummy/dummyVideoFilter.cpp" line="+44"/>
         <source>Dummy</source>
-        <translation type="unfinished">Поддельный</translation>
+        <translation>Пустышка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Null filter, it does nothing at all.</source>
-        <translation type="unfinished">Никакой фильтр применяться не будет.</translation>
+        <translation>Никакой фильтр применяться не будет.</translation>
+    </message>
+</context>
+<context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation>Имитация мультиплексирования</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation>(Нет)</translation>
     </message>
 </context>
 <context>
@@ -4912,7 +5801,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
         <source>DV only supports 720*576*25fps and 720*480*29.97fps</source>
-        <translation type="unfinished">DV поддерживает только 720*576*25 кадров/с и 720*480*29.97 кадров/с</translation>
+        <translation>DV поддерживает только 720*576*25 кадров/с и 720*480*29.97 кадров/с</translation>
     </message>
 </context>
 <context>
@@ -4923,12 +5812,12 @@
         <translation>Кодирование...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Этап:</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+296"/>
         <source>Audio Codec:</source>
         <translation>Кодек аудио:</translation>
     </message>
@@ -4943,15 +5832,15 @@
         <translation>Кодек видео:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
-        <translation>Никакой</translation>
+        <translation>Нет</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -4973,12 +5862,12 @@
         <translation>0</translation>
     </message>
     <message>
-        <location line="-521"/>
+        <location line="-522"/>
         <source>Time Remaining:</source>
         <translation>Осталось времени:</translation>
     </message>
     <message>
-        <location line="+349"/>
+        <location line="+350"/>
         <source>Total Size:</source>
         <translation>Общий размер:</translation>
     </message>
@@ -4988,9 +5877,9 @@
         <translation>Размер видео:</translation>
     </message>
     <message>
-        <location line="-312"/>
+        <location line="-360"/>
         <source>Shut down computer when finished</source>
-        <translation>Выключить после завершения</translation>
+        <translation>Выключить ПК по завершению</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -5025,17 +5914,27 @@
     <message>
         <location line="+12"/>
         <source>Keep dialog open when finished</source>
-        <translation>Оставить диалог открытым</translation>
+        <translation>Не закрывать окно по завершению</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation>Удалять файлы статистики от первого прохода</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation>Выходной файл:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>Свернуть в трей</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Pause / Abort</source>
-        <translation>Пауза / Прервать</translation>
+        <translation>Пауза / прервать</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -5045,7 +5944,7 @@
     <message>
         <location line="+249"/>
         <source>Processed Frames:</source>
-        <translation>Выдано кадров:</translation>
+        <translation>Обработано кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -5060,24 +5959,24 @@
     <message>
         <location line="+24"/>
         <source>Frames/sec:</source>
-        <translation>Скорость (к/с):</translation>
+        <translation>Кадров в секунду:</translation>
     </message>
     <message>
-        <location line="-536"/>
+        <location line="-568"/>
         <source>Main</source>
-        <translation type="unfinished">Главный</translation>
+        <translation>Основной</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="+396"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
-        <translation>0 Мб</translation>
+        <translation>0 МБ</translation>
     </message>
     <message>
         <location line="+77"/>
         <source>0 kB/s</source>
-        <translation>0 Кб/с</translation>
+        <translation>0 кбит/c</translation>
     </message>
     <message>
         <location line="+57"/>
@@ -5095,10 +5994,10 @@
     <message>
         <location line="-1"/>
         <source>MPlayer eq2</source>
-        <translation type="unfinished"></translation>
+        <translation>MPlayer eq2</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Сброс</translation>
     </message>
@@ -5122,7 +6021,7 @@
         <translation>Яркость</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Гамма&lt;/b&gt;</translation>
     </message>
@@ -5139,7 +6038,7 @@
     <message>
         <location line="+7"/>
         <source>Initial</source>
-        <translation type="unfinished">Начальный</translation>
+        <translation>Начальный</translation>
     </message>
     <message>
         <location line="-69"/>
@@ -5152,9 +6051,8 @@
         <translation>Зеленый</translation>
     </message>
     <message>
-        <location line="-162"/>
         <source>Show full preview</source>
-        <translation>Показывать кадр полностью</translation>
+        <translation type="vanished">Показывать кадр полностью</translation>
     </message>
 </context>
 <context>
@@ -5162,56 +6060,546 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp" line="+292"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Faac Configuration</source>
-        <translation type="unfinished">Настройка Faac</translation>
+        <translation>Настройки Faac</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp" line="+6"/>
         <source>Opus Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки Opus</translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation>Исчезать с первого изображения</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation>Использовать изображение во время начала для исчезновения.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation>_Начало:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>_Конец:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation>Ввод времени вручную</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation>Временной охват: </translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation>Длительность: </translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation>Исчезать с первого изображения</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation>Временной охват: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation>Длительность: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation>Ввод времени вручную</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation>Установить из меток A-B</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation>Эффект:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation>Линейное смешивание</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation>Скольжение</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation>Стирание</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation>Толчок</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation>Растворение яркости</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation>Растворение обратной яркости</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation>Статическое случайное растворение</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation>Динамическое случайное растворение</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation>Сверху</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation>Справа</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation>Снизу</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation>Слева</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation>Если вы видите зелёный цвет, начните предпросмотр до начала временного охвата.</translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation>Появление</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation>Появление из цвета.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation>Исчезновение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation>Исчезновение в цвет.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation>_Начало:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>_Конец:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation>Ввод времени вручную</translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation>Временной охват: </translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation>Длительность: </translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation>Появление/исчезание</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation>Временной охват: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation>Длительность: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation>Ввод времени вручную</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation>Установить из меток A-B</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation>Выбрать цвет:</translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation>Исчезновение с эффектами</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation>Исчезновение с комбинацией эффектов.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation>_Начало:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation>_Конец:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation>Ввод времени вручную</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation>Нельзя!
+Время начала и / или конца выходит за пределы допустимого диапазона</translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation>Временной охват: </translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation>Длительность: </translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation>Центр: </translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation>Появление</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation>Появление с комбинацией эффектов.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation>Исчезновение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation>Исчезновение с комбинацией эффектов.</translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation>Исчезновение с эффектами</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation>Временной охват: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation>Центр: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation>Длительность: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation>Ввод времени вручную</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation>Установить из меток A-B</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation>Установить центром метку A, длительность: 2×|A-B|</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation>Яркость</translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation>Включить</translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation>Переходный</translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation>Приподнятый косинус</translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation>Подъём</translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation>Квадратичный</translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation>Обратный квадратичный</translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation>Экспоненциальный</translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation>длительность</translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation>Насыщенность</translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation>Смешивание цвета</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation>Выбрать цвет</translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation>Пиковое число</translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation>Размытие</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation>Радиус размытия</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation>Повернуть</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation>Пиковый угол</translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation>Масштаб</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation>Пиковый масштаб</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation>Виньетка</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation>Пиковое открытие</translation>
     </message>
 </context>
 <context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
-        <translation type="unfinished">Затемнение</translation>
+        <translation>Затемнение</translation>
     </message>
     <message>
         <location line="-22"/>
         <source>Fade.</source>
-        <translation type="unfinished">Затемнить.</translation>
+        <translation>Затемнить.</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>От</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Fade from the first picture into movie</source>
-        <translation type="unfinished"></translation>
+        <translation>Затемнять с первой картинки до фильма</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>До</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Fade from movie to the first picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Затемнять с фильма до первой картинки</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Fade direction:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Направление затемнения:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5230,47 +6618,47 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp" line="+55"/>
         <location line="+20"/>
         <source>Fade to black</source>
-        <translation type="unfinished">Затемнение до черного</translation>
+        <translation>Затемнение до чёрного</translation>
     </message>
     <message>
         <location line="-19"/>
         <source>Fade to black in/out.</source>
-        <translation type="unfinished">Затемнить до черного (появление/исчезание).</translation>
+        <translation>Затемнить до чёрного (появление/исчезание).</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Out</source>
-        <translation type="unfinished">Вывод</translation>
+        <translation>Вывод</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Fade out</source>
-        <translation type="unfinished">Исчезание</translation>
+        <translation>Исчезание</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>In</source>
-        <translation type="unfinished">Ввод</translation>
+        <translation>Ввод</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Fade in</source>
-        <translation type="unfinished">Появление</translation>
+        <translation>Появление</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Fade type:</source>
-        <translation type="unfinished">_Тип затемнения:</translation>
+        <translation>_Тип затемнения:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Start time:</source>
-        <translation type="unfinished">_Начальное время:</translation>
+        <translation>_Начальное время:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_End time:</source>
-        <translation type="unfinished">_Конечное время:</translation>
+        <translation>_Конечное время:</translation>
     </message>
 </context>
 <context>
@@ -5278,83 +6666,83 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp" line="+345"/>
         <source>Baseline</source>
-        <translation type="unfinished"></translation>
+        <translation>Базовый</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>Основной</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Высокий</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Constant Rate Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный фактор битрейта (CRF)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный битрейт</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Variable Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Переменный битрейт</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation>Профиль:</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+3"/>
         <source>Rate Control:</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление битрейтом:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. число последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>Качество:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="-11"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Максимальный битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление кадрами</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>FFmpeg VA-API H.264 Encoder Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки кодировщика FFmpeg VA-API H.264</translation>
     </message>
 </context>
 <context>
@@ -5362,69 +6750,69 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp" line="+353"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. число последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="-11"/>
         <source>Constant Rate Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный фактор битрейта (CRF)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Constant Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный битрейт</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Variable Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Переменный битрейт</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+3"/>
         <source>Rate Control:</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление битрейтом:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>Качество:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление кадрами</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>FFmpeg VA-API HEVC Encoder Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки кодировщика FFmpeg VA-API HEVC</translation>
     </message>
 </context>
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+290"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+303"/>
         <source>Threading</source>
         <translation>Многопоточность</translation>
     </message>
@@ -5451,27 +6839,27 @@
     <message>
         <location line="+5"/>
         <source>Default</source>
-        <translation type="unfinished">По умолчанию</translation>
+        <translation>По умолчанию</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Tmpgenc</source>
-        <translation type="unfinished"></translation>
+        <translation>Tmpgenc</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Animes</source>
-        <translation type="unfinished">Аниме</translation>
+        <translation>Аниме</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>KVCD</source>
-        <translation type="unfinished"></translation>
+        <translation>KVCD</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>MB comparison</source>
-        <translation>Сравнение MB</translation>
+        <translation>Сравнение МБ</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5490,7 +6878,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Два потока</translation>
     </message>
     <message>
@@ -5506,7 +6894,7 @@
     <message>
         <location line="+4"/>
         <source>Progressive</source>
-        <translation>Прогрессивнный</translation>
+        <translation>Прогрессивный</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5546,17 +6934,17 @@
     <message>
         <location line="+1"/>
         <source>Max bitrate (kb/s):</source>
-        <translation>Максимальный битрейт (Кб/с):</translation>
+        <translation>Максимальный битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished">Квантизация _Треллиса</translation>
+        <translation>_Треллис-квантование</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Number of B frames:</source>
-        <translation>_Количество последовательных кадров B:</translation>
+        <translation>_Число последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -5576,17 +6964,17 @@
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation>_Допустимое превышение заданной величины видео (Кб):</translation>
+        <translation>_Допуск размера файла (КБ):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished">_Сжатие квантизации:</translation>
+        <translation>_Сжатие квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished">_Размытие квантизации:</translation>
+        <translation>_Размытие квантования:</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5606,55 +6994,55 @@
     <message>
         <location line="+6"/>
         <source>Basic Settings</source>
-        <translation>Общая</translation>
+        <translation>Общие</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Adv. Settings</source>
-        <translation>Дополнительная</translation>
+        <translation>Расширенные</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Quantization</source>
-        <translation>Квантизация</translation>
+        <translation>Квантование</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-2 configuration</source>
-        <translation>Настройка кодировщика libavcodec MPEG-2</translation>
+        <translation>Настройки кодировщика libavcodec MPEG-2</translation>
     </message>
 </context>
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+209"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+220"/>
         <source>Threading</source>
-        <translation type="unfinished">Многопоточность</translation>
+        <translation>Многопоточность</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>User Interface</source>
-        <translation type="unfinished">Интерфейс</translation>
+        <translation>Интерфейс</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Motion Estimation</source>
-        <translation type="unfinished">Определение движения</translation>
+        <translation>Определение движения</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Управление битрейтом</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="-63"/>
         <source>H.263</source>
-        <translation type="unfinished"></translation>
+        <translation>H.263</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>MPEG</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -5674,102 +7062,102 @@
     <message>
         <location line="+3"/>
         <source>One thread</source>
-        <translation type="unfinished">Один поток</translation>
+        <translation>Один поток</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation type="unfinished">Два потока</translation>
+        <source>Two threads</source>
+        <translation>Два потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation type="unfinished">Три потока</translation>
+        <translation>Три потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Auto (#cpu)</source>
-        <translation type="unfinished">Автоматически (#cpu)</translation>
+        <translation>Автоматически (#cpu)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished">_Мин. квантизатор:</translation>
+        <translation>_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished">М_акс. квантизатор:</translation>
+        <translation>М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished">_Разница максимального квантизатора:</translation>
+        <translation>_Разница максимального квантизатора:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>4_MV</source>
-        <translation type="unfinished"></translation>
+        <translation>4_MV</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished">Квантизация _Треллиса</translation>
+        <translation>_Треллис-квантование</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quarter pixel</source>
-        <translation type="unfinished">_Четверть пикселя</translation>
+        <translation>_Четверть пикселя</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Number of B frames:</source>
-        <translation type="unfinished">К_оличество кадров B:</translation>
+        <translation>_Число B-кадров:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Quantization type:</source>
-        <translation type="unfinished">_Тип квантизации:</translation>
+        <translation>_Тип квантования:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Macroblock decision:</source>
-        <translation type="unfinished">О_пределение макроблоков:</translation>
+        <translation>О_пределение макроблоков:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished">_Допустимый размер файла (Кб):</translation>
+        <translation>_Допуск размера файла (КБ):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished">Ко_мпрессия квантизации:</translation>
+        <translation>_Сжатие квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished">_Размытие квантизации:</translation>
+        <translation>_Размытие квантования:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished">Размер GOP:</translation>
+        <translation>_Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Simple Profile</source>
-        <translation type="unfinished">Дополнительный простой профиль</translation>
+        <translation>Расширенный простой профиль</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Quantization</source>
-        <translation type="unfinished">Квантизация</translation>
+        <translation>Квантование</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation type="unfinished">Настройка libavcodec MPEG-4</translation>
+        <translation>Настройки libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
@@ -5777,117 +7165,117 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMsMpeg4/ADM_ffMsMp4.cpp" line="+224"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>User Interface</source>
-        <translation type="unfinished">Интерфейс</translation>
+        <translation>Интерфейс</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Управление битрейтом</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="-46"/>
         <source>Full</source>
-        <translation type="unfinished">Полностью</translation>
+        <translation>Полностью</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Log</source>
-        <translation type="unfinished">Журнал</translation>
+        <translation>Журнал</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Phods</source>
-        <translation type="unfinished"></translation>
+        <translation>Phods</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>EPZS</source>
-        <translation type="unfinished"></translation>
+        <translation>EPZS</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>X1</source>
-        <translation type="unfinished"></translation>
+        <translation>X1</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>H.263</source>
-        <translation type="unfinished"></translation>
+        <translation>H.263</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>MPEG</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>MB comparison</source>
-        <translation type="unfinished">Сравнение Мб</translation>
+        <translation>Сравнение МБ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fewest bits (vhq)</source>
-        <translation type="unfinished">Несколько битов (vhq)</translation>
+        <translation>Несколько битов (vhq)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate distortion</source>
-        <translation type="unfinished">Искажение частоты</translation>
+        <translation>Искажение частоты</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished">_Мин. квантизатор:</translation>
+        <translation>_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished">М_акс. квантизатор:</translation>
+        <translation>М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished">_Разница макс. квантизатора:</translation>
+        <translation>_Разница макс. квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished">Квантизация _Треллиса:</translation>
+        <translation>_Треллис-квантование:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished">_Допустимый размер файла (Кб):</translation>
+        <translation>_Допуск размера файла (КБ):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished">_Сжатие квантизатора:</translation>
+        <translation>_Сжатие квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished">_Размытие квантизатора:</translation>
+        <translation>_Размытие квантизатора:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished">_Размер GOP:</translation>
+        <translation>_Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantization</source>
-        <translation type="unfinished">Квантизация</translation>
+        <translation>Квантование</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec MPEG-4 configuration</source>
-        <translation type="unfinished">Настройка libavcodec MPEG-4</translation>
+        <translation>Настройки libavcodec MPEG-4</translation>
     </message>
 </context>
 <context>
@@ -5895,17 +7283,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp" line="+326"/>
         <source>Controlled by Preset</source>
-        <translation type="unfinished"></translation>
+        <translation>По предустановке</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Constant Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный битрейт</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Variable Bitrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Переменный битрейт</translation>
     </message>
     <message>
         <source>Low Quality</source>
@@ -5914,17 +7302,17 @@
     <message>
         <location line="+9"/>
         <source>High Quality</source>
-        <translation type="unfinished">Высокое качество</translation>
+        <translation>Высокое качество</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>BluRay</source>
-        <translation type="unfinished"></translation>
+        <translation>BluRay</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency</source>
-        <translation type="unfinished">Низкий отклик</translation>
+        <translation>Низкая задержка</translation>
     </message>
     <message>
         <source>Low Latency (LQ)</source>
@@ -5933,207 +7321,207 @@
     <message>
         <location line="+2"/>
         <source>Low Latency (HQ)</source>
-        <translation type="unfinished">Низкий отклик (высокое качество)</translation>
+        <translation>Низкая задержка (высокое качество)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Baseline</source>
-        <translation type="unfinished"></translation>
+        <translation>Базовый</translation>
     </message>
     <message>
         <location line="-3"/>
         <location line="+4"/>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>Основной</translation>
     </message>
     <message>
         <location line="-26"/>
         <source>Constant Quantizer</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный квантизатор</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Стандартный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Slow</source>
-        <translation type="unfinished"></translation>
+        <translation>Медленный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Средний</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Fast</source>
-        <translation type="unfinished"></translation>
+        <translation>Быстрый</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High Performance</source>
-        <translation type="unfinished"></translation>
+        <translation>Высокая скорость</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Low Latency (HP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Низкая задержка (высокая скорость)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Lossless</source>
-        <translation type="unfinished"></translation>
+        <translation>Без потерь</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Lossless (HP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Без потерь (высокая скорость)</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Main10</source>
-        <translation type="unfinished"></translation>
+        <translation>Основной10</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Высокий</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключено</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Each</source>
-        <translation type="unfinished"></translation>
+        <translation>Каждый</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Middle</source>
-        <translation type="unfinished"></translation>
+        <translation>Средний</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>RC Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Режим управления битрейтом:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Preset:</source>
-        <translation type="unfinished">Предустановки:</translation>
+        <translation>Предустановка:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation>Профиль:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Use B-Frames as References:</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать B-кадры как опорные:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>Качество:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished">Битрейт (Кб/с):</translation>
+        <translation>Битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished">Максимальный битрейт (Кб/с):</translation>
+        <translation>Максимальный битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. число последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Lookahead:</source>
-        <translation type="unfinished"></translation>
+        <translation>Предсказание:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>AQ Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation>Уровень адаптивного квантования (AQ)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Spatial AQ</source>
-        <translation type="unfinished"></translation>
+        <translation>Пространственное адаптивное квантование (AQ)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Temporal AQ</source>
-        <translation type="unfinished"></translation>
+        <translation>Временное адаптивное квантование (AQ)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Weighted Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation>Взвешенное предсказание</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Even with HEVC encoding support present, lossless presets and B-frames may be unavailable with older hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Даже при наличии поддержки кодека HEVC предустановки без потерь и B-кадры могут быть недоступны на старом аппаратном обеспечении</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Even with H.264 encoding support present, lossless presets may be unavailable with older hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Даже при наличии поддержки кодека H.264 предустановки без потерь могут быть недоступны на старом аппаратном обеспечении</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Lookahead and Adaptive Quantization may be unavailable with older hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Предсказание и адаптивное квантование могут быть недоступны на старом аппаратном обеспечении</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление кадрами</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Basic Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Общие настройки</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Advanced Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Расширенные настройки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>NVENC H.264 configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки NVENC H.264</translation>
     </message>
     <message>
         <source>nvEnc HEVC  configuration</source>
-        <translation type="obsolete">Настройка nvEnc HEVC</translation>
+        <translation type="obsolete">Настройки nvEnc HEVC</translation>
     </message>
     <message>
         <location line="-2"/>
         <source>NVENC HEVC configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки NVENC HEVC</translation>
     </message>
 </context>
 <context>
@@ -6141,189 +7529,252 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+64"/>
         <source>[Mismatch]</source>
-        <translation type="unfinished">[Несовпадение]</translation>
+        <translation>[Несовпадение]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
-        <translation type="unfinished">Сохранение mpeg PS (ff)</translation>
+        <translation>Сохранение mpeg PS (ff)</translation>
     </message>
     <message>
         <location line="+45"/>
         <source> video not compatible
 </source>
-        <translation type="unfinished"> видео несовместимо
+        <translation> видео несовместимо
 </translation>
     </message>
     <message>
         <location line="+9"/>
         <source> Bad width/height for VCD
 </source>
-        <translation type="unfinished">Некорректная ширина/высота для VCD
+        <translation>Неверная ширина/высота для VCD
 </translation>
     </message>
     <message>
         <location line="+6"/>
         <source> Bad width/height for SVCD
 </source>
-        <translation type="unfinished">Некорректная ширина/высота для SVCD
+        <translation>Неверная ширина/высота для SVCD
 </translation>
     </message>
     <message>
         <location line="+6"/>
         <source> Bad width/height for DVD
 </source>
-        <translation type="unfinished">Некорректная ширина/высота для DVD
+        <translation>Неверная ширина/высота для DVD
 </translation>
     </message>
     <message>
         <location line="+17"/>
         <source> VCD : only MP2 audio accepted
 </source>
-        <translation type="unfinished"> VCD : подходит только аудио MP2
+        <translation>VCD: подходит только аудио MP2
 </translation>
     </message>
     <message>
         <location line="+5"/>
         <source> VCD : only 44.1 khz audio accepted
 </source>
-        <translation type="unfinished">VCD : подходит только аудио 44.1 кГц
+        <translation>VCD: подходит только аудио 44.1 кГц
 </translation>
     </message>
     <message>
         <location line="+7"/>
         <source> DVD : only 48 khz audio accepted
 </source>
-        <translation type="unfinished">DVD : подходит только аудио 48 кГц
+        <translation>DVD: подходит только аудио 48 кГц
 </translation>
     </message>
     <message>
         <location line="+6"/>
         <source>[ffPS] DVD : only MP2/AC3/DTS audio accepted
 </source>
-        <translation type="unfinished">[ffPS] DVD : подходит только аудио MP2/AC3/DTS
+        <translation>[ffPS] DVD: подходит только аудио MP2/AC3/DTS
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
-        <translation type="unfinished">Свободно</translation>
+        <translation>Свободно</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
-        <translation type="unfinished">Формат мультиплексирования</translation>
+        <translation>Формат мультиплексирования</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Allow non compliant stream</source>
-        <translation type="unfinished">Разрешать несвободный поток</translation>
+        <translation>Разрешать несовместимый поток</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Total Muxrate (kbits)</source>
-        <translation type="unfinished">Общая скорость мультиплексирования (Кбит/с)</translation>
+        <translation>Общая скорость мультиплексирования (кбит/с)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Video Muxrate (kbits)</source>
-        <translation type="unfinished">Скорость мультиплексирования видео (Кбит/с)</translation>
+        <translation>Скорость мультиплексирования видео (кбит/с)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VBV size (kBytes)</source>
-        <translation type="unfinished">Размер VBV (Кб)</translation>
+        <translation>Размер VBV (КБ)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Advanced</source>
-        <translation type="unfinished">Дополнительно</translation>
+        <translation>Дополнительно</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Mpeg PS Muxer</source>
-        <translation type="unfinished"></translation>
+        <translation>Мультиплексор Mpeg PS</translation>
     </message>
 </context>
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
-        <translation type="unfinished">Сохранение mpeg TS (ff)</translation>
+        <translation>Сохранение mpeg TS (ff)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSConfig.cpp" line="+28"/>
         <source>VBR muxing</source>
-        <translation type="unfinished">Мультиплексирование VBR</translation>
+        <translation>Мультиплексирование VBR</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mux rate (MBits/s)</source>
-        <translation type="unfinished">Скорость мультиплексирования (Мбит/с)</translation>
+        <translation>Скорость мультиплексирования (Мбит/с)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>TS Muxer</source>
-        <translation type="unfinished"></translation>
+        <translation>Мультиплексор TS</translation>
+    </message>
+</context>
+<context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation>Голомб-Райс</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation>Кодировщик диапазона</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation>Малый</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation>Большой</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation>Кодировщик:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation>Контекст:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation>Потоки:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation>Исправление/обнаружение ошибок</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation>Настройки FFV1</translation>
     </message>
 </context>
 <context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
-        <translation type="unfinished"></translation>
+        <translation>Базовый</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>Основной</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Высокий</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation>Профиль:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GOP Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Maximum Consecutive B-Frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>Макс. число последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation type="unfinished"></translation>
+        <translation>Максимальный битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rate Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame Control</source>
-        <translation type="unfinished"></translation>
+        <translation>Управление кадрами</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>VideoToolbox H.264 Encoder Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки кодировщика VideoToolbox H.264</translation>
     </message>
 </context>
 <context>
@@ -6331,19 +7782,19 @@
     <message>
         <location filename="../../../avidemux_core/ADM_coreUI/src/DIA_fileSel.cpp" line="+150"/>
         <source>File error</source>
-        <translation type="unfinished">Файловая ошибка</translation>
+        <translation>Ошибка файла</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot open &quot;%s&quot;.</source>
-        <translation type="unfinished">Невозможно открыть &quot;%s&quot;.</translation>
+        <translation>Невозможно открыть «%s».</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>%s already exists.
 
 Do you want to replace it?</source>
-        <translation type="unfinished">%s уже существует.
+        <translation>%s уже существует.
 
 Вы хотите его заменить?</translation>
     </message>
@@ -6351,17 +7802,189 @@
         <location line="+27"/>
         <location line="+14"/>
         <source>It is possible that you are trying to overwrite an input file!</source>
-        <translation type="unfinished">Возможно, вы пытаетесь перезаписать исходный файл!</translation>
+        <translation>Возможно, вы пытаетесь перезаписать исходный файл!</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Cannot write the file</source>
-        <translation type="unfinished">Невозможно сохранить файл</translation>
+        <translation>Невозможно записать файл</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>No write access to &quot;%s&quot;.</source>
-        <translation type="unfinished">Нет доступа на запись для &quot;%s&quot;.</translation>
+        <translation>Нет доступа на запись для «%s».</translation>
+    </message>
+</context>
+<context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation>Подгон под размер</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation>Изменение и увеличение до указанного размера.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation>Значения ширины и высоты должны быть чётными</translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation>Подгон под размер</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation>Настройки вывода</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation>Ширина:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation>Высота:</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation>Без округления</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation>Округлять до ближайшего кратного 16</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation>Округлять до ближайшего кратного 8</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation>Округлять до ближайшего кратного 4</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation>Алгоритм изменения размера:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation>Билинейный</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Бикубический</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation>Ланцош-3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation>Сплайн</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation>Допуск соотношения сторон</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation>0%</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation>Процент</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation>100%</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation>Поля</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation>чёрные полосы</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation>эхо</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation>Подробности</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation>Текущие входные величины:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation>Изменён на:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation>Требуемые поля:</translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation>Отражение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation>Горизонтально или вертикально отразить изображение.</translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation>Отражение</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation>Горизонтальное отражение</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation>Вертикальное отражение</translation>
     </message>
 </context>
 <context>
@@ -6369,23 +7992,23 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+88"/>
         <source>_Temporal threshold:</source>
-        <translation type="unfinished">Временной порог:</translation>
+        <translation>_Временной порог:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Spatial threshold:</source>
-        <translation type="unfinished">Пространственный порог:</translation>
+        <translation>_Пространственный порог:</translation>
     </message>
     <message>
         <location line="-52"/>
         <location line="+56"/>
         <source>FluxSmooth</source>
-        <translation type="unfinished"></translation>
+        <translation>FluxSmooth</translation>
     </message>
     <message>
         <location line="-55"/>
         <source>Spatio-temporal cleaner by Ross Thomas.</source>
-        <translation type="unfinished">Пространственно-временная очистка от Ross Thomas</translation>
+        <translation>Пространственно-временная очистка Росса Томаса.</translation>
     </message>
 </context>
 <context>
@@ -6393,22 +8016,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp" line="+189"/>
         <source>User Interface</source>
-        <translation type="unfinished">Интерфейс</translation>
+        <translation>Интерфейс</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Управление битрейтом</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="-37"/>
         <source>H.263</source>
-        <translation type="unfinished"></translation>
+        <translation>H.263</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>MPEG</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6428,52 +8051,52 @@
     <message>
         <location line="+8"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished">_Мин. квантизатор:</translation>
+        <translation>Ми_н. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished">М_акс. квантизатор:</translation>
+        <translation>Ма_кс. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max. quantizer _difference:</source>
-        <translation type="unfinished">_Разница макс. квантизатора:</translation>
+        <translation>_Разница макс. квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished">Квантизация _Треллиса</translation>
+        <translation>_Треллис-квантование</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Filesize tolerance (kb):</source>
-        <translation type="unfinished">_Допустимый размер файла:</translation>
+        <translation>_Допуск размера файла (КБ):</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantizer compression:</source>
-        <translation type="unfinished">_Сжатие квантизатора:</translation>
+        <translation>_Сжатие квантизатора:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Quantizer _blur:</source>
-        <translation type="unfinished">Ра_змытие квантизатора:</translation>
+        <translation>_Размытие квантизатора:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished">_Размер GOP:</translation>
+        <translation>_Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantization</source>
-        <translation type="unfinished">Квантизация</translation>
+        <translation>Квантование</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>libavcodec FLV1 configuration</source>
-        <translation type="unfinished">Настройка libavcodec FLV1</translation>
+        <translation>Настройки libavcodec FLV1</translation>
     </message>
 </context>
 <context>
@@ -6481,14 +8104,14 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp" line="+622"/>
         <source>Warning</source>
-        <translation type="unfinished">Предупреждение</translation>
+        <translation>Предупреждение</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This FLV file says it has no video.
 I will assume it has and try to continue</source>
-        <translation type="unfinished">В данном файле FLV не обнаружено видео.
-Я посчитаю, что оно есть, и попытаюсь продолжить</translation>
+        <translation>В данном файле FLV не обнаружено видео.
+Будет считаться, что оно есть, попытка продолжить</translation>
     </message>
 </context>
 <context>
@@ -6498,22 +8121,22 @@
         <location line="+10"/>
         <location line="+6"/>
         <source>Unsupported</source>
-        <translation type="unfinished">Не поддерживается</translation>
+        <translation>Не поддерживается</translation>
     </message>
     <message>
         <location line="-16"/>
         <source>Only FLV1 &amp; VP6 supported for video</source>
-        <translation type="unfinished">Для видео поддерживается только FLV1 &amp; VP6</translation>
+        <translation>Для видео поддерживается только FLV1 и VP6</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Only AAC &amp; mpegaudio supported for audio</source>
-        <translation type="unfinished">Для аудио поддерживается только AAC &amp; mpegaudio</translation>
+        <translation>Для аудио поддерживается только AAC и mpegaudio</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Only 44.1, 22.050 and 11.025 kHz supported</source>
-        <translation type="unfinished">Поддерживается только 44.1, 22.050 и 11.025 кГц</translation>
+        <translation>Поддерживаются только 44,1, 22,050 и 11,025 кГц</translation>
     </message>
 </context>
 <context>
@@ -6521,12 +8144,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Gauss.cpp" line="+26"/>
         <source>Gaussian convolution.</source>
-        <translation type="unfinished">Гауссова свертка.</translation>
+        <translation>Гауссова свёртка.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :gaussian.</source>
-        <translation type="unfinished">Фильтр свертки 3x3 :gaussian.</translation>
+        <translation>Фильтр свёртки 3x3 :gaussian.</translation>
     </message>
 </context>
 <context>
@@ -6534,12 +8157,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp" line="+61"/>
         <source>OpenGl ReadBack benchmark</source>
-        <translation type="unfinished">Тест считывания OpenGL</translation>
+        <translation>Тест считывания OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Check how fast readback is.</source>
-        <translation type="unfinished">Проверьте скорость считывания.</translation>
+        <translation>Проверьте скорость считывания.</translation>
     </message>
 </context>
 <context>
@@ -6547,12 +8170,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment/sampleGl.cpp" line="+68"/>
         <source>OpenGl Fragment Shader Sample</source>
-        <translation type="unfinished">Образец фрагментного шейдера OpenGL</translation>
+        <translation>Образец фрагментного шейдера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation type="unfinished">Запустите фрагментный шейдер.</translation>
+        <translation>Запустите фрагментный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -6560,12 +8183,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp" line="+66"/>
         <source>OpenGl Fragment Shader Sample2</source>
-        <translation type="unfinished">Образец 2 фрагментного шейдера OpenGL</translation>
+        <translation>Образец 2 фрагментного шейдера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation type="unfinished">Запустите фрагментный шейдер.</translation>
+        <translation>Запустите фрагментный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -6573,27 +8196,27 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp" line="+66"/>
         <source>OpenGl Resize</source>
-        <translation type="unfinished">Изменение размера OpenGL</translation>
+        <translation>Изменение размера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Resize using openGl.</source>
-        <translation type="unfinished">Изменение размера с помощью OpenGL.</translation>
+        <translation>Изменение размера с помощью OpenGL.</translation>
     </message>
     <message>
         <location line="+146"/>
         <source>Width :</source>
-        <translation type="unfinished">Ширина :</translation>
+        <translation>Ширина:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished">Высота :</translation>
+        <translation>Высота:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>glResize</source>
-        <translation type="unfinished"></translation>
+        <translation>glResize</translation>
     </message>
 </context>
 <context>
@@ -6601,22 +8224,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp" line="+57"/>
         <source>OpenGl Rotate</source>
-        <translation type="unfinished">Поворот OpenGL</translation>
+        <translation>Поворот OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Rotate image by a small amount.</source>
-        <translation type="unfinished">Поворот изображения на небольшой угол.</translation>
+        <translation>Поворот изображения на небольшой угол.</translation>
     </message>
     <message>
         <location line="+118"/>
         <source>Angle (°):</source>
-        <translation type="unfinished">Угол (°)</translation>
+        <translation>Угол (°):</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>glRotate</source>
-        <translation type="unfinished"></translation>
+        <translation>glRotate</translation>
     </message>
 </context>
 <context>
@@ -6624,12 +8247,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glGlyphy/glGlyphy.cpp" line="+68"/>
         <source>OpenGl Fragment Shader Sample</source>
-        <translation type="unfinished">Образец фрагментного шейдера OpenGL</translation>
+        <translation>Образец фрагментного шейдера OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a fragment shader.</source>
-        <translation type="unfinished">Запустите фрагментный шейдер.</translation>
+        <translation>Запустить фрагментный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -6637,22 +8260,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-182"/>
         <source>Shader Loader</source>
-        <translation type="unfinished">Загрузчик шейдеров</translation>
+        <translation>Загрузчик шейдеров</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run an external shader program.</source>
-        <translation type="unfinished">Запустите внешнюю программу шейдеров.</translation>
+        <translation>Запустите внешнюю программу шейдеров.</translation>
     </message>
     <message>
         <location line="+192"/>
         <source>ShaderFile to load</source>
-        <translation type="unfinished">Файл шейдеров для загрузки</translation>
+        <translation>Файл шейдеров для загрузки</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>ShaderLoader</source>
-        <translation type="unfinished"></translation>
+        <translation>ShaderLoader</translation>
     </message>
 </context>
 <context>
@@ -6660,12 +8283,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glSmooth/glSmooth.cpp" line="+61"/>
         <source>OpenGl Smooth</source>
-        <translation type="unfinished">Сглаживание OpenGL</translation>
+        <translation>Сглаживание OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Smooth image while preserving edge.</source>
-        <translation type="unfinished">Сглаживание изображения с сохранением граней.</translation>
+        <translation>Сглаживание изображения с сохранением граней.</translation>
     </message>
 </context>
 <context>
@@ -6673,52 +8296,52 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp" line="+84"/>
         <source>vdpauDeintGl</source>
-        <translation type="unfinished"></translation>
+        <translation>vdpauDeintGl</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>VDPAU deinterlacer+resize, openGl version (faster).</source>
-        <translation type="unfinished">Деинтерлейсер + изменение размера VDPAU, версия OpenGL (быстрее).</translation>
+        <translation>Деинтерлейсер + изменение размера VDPAU, версия OpenGL (быстро).</translation>
     </message>
     <message>
         <location line="+178"/>
         <source>Keep Top Field</source>
-        <translation type="unfinished">Сохранить поле сверху</translation>
+        <translation>Сохранить поле сверху</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep Bottom Field</source>
-        <translation type="unfinished">Сохранить поле снизу</translation>
+        <translation>Сохранить поле снизу</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double framerate</source>
-        <translation type="unfinished">Удвоить частоту кадров</translation>
+        <translation>Удвоить частоту кадров</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Resize:</source>
-        <translation type="unfinished">_Изменить размер:</translation>
+        <translation>_Изменить размер:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint Mode:</source>
-        <translation type="unfinished">_Режим деинтерлейсинга:</translation>
+        <translation>_Режим деинтерлейса:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Width :</source>
-        <translation type="unfinished">Ширина :</translation>
+        <translation>Ширина :</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Height :</source>
-        <translation type="unfinished">Высота :</translation>
+        <translation>Высота :</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>vdpau</source>
-        <translation type="unfinished"></translation>
+        <translation>vdpau</translation>
     </message>
 </context>
 <context>
@@ -6726,12 +8349,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_vertex/sampleGl.cpp" line="+59"/>
         <source>OpenGl Vertex Shader</source>
-        <translation type="unfinished">Вертексный шейдер OpenGL</translation>
+        <translation>Вершинный шейдер OpenGL</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Run a simple vertex shader.</source>
-        <translation type="unfinished">Запустить простой вертексный шейдер.</translation>
+        <translation>Запустить простой вершинный шейдер.</translation>
     </message>
 </context>
 <context>
@@ -6739,12 +8362,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp" line="+59"/>
         <source>OpenGl wave </source>
-        <translation type="unfinished">Волна OpenGL</translation>
+        <translation>Волна OpenGL </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Simple wave filter.</source>
-        <translation type="unfinished">Простой волновой фильтр.</translation>
+        <translation>Простой волновой фильтр.</translation>
     </message>
 </context>
 <context>
@@ -6752,57 +8375,57 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glYadif/glYadif.cpp" line="+266"/>
         <source>Bottom field first</source>
-        <translation type="unfinished">Сначала нижнее поле</translation>
+        <translation>Сначала нижнее поле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Top field first</source>
-        <translation type="unfinished">Сначала верхнее поле</translation>
+        <translation>Сначала верхнее поле</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Режим:</translation>
+        <translation>_Режим:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Order:</source>
-        <translation type="unfinished">Порядок:</translation>
+        <translation>_Порядок:</translation>
     </message>
     <message>
         <location line="-194"/>
         <source>Yadif (openGl)</source>
-        <translation type="unfinished"></translation>
+        <translation>Yadif (openGl)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Yet another deinterlacer, using shaders.</source>
-        <translation type="unfinished">Еще один деинтерлейсер, с использованием шейдеров.</translation>
+        <translation>Ещё один деинтерлейсер, использующий шейдеры.</translation>
     </message>
     <message>
         <location line="+182"/>
         <source>Temporal &amp; spatial check</source>
-        <translation type="unfinished">Временная &amp; пространственная проверка</translation>
+        <translation>Временная и пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, temporal &amp; spatial check</source>
-        <translation type="unfinished">Bob, временная &amp; пространственная проверка</translation>
+        <translation>Качение, временная и пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Skip spatial temporal check</source>
-        <translation type="unfinished">Пропустить временную &amp; пространственную проверку</translation>
+        <translation>Пропустить временную и пространственную проверку</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bob, skip spatial temporal check</source>
-        <translation type="unfinished">Bob, пропустить временную &amp; пространственную проверку</translation>
+        <translation>Качение, пропустить временную и пространственную проверку</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>yadif</source>
-        <translation type="unfinished"></translation>
+        <translation>yadif</translation>
     </message>
 </context>
 <context>
@@ -6810,19 +8433,19 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/horizontalFlip/horizontalFlip.cpp" line="+44"/>
         <source>Horizontal Flip</source>
-        <translation type="unfinished">Горизонтальное отражение</translation>
+        <translation>Горизонтальное отражение</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Horizontally flip the image.</source>
-        <translation type="unfinished">Горизонтально отразить изображение</translation>
+        <translation>Горизонтально отразить изображение.</translation>
     </message>
 </context>
 <context>
     <name>histogram</name>
     <message>
         <source>No data</source>
-        <translation type="obsolete">Нет данных.</translation>
+        <translation type="obsolete">Нет данных</translation>
     </message>
     <message>
         <source>Max. bitrate:</source>
@@ -6858,7 +8481,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.cpp" line="+37"/>
         <source>Adjust hue and saturation.</source>
-        <translation>Настройка оттенка (hue) и насыщености.</translation>
+        <translation>Настройка оттенка (hue) и насыщенности.</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -6880,32 +8503,31 @@
         <translation>Насыщенность</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Show full preview</source>
-        <translation>Показывать кадр полностью</translation>
+        <translation type="vanished">Показывать кадр полностью</translation>
     </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
-        <translation type="unfinished"></translation>
+        <translation>HUFFYUV</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>FF HUFFYUV</source>
-        <translation type="unfinished"></translation>
+        <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
-        <translation type="unfinished">Тип:</translation>
+        <translation>Тип:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>HuffYUV Configuration</source>
-        <translation type="unfinished">Настройка HuffYUV</translation>
+        <translation>Настройки HuffYUV</translation>
     </message>
 </context>
 <context>
@@ -6913,12 +8535,88 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/hzStackField.cpp" line="+52"/>
         <source>Horizontal Stack Fields</source>
-        <translation type="unfinished">Горизонтальные стековые поля</translation>
+        <translation>Горизонтальные стековые поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put fields side by side.</source>
-        <translation type="unfinished">Установить поля рядом.</translation>
+        <translation>Расположить поля друг за другом.</translation>
+    </message>
+</context>
+<context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation>Стабилизатор изображения</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation>Уменьшение дрожания камеры.</translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation>Стабилизатор изображения</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation>Сглаживание</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation>Гравитация</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation>Интерполяция</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation>Билинейная</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Бикубическая</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation>Определение движения</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation>точное</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation>быстрое</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation>Автоматическая гравитация</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation>Порог сцены</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation>Масштаб</translation>
     </message>
 </context>
 <context>
@@ -6926,22 +8624,22 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
         <source>Continue indexing</source>
-        <translation type="unfinished">Продолжить индексирование</translation>
+        <translation>Продолжить индексацию</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Abort Requested</source>
-        <translation type="unfinished">Запрос на прерывание</translation>
+        <translation>Запрос на прерывание</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you want to abort indexing ?</source>
-        <translation type="unfinished">Вы хотите прервать индексирование ?</translation>
+        <translation>Хотите прервать индексацию?</translation>
     </message>
     <message>
         <location line="+76"/>
         <source>Time Left :%02d:%02d:%02d</source>
-        <translation type="unfinished">Осталось времени :%02d:%02d:%02d</translation>
+        <translation>Осталось времени :%02d:%02d:%02d</translation>
     </message>
 </context>
 <context>
@@ -6949,59 +8647,59 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+91"/>
         <source>Remove IVTC dupe.</source>
-        <translation type="unfinished">Удалить IVTC dupe.</translation>
+        <translation>Удаление дублей IVTC.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove the duplicate frames present after ivtc.</source>
-        <translation type="unfinished">Удалить удвоенные кадры после ivtc.</translation>
+        <translation>Удалить дубликаты кадров, оставшиеся после ivtc.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+134"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+333"/>
         <source>_Noise:</source>
-        <translation type="unfinished">Шум:</translation>
+        <translation>_Шум:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>_Show:</source>
-        <translation type="unfinished">_Показать:</translation>
+        <translation>_Показать:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Remove duplicate:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Удалить дубликат:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
-        <translation type="unfinished">Полностью</translation>
+        <translation>Полный</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>Fast</source>
-        <translation type="unfinished">Быстро</translation>
+        <translation>Быстрый</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+1"/>
         <source>VeryFast</source>
-        <translation type="unfinished">Очень быстро</translation>
+        <translation>Очень быстрый</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
-        <translation type="unfinished">Изменить частоту:</translation>
+        <translation>_Изменение частоты кадров:</translation>
     </message>
     <message>
         <location line="+3"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>DupeRemover</source>
-        <translation type="unfinished"></translation>
+        <translation>DupeRemover</translation>
     </message>
 </context>
 <context>
@@ -7009,47 +8707,47 @@
     <message>
         <location filename="../../common/GUI_jobs.cpp" line="+36"/>
         <source>Oops</source>
-        <translation type="unfinished">Предупреждение</translation>
+        <translation>Предупреждение</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Something very wrong happened when building joblist.</source>
-        <translation type="unfinished">Что-то очень необъяснимое случилось при построении списка заданий.</translation>
+        <translation>Что-то очень необъяснимое случилось при построении списка заданий.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>There are no jobs stored</source>
-        <translation type="unfinished">Нет сохраненных заданий</translation>
+        <translation>Нет сохранённых заданий</translation>
     </message>
     <message>
         <location filename="../ADM_jobs/src/uiJobs.ui" line="+17"/>
         <source>Avidemux Jobs</source>
-        <translation type="unfinished">Операции Avidemux</translation>
+        <translation>Задания Avidemux</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Run all pending jobs</source>
-        <translation type="unfinished">Запустить все запланированные операции</translation>
+        <translation>Запустить все запланированные задания</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Run jobs</source>
-        <translation type="unfinished">Запустить операции</translation>
+        <translation>Запустить задания</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Delete already executed jobs</source>
-        <translation type="unfinished">Удалить уже выполненные операции</translation>
+        <translation>Удалить уже выполненные задания</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cleanup</source>
-        <translation type="unfinished">Очистить</translation>
+        <translation>Очистить</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>If you use VDPAU you cannot use CLI version</source>
-        <translation type="unfinished">Невозможно использовать версию CLI вместе с VDPAU</translation>
+        <translation>Невозможно использовать версию CLI вместе с VDPAU</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7143,55 +8841,59 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/jobs.ui" line="+13"/>
         <source>Jobs</source>
-        <translation type="unfinished">Задания</translation>
+        <translation>Задания</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Delete All Jobs</source>
-        <translation type="unfinished">Удалить все задания</translation>
+        <translation>Удалить все задания</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Delete Sel. Job</source>
-        <translation type="unfinished">Удалить выбранное задание</translation>
+        <translation>Удалить выбранное задание</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Run All Jobs</source>
-        <translation type="unfinished">Запустить все задания</translation>
+        <translation>Запустить все задания</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Run Selected Job</source>
-        <translation type="unfinished">Запустить выбранное задание</translation>
+        <translation>Запустить выбранное задание</translation>
     </message>
 </context>
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
-        <translation type="unfinished">_Квантизатор:</translation>
+        <translation>_Квантизатор:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
-        <translation type="unfinished"></translation>
+        <translation>YUV422</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>YUV420</source>
-        <translation type="unfinished"></translation>
+        <translation>YUV420</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation>_Формат пикселей:</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>_ColorSpace:</source>
-        <translation type="unfinished">_Цвет пространства:</translation>
+        <translation type="vanished">_Цветовое пространство:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Mjpeg Configuration</source>
-        <translation type="unfinished">Настройка Mjpeg</translation>
+        <translation>Настройки Mjpeg</translation>
     </message>
 </context>
 <context>
@@ -7199,72 +8901,72 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp" line="+70"/>
         <source>_Field order:</source>
-        <translation type="unfinished">Порядок полей:</translation>
+        <translation>_Порядок полей:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Threshold:</source>
-        <translation type="unfinished">Порог:</translation>
+        <translation>_Порог:</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Smaller means more deinterlacing</source>
-        <translation type="unfinished">Чем меньше значение, тем сильнее деинтерлейсинг</translation>
+        <translation>Чем меньше значение, тем сильнее деинтерлейсинг</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Sharp</source>
-        <translation type="unfinished">Резкость</translation>
+        <translation>_Резкость</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>_Sharper engine:</source>
-        <translation type="unfinished">Включить механизм усиления резкости</translation>
+        <translation>_Движок резкости:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Extrapolate better (better not to use it)</source>
-        <translation type="unfinished">Улучшенная экстраполяция (лучше не использовать)</translation>
+        <translation>Улучшенная экстраполяция (лучше не использовать)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Map</source>
-        <translation type="unfinished">Карта</translation>
+        <translation>_Карта</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Show interlaced areas (for test!)</source>
-        <translation type="unfinished">Показать области чересстрочности (для тестирования!)</translation>
+        <translation>Показать области чересстрочности (для проверки!)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>KernelDeint</source>
-        <translation type="unfinished">Корневой деинтерлейс</translation>
+        <translation>KernelDeint</translation>
     </message>
     <message>
         <location line="-28"/>
         <source>Kernel Deint.</source>
-        <translation type="unfinished">Корневой деинтерлейсинг</translation>
+        <translation>Kernel Deint.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Port of Donald Graft Kernel Deinterlacer.</source>
-        <translation type="unfinished">Порт деинтерлейсера от Donald Graft.</translation>
+        <translation>Порт ядерного деинтерлейсера Дональда Графта.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Top</source>
-        <translation type="unfinished">Сверху</translation>
+        <translation>Сверху</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished">Снизу</translation>
+        <translation>Снизу</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>T_woway</source>
-        <translation type="unfinished">_Два прохода</translation>
+        <translation>_Два прохода</translation>
     </message>
 </context>
 <context>
@@ -7272,22 +8974,22 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp" line="+313"/>
         <source>Bit_rate mode:</source>
-        <translation type="unfinished">Режим:</translation>
+        <translation>_Режим битрейта:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quality:</source>
-        <translation type="unfinished">Качество:</translation>
+        <translation>_Качество:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>LAME Configuration</source>
-        <translation type="unfinished">Настройка LAME</translation>
+        <translation>Настройки LAME</translation>
     </message>
     <message>
         <location line="-29"/>
@@ -7310,40 +9012,40 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.cpp" line="+71"/>
         <source>_Process luma</source>
-        <translation type="unfinished">Обработать яркость (luma)</translation>
+        <translation>_Обработать яркость (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>P_rocess chroma</source>
-        <translation type="unfinished">Обработать цвет (chroma)</translation>
+        <translation>О_бработать цвет (chroma)</translation>
     </message>
     <message>
         <location line="-36"/>
         <source>Large Median (5x5).</source>
-        <translation type="unfinished">Большая медиана (5x5).</translation>
+        <translation>Большая медиана (5x5).</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Median filter on 5x5 matrix.</source>
-        <translation type="unfinished">Фильтр медианы на матрице on 5x5.</translation>
+        <translation>Фильтр медианы на матрице 5x5.</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Process luma plane</source>
-        <translation type="unfinished">Обработать luma plane</translation>
+        <translation>Обработать плоскость яркости (luma)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Fast Convolution</source>
-        <translation type="unfinished">Быстрая свертка</translation>
+        <translation>Быстрая свёртка</translation>
     </message>
 </context>
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
 </context>
 <context>
@@ -7351,12 +9053,12 @@
     <message>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/DIA_lavDecoder.cpp" line="+23"/>
         <source>_Swap U and V</source>
-        <translation type="unfinished">Поменять U и V</translation>
+        <translation>_Поменять U и V</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Decoder Options</source>
-        <translation type="unfinished">Опции кодека</translation>
+        <translation>Параметры декодера</translation>
     </message>
 </context>
 <context>
@@ -7364,57 +9066,57 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lavDeint/lavDeint.cpp" line="+188"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Linear interpolate</source>
-        <translation type="unfinished">Линейная интерполяция</translation>
+        <translation>Линейная интерполяция</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cubic interpolate</source>
-        <translation type="unfinished">Кубическая интерполяция</translation>
+        <translation>Кубическая интерполяция</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Median interpolate</source>
-        <translation type="unfinished">Средняя интерполяция</translation>
+        <translation>Средняя интерполяция</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>_Deinterlacing:</source>
-        <translation type="unfinished">Алгоритм:</translation>
+        <translation>_Деинтерлейсинг:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Autolevel</source>
-        <translation type="unfinished">Автоматический уровень</translation>
+        <translation>_Автоматический уровень</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>libavcodec deinterlacer</source>
-        <translation type="unfinished">libavcodec деинтерлейс</translation>
+        <translation>Деинтерлейсер libavcodec</translation>
     </message>
     <message>
         <location line="-131"/>
         <source>Libavdec Deinterlacers</source>
-        <translation type="unfinished">Деинтерлейсеры Libavdec</translation>
+        <translation>Деинтерлейсеры Libavdec</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Lavcodec deinterlacer family.</source>
-        <translation type="unfinished">Семейство деинтерлейсеров Lavcodec.</translation>
+        <translation>Семейство деинтерлейсеров Lavcodec.</translation>
     </message>
     <message>
         <location line="+117"/>
         <source>Linear blend</source>
-        <translation type="unfinished">Линейная смесь</translation>
+        <translation>Линейное смешивание</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>FFmpeg deint</source>
-        <translation type="unfinished">Деинтерлейсинг FFmpeg</translation>
+        <translation>Деинтерлейсинг FFmpeg</translation>
     </message>
 </context>
 <context>
@@ -7427,7 +9129,7 @@
     <message>
         <location line="+46"/>
         <source>OK</source>
-        <translation>Закрыть</translation>
+        <translation>Да</translation>
     </message>
 </context>
 <context>
@@ -7435,32 +9137,32 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp" line="+22"/>
         <source>Add logo</source>
-        <translation type="unfinished">Добавить логотип</translation>
+        <translation>Добавить логотип</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put a logo on top of video, with alpha blending.</source>
-        <translation type="unfinished">Добавить на видео логотип с альфа-наложением.</translation>
+        <translation>Добавить на видео логотип с альфа-наложением.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp" line="+99"/>
         <source>Image:</source>
-        <translation type="unfinished"></translation>
+        <translation>Изображение:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>No image selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Изображение не выбрано</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Select Logo Image</source>
-        <translation type="unfinished">Выбрать изображение для логотипа</translation>
+        <translation>Выбрать изображение для логотипа</translation>
     </message>
     <message>
         <location line="+67"/>
         <source> s</source>
-        <translation type="unfinished"></translation>
+        <translation> с</translation>
     </message>
 </context>
 <context>
@@ -7468,7 +9170,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/logo.ui" line="+14"/>
         <source>Logo</source>
-        <translation type="unfinished">Логотип</translation>
+        <translation>Логотип</translation>
     </message>
     <message>
         <source>Image</source>
@@ -7481,37 +9183,93 @@
     <message>
         <location line="+8"/>
         <source>Select Image...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать изображение...</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>No image selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Изображение не выбрано</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>X</source>
-        <translation type="unfinished"></translation>
+        <translation>X</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Y</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Alpha</source>
-        <translation type="unfinished">Альфа</translation>
+        <translation>Альфа</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Fade-in/out</source>
-        <translation type="unfinished"></translation>
+        <translation>Появление/исчезание</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>You can click in the image to approximately position the logo</source>
-        <translation type="unfinished">Щелкните на изображение для установки логотипа</translation>
+        <translation>Щёлкните на изображение для примерной установки логотипа</translation>
+    </message>
+</context>
+<context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation>Стабилизатор яркости</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation>Уменьшение мерцания.</translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation>Стабилизатор яркости</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation>Длина фильтра</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation>Порог сцены</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation>кадры</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation>Регулировать цветность</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation>Регулировать цель</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation>Предпочитать контраст</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation>Предпочитать яркость</translation>
     </message>
 </context>
 <context>
@@ -7519,12 +9277,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
         <source>GreyScale</source>
-        <translation type="unfinished"></translation>
+        <translation>Оттенки серого</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove color, only key grey image.</source>
-        <translation type="unfinished">Удаляет все цвета, на выходе только оттенки серого.</translation>
+        <translation>Удаляет все цвета, на выходе только оттенки серого.</translation>
     </message>
 </context>
 <context>
@@ -7541,6 +9299,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation>Переход</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Чересстрочность</translation>
     </message>
@@ -7577,7 +9340,7 @@
     <message>
         <location line="+111"/>
         <source>Press Ctrl + Enter to accept the dialog</source>
-        <translation>Применить конфигурацию и закрыть диалог: CTRL+ENTER</translation>
+        <translation>Применить настройки и закрыть окно: CTRL+ENTER</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -7608,14 +9371,14 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
-        <translation type="unfinished">Изображения Matroska</translation>
+        <translation>Изображения Matroska</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
-        <translation type="unfinished">Кластеры Matroska</translation>
+        <translation>Кластеры Matroska</translation>
     </message>
 </context>
 <context>
@@ -7623,52 +9386,52 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mcDeint/ADM_vidMcDeint.cpp" line="+82"/>
         <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
-        <translation type="unfinished">Деинтерлейсер компенсации движения. Портирован из MPlayer.</translation>
+        <translation>Деинтерлейсер компенсации движения. Портирован из MPlayer.</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Fast</source>
-        <translation type="unfinished">Быстро</translation>
+        <translation>Быстро</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium</source>
-        <translation type="unfinished">Средне</translation>
+        <translation>Средне</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Slow iterative motion search</source>
-        <translation type="unfinished">Медленно (последовательный поиск движения)</translation>
+        <translation>Медленно (последовательный поиск движения)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Extra slow (same as 3+multiple reference frames)</source>
-        <translation type="unfinished">Очень медленно (то же, что и 3 + multiple reference frames)</translation>
+        <translation>Очень медленно (то же, что и 3 + несколько опорных кадров)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Режим:</translation>
+        <translation>_Режим:</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>mcDeinterlace</source>
-        <translation type="unfinished">mc Деинтерлейс</translation>
+        <translation>mcDeinterlace</translation>
     </message>
     <message>
         <location line="-51"/>
         <source>MCDeint</source>
-        <translation type="unfinished"></translation>
+        <translation>MCDeint</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Bottom :</source>
-        <translation type="unfinished">Снизу :</translation>
+        <translation>Снизу:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Qp:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Qp:</translation>
     </message>
 </context>
 <context>
@@ -7676,12 +9439,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Mean.cpp" line="+27"/>
         <source>Mean convolution.</source>
-        <translation type="unfinished">Средняя свертка.</translation>
+        <translation>Средняя свёртка.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :mean.</source>
-        <translation type="unfinished">Фильтр свертки 3x3 :mean.</translation>
+        <translation>Фильтр свёртки 3x3 :mean.</translation>
     </message>
 </context>
 <context>
@@ -7689,12 +9452,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Median.cpp" line="+28"/>
         <source>Median convolution.</source>
-        <translation type="unfinished">Медианная свертка</translation>
+        <translation>Медианная свёртка.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :median.</source>
-        <translation type="unfinished">Фильтр свертки 3x3 :median.</translation>
+        <translation>Фильтр свёртки 3x3 :median.</translation>
     </message>
 </context>
 <context>
@@ -7702,12 +9465,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidMergeField.cpp" line="+52"/>
         <source>Merge Fields</source>
-        <translation type="unfinished">Объединить поля</translation>
+        <translation>Объединить поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Merge two pictures as if they were two fields.</source>
-        <translation type="unfinished">Объединяет две картинки, как будто они из двух полей.</translation>
+        <translation>Объединяет две картинки, как будто они из двух полей.</translation>
     </message>
 </context>
 <context>
@@ -7720,7 +9483,7 @@
 Только VP8/VP9/AV1 поддерживаются как видео и Vorbis/Opus как аудио</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation>Сохранение в формате WebM</translation>
     </message>
@@ -7744,96 +9507,96 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp" line="+33"/>
         <source>Derived from display width</source>
-        <translation>Производный ширины изображения</translation>
+        <translation>От ширины изображения</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>0: sRGB</source>
-        <translation type="unfinished"></translation>
+        <translation>0: sRGB</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+22"/>
         <location line="+21"/>
         <source>1: ITU-R BT.709</source>
-        <translation type="unfinished"></translation>
+        <translation>1: ITU-R BT.709</translation>
     </message>
     <message>
         <location line="-42"/>
         <location line="+22"/>
         <location line="+21"/>
         <source>2: Unspecified</source>
-        <translation type="unfinished"></translation>
+        <translation>2: Не указано</translation>
     </message>
     <message>
         <location line="-42"/>
         <location line="+22"/>
         <location line="+21"/>
         <source>3: Reserved</source>
-        <translation type="unfinished"></translation>
+        <translation>3: Зарезервировано</translation>
     </message>
     <message>
         <location line="-42"/>
         <source>4: US FCC 73.682</source>
-        <translation type="unfinished"></translation>
+        <translation>4: US FCC 73.682</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>5: ITU-R BT.470BG</source>
-        <translation type="unfinished"></translation>
+        <translation>5: ITU-R BT.470BG</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+22"/>
         <source>6: SMPTE 170M</source>
-        <translation type="unfinished"></translation>
+        <translation>6: SMPTE 170M</translation>
     </message>
     <message>
         <location line="-21"/>
         <location line="+22"/>
         <location line="+21"/>
         <source>7: SMPTE 240M</source>
-        <translation type="unfinished"></translation>
+        <translation>7: SMPTE 240M</translation>
     </message>
     <message>
         <location line="-42"/>
         <source>8: YCoCg</source>
-        <translation type="unfinished"></translation>
+        <translation>8: YCoCg</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>9: BT2020 Non-constant Luminance</source>
-        <translation type="unfinished"></translation>
+        <translation>9: BT2020 Непостоянная яркость</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>10: BT2020 Constant Luminance</source>
-        <translation type="unfinished"></translation>
+        <translation>10: BT2020 Постоянная яркость</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>11: SMPTE ST 2085</source>
-        <translation type="unfinished"></translation>
+        <translation>11: SMPTE ST 2085</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>12: Chroma-derived Non-constant Luminance</source>
-        <translation type="unfinished"></translation>
+        <translation>12: Непостоянная яркость, полученная из цветности</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>13: Chroma-derived Constant Luminance</source>
-        <translation type="unfinished"></translation>
+        <translation>13: Постоянная яркость, полученная из цветности</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>14: ITU-R BT.2100-0</source>
-        <translation type="unfinished"></translation>
+        <translation>14: ITU-R BT.2100-0</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>0: Unspecified</source>
-        <translation type="unfinished"></translation>
+        <translation>0: Не указано</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7849,117 +9612,117 @@
         <location line="+3"/>
         <location line="+21"/>
         <source>0: Reserved</source>
-        <translation type="unfinished"></translation>
+        <translation>0: Зарезервировано</translation>
     </message>
     <message>
         <location line="-17"/>
         <source>4: Gamma 2.2 curve - BT.470M</source>
-        <translation type="unfinished"></translation>
+        <translation>4: Кривая гаммы 2.2 - BT.470M</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>5: Gamma 2.8 curve - BT.470BG</source>
-        <translation type="unfinished"></translation>
+        <translation>5: Кривая гаммы 2.8 - BT.470BG</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>8: Linear</source>
-        <translation type="unfinished"></translation>
+        <translation>8: Линейный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>9: Logarithmic (100:1 range)</source>
-        <translation type="unfinished"></translation>
+        <translation>9: Logarithmic (100:1 range)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>10: Logarithmic (100 * Sqrt(10) : 1 range)</source>
-        <translation type="unfinished"></translation>
+        <translation>10: Logarithmic (100 * Sqrt(10) : 1 range)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>11: IEC 61966-2-4</source>
-        <translation type="unfinished"></translation>
+        <translation>11: IEC 61966-2-4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>12: ITU-R BT.1361 Extended Colour Gamut</source>
-        <translation type="unfinished"></translation>
+        <translation>12: ITU-R BT.1361 Расширенная цветовая гамма</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>13: IEC 61966-2-1</source>
-        <translation type="unfinished"></translation>
+        <translation>13: IEC 61966-2-1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>14: ITU-R BT.2020 10 bit</source>
-        <translation type="unfinished"></translation>
+        <translation>14: ITU-R BT.2020 10 bit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>15: ITU-R BT.2020 12 bit</source>
-        <translation type="unfinished"></translation>
+        <translation>15: ITU-R BT.2020 12 bit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>16: ITU-R BT.2100 Perceptual Quantization</source>
-        <translation type="unfinished"></translation>
+        <translation>16: ITU-R BT.2100 Перцептивное квантование</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>17: SMPTE ST 428-1</source>
-        <translation type="unfinished"></translation>
+        <translation>17: SMPTE ST 428-1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>18: ARIB STD-B67 (HLG)</source>
-        <translation type="unfinished"></translation>
+        <translation>18: ARIB STD-B67 (HLG)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4: ITU-R BT.470M</source>
-        <translation type="unfinished"></translation>
+        <translation>4: ITU-R BT.470M</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>5: ITU-R BT.470BG - BT.601 625</source>
-        <translation type="unfinished"></translation>
+        <translation>5: ITU-R BT.470BG - BT.601 625</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>6: ITU-R BT.601 525 - SMPTE 170M</source>
-        <translation type="unfinished"></translation>
+        <translation>6: ITU-R BT.601 525 - SMPTE 170M</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>8: Film</source>
-        <translation type="unfinished"></translation>
+        <translation>8: Фильм</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>9: ITU-R BT.2020</source>
-        <translation type="unfinished"></translation>
+        <translation>9: ITU-R BT.2020</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>10: SMPTE ST 428-1</source>
-        <translation type="unfinished"></translation>
+        <translation>10: SMPTE ST 428-1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>11: SMPTE RP 431-2</source>
-        <translation type="unfinished"></translation>
+        <translation>11: SMPTE RP 431-2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>12: SMPTE EG 432-2</source>
-        <translation type="unfinished"></translation>
+        <translation>12: SMPTE EG 432-2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>22: JEDEC P22 phosphors</source>
-        <translation type="unfinished"></translation>
+        <translation>22: JEDEC P22 phosphors</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -7984,7 +9747,7 @@
     <message>
         <location line="+1"/>
         <source>Matrix Coefficients:</source>
-        <translation type="unfinished"></translation>
+        <translation>Коэффициенты матрицы:</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7994,12 +9757,12 @@
     <message>
         <location line="+1"/>
         <source>Transfer Characteristic:</source>
-        <translation type="unfinished"></translation>
+        <translation>Характеристики перехода:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Color Primaries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Первичные цвета:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -8027,37 +9790,37 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.cpp" line="+201"/>
         <source>Mplayer Denoise 3D HQ</source>
-        <translation type="unfinished"></translation>
+        <translation>Mplayer Denoise 3D HQ</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Reduce noise, smooth image, increase compressibility. HQ Version.</source>
-        <translation type="unfinished">Уменьшение шума, сглаживание изображения, увеличение сжатия. Версия в высоком качестве.</translation>
+        <translation>Уменьшение шума, сглаживание изображения, увеличение сжатия. Версия высокого качества.</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>_Spatial luma strength:</source>
-        <translation type="unfinished">_Пространственная сила luma:</translation>
+        <translation>_Пространственный уровень яркости (luma):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>S_patial chroma strength:</source>
-        <translation type="unfinished">П_ространственная сила chroma:</translation>
+        <translation>П_ространственный уровень цветности (chroma):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Temporal luma strength:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Временной уровень яркости (luma):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>T_emporal chroma strength:</source>
-        <translation type="unfinished"></translation>
+        <translation>Вр_еменной уровень цветности (chroma):</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>MPlayer Denoise 3D HQ</source>
-        <translation type="unfinished"></translation>
+        <translation>MPlayer Denoise 3D HQ</translation>
     </message>
 </context>
 <context>
@@ -8065,43 +9828,44 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.cpp" line="+37"/>
         <source>Reduce noise, smooth image, increase compressibility.</source>
-        <translation type="unfinished">Уменьшает шум, сглаживает картинку, улучшает сжимаемость.</translation>
+        <translation>Уменьшение шума, сглаживание изображения, увеличение сжатия.</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>_Temporal strength:</source>
-        <translation type="unfinished">Сила фильтра :</translation>
+        <translation>_Временной уровень:</translation>
     </message>
     <message>
         <location line="-35"/>
         <source>Mplayer Denoise 3D</source>
-        <translation type="unfinished"></translation>
+        <translation>Mplayer Denoise 3D</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>_Spatial luma strength:</source>
-        <translation type="unfinished">_Пространственная сила luma:</translation>
+        <translation>_Пространственный уровень яркости (luma):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>S_patial chroma strength:</source>
-        <translation type="unfinished">П_ространственная сила chroma:</translation>
+        <translation>П_ространственный уровень цветности (chroma):</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MPlayer Denoise 3D</source>
-        <translation type="unfinished"></translation>
+        <translation>MPlayer Denoise 3D</translation>
     </message>
 </context>
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Ошибка чтения заголовков SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation>Декодирование типа кадров</translation>
     </message>
@@ -8109,7 +9873,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Не поддерживается</translation>
     </message>
@@ -8144,7 +9908,7 @@
         <translation>Только AAC, AC3, DTS, E-AC3, MP2, MP3 и Vorbis поддерживаются как аудио</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Сохранение в формате MP4</translation>
     </message>
@@ -8159,6 +9923,11 @@
         <translation>Сохранение в формате MOV</translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation>Оптимизация...</translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Формат мультиплексирования</translation>
@@ -8193,7 +9962,7 @@
     <message>
         <location line="+6"/>
         <source>Derived from display width</source>
-        <translation>Производный ширины изображения</translation>
+        <translation>От ширины изображения</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8208,7 +9977,7 @@
     <message>
         <location line="+4"/>
         <source>Do not rotate</source>
-        <translation>не вращать</translation>
+        <translation>Не вращать</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8289,71 +10058,76 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
-        <translation type="unfinished">Аудио</translation>
+        <translation>Аудио</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Audio format not supported, only AAC/MP3/AC3</source>
-        <translation type="unfinished">Формат аудио не поддерживается, только AAC/MP3/AC3</translation>
+        <translation>Формат аудио не поддерживается, только AAC/MP3/AC3</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Saving</source>
-        <translation type="unfinished">Сохранение</translation>
+        <translation>Сохранение</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Video</source>
-        <translation type="unfinished">Видео</translation>
+        <translation>Видео</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Video does not have enough timing information. Are you copying from AVI?</source>
-        <translation type="unfinished">В видео недостаточно информации для таймингов. Вы копируете из AVI?</translation>
+        <translation>В видео недостаточно информации о временных метках. Вы копируете из AVI?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation>Оптимизация</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
-        <translation type="unfinished">Невозможно переименовать файл (оптимизировать)</translation>
+        <translation>Невозможно переименовать файл (оптимизировать)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp" line="+53"/>
         <source>Invalid frequency for AC3. Only 32, 44.1 &amp; 48 kHz</source>
-        <translation type="unfinished">Неверная частота для AC3. Только 32, 44.1 &amp; 48 кГц</translation>
+        <translation>Неверная частота для AC3. Только 32, 44,1 и 48 кГц</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Invalid bitrate for AC3</source>
-        <translation type="unfinished">Неверный битрейт для AC3</translation>
+        <translation>Неверный битрейт для AC3</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Invalid number of channels for AC3</source>
-        <translation type="unfinished">Неверное количество каналов для AC3</translation>
+        <translation>Неверное количество каналов для AC3</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Cannot get AAC Extra data
 </source>
-        <translation type="unfinished">Невозможно получить дополнительные данные AAC
+        <translation>Невозможно получить дополнительные данные AAC
 </translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Config.cpp" line="+31"/>
         <source>Optimize for streaming (SLOW)</source>
-        <translation type="unfinished">Оптимизировать для стриминга (МЕДЛЕННО)</translation>
+        <translation>Оптимизировать для стриминга (МЕДЛЕННО)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add ipod metadata</source>
-        <translation type="unfinished">Добавить метаданные iPod</translation>
+        <translation>Добавить метаданные iPod</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>MP4V2 Settings</source>
-        <translation type="unfinished">Настройки MP4V2</translation>
+        <translation>Настройки MP4V2</translation>
     </message>
 </context>
 <context>
@@ -8362,52 +10136,52 @@
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/mpdelogo.ui" line="+14"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+14"/>
         <source>Mplayer Delogo</source>
-        <translation type="unfinished"></translation>
+        <translation>Mplayer Delogo</translation>
     </message>
     <message>
         <location line="+8"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+12"/>
         <source>X</source>
-        <translation type="unfinished"></translation>
+        <translation>X</translation>
     </message>
     <message>
         <location line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+37"/>
         <source>Y</source>
-        <translation type="unfinished"></translation>
+        <translation>Y</translation>
     </message>
     <message>
         <location line="+23"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-17"/>
         <source>Width</source>
-        <translation type="unfinished">Ширина</translation>
+        <translation>Ширина</translation>
     </message>
     <message>
         <location line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+7"/>
         <source>Height</source>
-        <translation type="unfinished">Высота</translation>
+        <translation>Высота</translation>
     </message>
     <message>
         <location line="+20"/>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="-14"/>
         <source>Border Width</source>
-        <translation type="unfinished">Ширина границы</translation>
+        <translation>Ширина границы</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>Preview. Click in the image above to coarsly set the box coordinates</source>
-        <translation type="unfinished">Предпросмотр. Щелкните на изображение выше для примерной установки координат</translation>
+        <translation>Предпросмотр. Щёлкните на изображение выше для примерной установки координат</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
-        <translation type="unfinished">Вы можете изменить размер красного прямоугольника с помощью указателей</translation>
+        <translation>Вы можете изменить размер красного прямоугольника с помощью указателей </translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui" line="+74"/>
         <source>Preview</source>
-        <translation type="unfinished">Предпросмотр</translation>
+        <translation>Предпросмотр</translation>
     </message>
 </context>
 <context>
@@ -8420,7 +10194,7 @@
     <message>
         <location line="+1"/>
         <source>Sharpen edges without amplifying noise. By Donald Graft.</source>
-        <translation>Повысить резкость граней без увеличения шума. От Donald Graft.</translation>
+        <translation>Повысить резкость граней без увеличения шума. От Дональда Графта.</translation>
     </message>
 </context>
 <context>
@@ -8431,22 +10205,21 @@
         <translation>Фильтр резкости MSharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Show full preview</source>
-        <translation>Показывать кадр полностью</translation>
+        <translation type="vanished">Показывать кадр полностью</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Показать маску</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Сила</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Порог</translation>
     </message>
@@ -8456,7 +10229,7 @@
         <translation>Высокое качество</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation>Обрабатывать цветность</translation>
     </message>
@@ -8464,22 +10237,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Невозможно перейти к следующему ключевому кадру</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Невозможно перейти к предыдущему ключевому кадру</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -8504,7 +10277,7 @@
     <message>
         <location line="+0"/>
         <source>Process luma plane</source>
-        <translation type="unfinished"></translation>
+        <translation>Обработать плоскость яркости (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8514,7 +10287,7 @@
     <message>
         <location line="+0"/>
         <source>Process chromaU plane</source>
-        <translation type="unfinished"></translation>
+        <translation>Обработать плоскость цветности (chroma) U</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8524,7 +10297,7 @@
     <message>
         <location line="+0"/>
         <source>Process chromaV plane</source>
-        <translation type="unfinished"></translation>
+        <translation>Обработать плоскость цветности (chroma) V</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -8547,17 +10320,17 @@
     <message>
         <location line="+1"/>
         <source>BluRay</source>
-        <translation type="unfinished"></translation>
+        <translation>BluRay</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency</source>
-        <translation>Минимальная задержка</translation>
+        <translation>Низкая задержка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Low Latency (LQ)</source>
-        <translation>Минимальная задержка (низкое качество)</translation>
+        <translation>Низкая задержка (низкое качество)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8572,40 +10345,40 @@
     <message>
         <location line="+1"/>
         <source>Bitrate (kbps):</source>
-        <translation>Битрейт (кб/с):</translation>
+        <translation>Битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Max Bitrate (kbps):</source>
-        <translation>Максимальный битрейт (кб/с):</translation>
+        <translation>Макс. битрейт (кбит/с):</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Nvidia H264 Encoder configuration</source>
-        <translation>Настройка кодировщика Nvidia H264</translation>
+        <translation>Настройки кодировщика Nvidia H264</translation>
     </message>
 </context>
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
-        <translation type="unfinished">Заголовок неверной формы</translation>
+        <translation>Заголовок неверной формы</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDMLDepack.cpp" line="+85"/>
         <source>Unpacking bitstream</source>
-        <translation type="unfinished">Распаковка потока</translation>
+        <translation>Распаковка потока</translation>
     </message>
 </context>
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
-        <translation>Частичное наложение &quot;%s&quot;</translation>
+        <translation>Частичное наложение «%s»</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8642,12 +10415,12 @@
     <message>
         <location line="+2"/>
         <source>Output format:</source>
-        <translation>Формат на выход:</translation>
+        <translation>Формат на выходе:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>PCM Configuration</source>
-        <translation>Настройка кодировщика PCM</translation>
+        <translation>Настройки кодировщика PCM</translation>
     </message>
 </context>
 <context>
@@ -8655,12 +10428,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/printInfo/printInfo.cpp" line="+44"/>
         <source>PrintInfo</source>
-        <translation type="unfinished"></translation>
+        <translation>PrintInfo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Display some informations on Screen.</source>
-        <translation type="unfinished">Вывод некоторой информации на экран.</translation>
+        <translation>Вывод отдельной информации на экран.</translation>
     </message>
 </context>
 <context>
@@ -8673,97 +10446,126 @@
     <message>
         <location line="+6"/>
         <source>Video</source>
-        <translation type="unfinished">Видео</translation>
+        <translation>Видео</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
-        <translation type="unfinished">Частота кадров:</translation>
+        <translation>Частота кадров:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
-        <translation type="unfinished">Общая продолжительность:</translation>
+        <translation>Общая длительность:</translation>
+    </message>
+    <message>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation>н/д</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
-        <translation type="unfinished">Соотношение сторон:</translation>
+        <translation>Соотношение сторон:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Image Size:</source>
-        <translation type="unfinished">Размер картинки:</translation>
+        <translation>Размер картинки:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Codec 4CC:</source>
-        <translation type="unfinished">Кодек 4СС:</translation>
+        <translation>Кодек 4СС:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation>Средний битрейт:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation>Дополнительные данные видеокодека</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation>Размер:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation>Дополнительные данные:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
-        <translation type="unfinished">Звук</translation>
+        <translation>Аудио</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Frequency:</source>
-        <translation>Частота выборки:</translation>
+        <translation>Частота дискретизации:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Variable Bitrate:</source>
-        <translation type="unfinished">Переменная частота:</translation>
+        <translation>Переменный битрейт:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>Битрейт:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Channels:</source>
-        <translation type="unfinished">Каналы:</translation>
+        <translation>Каналы:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Codec:</source>
-        <translation type="unfinished">Кодек:</translation>
+        <translation>Кодек:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation type="unfinished">Текстовая метка</translation>
+        <translation type="vanished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Extra Video Properties</source>
-        <translation type="unfinished">Дополнительные свойства видео</translation>
+        <translation type="vanished">Дополнительные свойства видео</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Размер дополнительных данных:</translation>
+        <translation type="vanished">Размер дополнительных данных:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Дополнительные данные:</translation>
+        <translation type="vanished">Дополнительные данные:</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
-        <translation>Скопировать в буфер обмена</translation>
+        <translation>Копировать в буфер обмена</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Да</translation>
     </message>
 </context>
 <context>
@@ -8771,68 +10573,68 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_psIndex.cpp" line="+243"/>
         <source>Indexing</source>
-        <translation>Индексирование</translation>
+        <translation>Индексация</translation>
     </message>
     <message>
         <location line="-32"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation>Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
+        <translation>Обнаружено несколько файлов с последовательными именами. Загрузить их все?</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp" line="+78"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
-        <translation>Этот файл был индексирован более старой версией Авидемукса.
+        <translation>Этот файл был индексирован более старой версией Avidemux.
 Файл необходимо переиндексировать. Продолжить?</translation>
     </message>
 </context>
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
-        <translation type="unfinished">Выбрать файл аудио</translation>
+        <translation>Выбрать файл аудио</translation>
     </message>
     <message>
         <location line="+22"/>
         <location line="+161"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="-161"/>
         <source>Cannot use that file as audio track</source>
-        <translation type="unfinished">Невозможно использовать файл как аудиодорожку</translation>
+        <translation>Невозможно использовать файл как аудиодорожку</translation>
     </message>
     <message>
         <location line="+161"/>
         <source>Some tracks are used multiple times</source>
-        <translation type="unfinished">Некоторые дорожки использованы несколько раз</translation>
+        <translation>Некоторые дорожки использованы несколько раз</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
-        <translation type="unfinished">Дорожка </translation>
+        <translation>Дорожка </translation>
     </message>
     <message>
         <location line="+0"/>
         <source> from video</source>
-        <translation type="unfinished"> из видео</translation>
+        <translation> из видео</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>File </source>
-        <translation type="unfinished">Файл </translation>
+        <translation>Файл </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
-        <translation type="unfinished">.... Добавить аудиодорожку</translation>
+        <translation>.... Добавить аудиодорожку</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>copy</source>
-        <translation type="unfinished">Копировать</translation>
+        <translation>копировать</translation>
     </message>
 </context>
 <context>
@@ -8841,31 +10643,35 @@
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+65"/>
         <location line="+20"/>
         <source>Privileges Required</source>
-        <translation type="unfinished">Требуются права</translation>
+        <translation>Требуются права</translation>
     </message>
     <message>
         <location line="-20"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
-        <translation type="unfinished">Для выполнения этой операции требуются права root.</translation>
+        <translation>Для выполнения этой операции требуются права root.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Первый проход</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pass 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">1 проход</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation>Второй проход</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
-        <translation type="unfinished"></translation>
+        <translation>Кодирование...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Процесс кодирования приостановлен. Вы хотите продолжить или прервать его?</translation>
     </message>
@@ -8903,12 +10709,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Новая версия&lt;/b&gt;&lt;br&gt;Версия %1&lt;br&gt;Выпущена %2.&lt;br&gt;Доступна для загрузки с адреса&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt;Вы можете отключить автоматическую проверку обновлений в настройках.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Предыдущие файлы</translation>
     </message>
@@ -8918,12 +10724,17 @@
         <translation>Предыдущие проекты</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation>Восстановить стандартный набор</translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
-        <translation type="unfinished"></translation>
+        <translation>?</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Старт/стоп</translation>
     </message>
@@ -8958,6 +10769,16 @@
         <translation>Поставить метку B</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation>Перейти к предыдущему разрезу</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation>Перейти к следующему разрезу</translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Первый кадр</translation>
@@ -8985,27 +10806,37 @@
     <message>
         <location line="+3"/>
         <source>Forward one minute</source>
-        <translation>Вперед на 1 минуту</translation>
+        <translation>Вперёд на 1 минуту</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation>Масштаб: </translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Приложение столкнулось с критической проблемой
-Ход текущего редактирования сохранен и будет загружен при следующем запуске</translation>
+Ход текущего редактирования сохранён и будет загружен при следующем запуске</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation>%c-%s</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation>Выборка: </translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9025,7 +10856,7 @@
     <message>
         <location line="+4"/>
         <source> Project</source>
-        <translation type="unfinished"> Проект</translation>
+        <translation> Проект</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -9035,7 +10866,7 @@
     <message>
         <location line="+5"/>
         <source>&amp;Debug Project...</source>
-        <translation type="unfinished">&amp;Отладить проект...</translation>
+        <translation>&amp;Отладить проект...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -9045,27 +10876,27 @@
     <message>
         <location line="+20"/>
         <source>Scripting Shell</source>
-        <translation type="unfinished">Скриптовая командная строка...</translation>
+        <translation>Командная строка скриптов</translation>
     </message>
     <message>
         <location line="+4"/>
         <source> Shell</source>
-        <translation type="unfinished"> Командная строка</translation>
+        <translation> Командная строка</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Scripting Reference</source>
-        <translation type="unfinished">Скриптовая сноска</translation>
+        <translation>Сноска скрипта</translation>
     </message>
     <message>
         <location line="+4"/>
         <source> Reference</source>
-        <translation type="unfinished"> Сноска</translation>
+        <translation> Сноска</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
-        <translation>Восстановить предыдущую сессию</translation>
+        <translation>Восстановить прошлую сессию</translation>
     </message>
 </context>
 <context>
@@ -9073,83 +10904,83 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_jobs.cpp" line="+13"/>
         <source>Ready</source>
-        <translation type="unfinished">Готово</translation>
+        <translation>Готово</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Succeeded</source>
-        <translation type="unfinished">Выполнено</translation>
+        <translation>Выполнено</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Failed</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Deleted</source>
-        <translation type="unfinished">Удалено</translation>
+        <translation>Удалено</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Running</source>
-        <translation type="unfinished">Выполняется</translation>
+        <translation>Выполняется</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Job Name</source>
-        <translation type="unfinished">Имя задания</translation>
+        <translation>Имя задания</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Status</source>
-        <translation type="unfinished">Статус</translation>
+        <translation>Статус</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Start Time</source>
-        <translation type="unfinished">Начальное время</translation>
+        <translation>Начальное время</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>End Time</source>
-        <translation type="unfinished">Конечное время</translation>
+        <translation>Конечное время</translation>
     </message>
     <message>
         <location line="+64"/>
         <location line="+15"/>
         <source>Sure!</source>
-        <translation type="unfinished">Да</translation>
+        <translation>Да!</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Delete job</source>
-        <translation type="unfinished">Удалить задание</translation>
+        <translation>Удалить задание</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete %s job?</source>
-        <translation type="unfinished">Вы уверены, что хотите удалить задание %s?</translation>
+        <translation>Вы уверены, что хотите удалить задание %s?</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Delete *all* job</source>
-        <translation type="unfinished">Удалить все задания</translation>
+        <translation>Удалить *все* задания</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure you want to delete ALL jobs?</source>
-        <translation type="unfinished">Вы уверены что хотите удалить все задания?</translation>
+        <translation>Вы уверены, что хотите удалить ВСЕ задания?</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Already done</source>
-        <translation type="unfinished">Уже сделано</translation>
+        <translation>Уже сделано</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This script has already been successfully executed.</source>
-        <translation type="unfinished">Этот скрипт уже был выполнен.</translation>
+        <translation>Этот скрипт уже был выполнен.</translation>
     </message>
 </context>
 <context>
@@ -9157,36 +10988,37 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_license.cpp" line="+25"/>
         <source>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;&gt;&lt;html&gt;&lt;head&gt;  &lt;title&gt;Avidemux is free software; you can redistribute it and/or  modify it under the terms of the GNU General Public License  version 2 as published by the Free Software Foundation&lt;/title&gt;&lt;style type=&quot;text/css&quot;&gt;&lt;!-- /* Style Definitions */ p.licenseStyle, li.licenseStyle, div.licenseStyle        {margin:0cm;        margin-bottom:.0001pt;        font-size:12.0pt;        font-family:&quot;Times New Roman&quot;;} /* Page Definitions */ @page Section1        {size:612.0pt 792.0pt;        margin:72.0pt 90.0pt 72.0pt 90.0pt;}div.Section1        {page:Section1;}--&gt;&lt;/style&gt;&lt;/head&gt;&lt;body lang=&quot;EN-GB&quot; style=&apos;text-justify-trim:punctuation&apos;&gt;  &lt;div class=&quot;Section1&quot;&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;Avidemux is    free software; you can redistribute it and/or modify it under    the terms of the GNU General Public License version 2 as    published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;b&gt;&lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt;    &lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Version 2, June    1991&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Copyright (C) 1989, 1991    Free Software Foundation, Inc.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;59 Temple Place, Suite    330, Boston, MA  02111-1307  USA&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;span lang=&quot;FR&quot; style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Everyone is permitted to    copy and distribute verbatim copies of this license document,    but changing it is not allowed.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Preamble&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The licenses for most    software are designed to take away your freedom to share and    change it.  By contrast, the GNU General Public License is    intended to guarantee your freedom to share and change free    software--to make sure the software is free for all its users.     This General Public License applies to most of the Free    Software Foundation&apos;s software and to any other program whose    authors commit to using it.  (Some other Free Software    Foundation software is covered by the GNU Library General    Public License instead.)  You can apply it to your programs,    too.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;When we speak of free    software, we are referring to freedom, not price.  Our General    Public Licenses are designed to make sure that you have the    freedom to distribute copies of free software (and charge for    this service if you wish), that you receive source code or can    get it if you want it, that you can change the software or use    pieces of it in new free programs; and that you know you can do    these things.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;To protect your rights, we    need to make restrictions that forbid anyone to deny you these    rights or to ask you to surrender the rights. These    restrictions translate to certain responsibilities for you if    you distribute copies of the software, or if you modify    it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;For example, if you    distribute copies of such a program, whether gratis or for a    fee, you must give the recipients all the rights that you have.     You must make sure that they, too, receive or can get the    source code.  And you must show them these terms so they know    their rights.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;We protect your rights    with two steps: (1) copyright the software, and (2) offer you    this license which gives you legal permission to copy,    distribute and/or modify the software.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Also, for each author&apos;s    protection and ours, we want to make certain that everyone    understands that there is no warranty for this free software.     If the software is modified by someone else and passed on, we    want its recipients to know that what they have is not the    original, so that any problems introduced by others will not    reflect on the original authors&apos; reputations.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Finally, any free program    is threatened constantly by software patents.  We wish to avoid    the danger that redistributors of a free program will    individually obtain patent licenses, in effect making the    program proprietary.  To prevent this, we have made it clear    that any patent must be licensed for everyone&apos;s free use or not    licensed at all.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The precise terms and    conditions for copying, distribution and modification    follow.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;GNU GENERAL PUBLIC    LICENSE&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;TERMS AND CONDITIONS FOR    COPYING, DISTRIBUTION AND MODIFICATION&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;0. This License applies to    any program or other work which contains a notice placed by the    copyright holder saying it may be distributed under the terms    of this General Public License.  The &quot;Program&quot;, below, refers    to any such program or work, and a &quot;work based on the Program&quot;    means either the Program or any derivative work under copyright    law: that is to say, a work containing the Program or a portion    of it, either verbatim or with modifications and/or translated    into another language.  (Hereinafter, translation is included    without limitation in the term &quot;modification&quot;.)  Each licensee    is addressed as &quot;you&quot;.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Activities other than    copying, distribution and modification are not covered by this    License; they are outside its scope.  The act of running the    Program is not restricted, and the output from the Program is    covered only if its contents constitute a work based on the    Program (independent of having been made by running the    Program). Whether that is true depends on what the Program    does.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;1. You may copy and    distribute verbatim copies of the Program&apos;s source code as you    receive it, in any medium, provided that you conspicuously and    appropriately publish on each copy an appropriate copyright    notice and disclaimer of warranty; keep intact all the notices    that refer to this License and to the absence of any warranty;    and give any other recipients of the Program a copy of this    License along with the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;You may charge a fee for    the physical act of transferring a copy, and you may at your    option offer warranty protection in exchange for a    fee.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;2. You may modify your    copy or copies of the Program or any portion of it, thus    forming a work based on the Program, and copy and distribute    such modifications or work under the terms of Section 1 above,    provided that you also meet all of these conditions:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) You must cause the    modified files to carry prominent notices stating that you    changed the files and the date of any change.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) You must cause any work    that you distribute or publish, that in whole or in part    contains or is derived from the Program or any part thereof, to    be licensed as a whole at no charge to all third parties under    the terms of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) If the modified program    normally reads commands interactively when run, you must cause    it, when started running for such interactive use in the most    ordinary way, to print or display an announcement including an    appropriate copyright notice and a notice that there is no    warranty (or else, saying that you provide a warranty) and that    users may redistribute the program under these conditions, and    telling the user how to view a copy of this License.     (Exception: if the Program itself is interactive but does not    normally print such an announcement, your work based on the    Program is not required to print an announcement.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;These requirements apply    to the modified work as a whole.  If identifiable sections of    that work are not derived from the Program, and can be    reasonably considered independent and separate works in    themselves, then this License, and its terms, do not apply to    those sections when you distribute them as separate works.  But    when you distribute the same sections as part of a whole which    is a work based on the Program, the distribution of the whole    must be on the terms of this License, whose permissions for    other licensees extend to the entire whole, and thus to each    and every part regardless of who wrote it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Thus, it is not the intent    of this section to claim rights or contest your rights to work    written entirely by you; rather, the intent is to exercise the    right to control the distribution of derivative or collective    works based on the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;In addition, mere    aggregation of another work not based on the Program with the    Program (or with a work based on the Program) on a volume of a    storage or distribution medium does not bring the other work    under the scope of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;3. You may copy and    distribute the Program (or a work based on it, under Section 2)    in object code or executable form under the terms of Sections 1    and 2 above provided that you also do one of the    following:&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;a) Accompany it with the    complete corresponding machine-readable source code, which must    be distributed under the terms of Sections 1 and 2 above on a    medium customarily used for software interchange;    or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;b) Accompany it with a    written offer, valid for at least three years, to give any    third party, for a charge no more than your cost of physically    performing source distribution, a complete machine-readable    copy of the corresponding source code, to be distributed under    the terms of Sections 1 and 2 above on a medium customarily    used for software interchange; or,&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;c) Accompany it with the    information you received as to the offer to distribute    corresponding source code.  (This alternative is allowed only    for noncommercial distribution and only if you received the    program in object code or executable form with such an offer,    in accord with Subsection b above.)&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;The source code for a work    means the preferred form of the work for making modifications    to it.  For an executable work, complete source code means all    the source code for all modules it contains, plus any    associated interface definition files, plus the scripts used to    control compilation and installation of the executable.     However, as a special exception, the source code distributed    need not include anything that is normally distributed (in    either source or binary form) with the major components    (compiler, kernel, and so on) of the operating system on which    the executable runs, unless that component itself accompanies    the executable.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If distribution of    executable or object code is made by offering access to copy    from a designated place, then offering equivalent access to    copy the source code from the same place counts as distribution    of the source code, even though third parties are not compelled    to copy the source along with the object code.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;4. You may not copy,    modify, sublicense, or distribute the Program except as    expressly provided under this License.  Any attempt otherwise    to copy, modify, sublicense or distribute the Program is void,    and will automatically terminate your rights under this    License. However, parties who have received copies, or rights,    from you under this License will not have their licenses    terminated so long as such parties remain in full    compliance.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;5. You are not required to    accept this License, since you have not signed it.  However,    nothing else grants you permission to modify or distribute the    Program or its derivative works.  These actions are prohibited    by law if you do not accept this License.  Therefore, by    modifying or distributing the Program (or any work based on the    Program), you indicate your acceptance of this License to do    so, and all its terms and conditions for copying, distributing    or modifying the Program or works based on it.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;6. Each time you    redistribute the Program (or any work based on the Program),    the recipient automatically receives a license from the    original licensor to copy, distribute or modify the Program    subject to these terms and conditions.  You may not impose any    further restrictions on the recipients&apos; exercise of the rights    granted herein. You are not responsible for enforcing    compliance by third parties to this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;7. If, as a consequence of    a court judgment or allegation of patent infringement or for    any other reason (not limited to patent issues), conditions are    imposed on you (whether by court order, agreement or otherwise)    that contradict the conditions of this License, they do not    excuse you from the conditions of this License.  If you cannot    distribute so as to satisfy simultaneously your obligations    under this License and any other pertinent obligations, then as    a consequence you may not distribute the Program at all.  For    example, if a patent license would not permit royalty-free    redistribution of the Program by all those who receive copies    directly or indirectly through you, then the only way you could    satisfy both it and this License would be to refrain entirely    from distribution of the Program.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;If any portion of this    section is held invalid or unenforceable under any particular    circumstance, the balance of the section is intended to apply    and the section as a whole is intended to apply in other    circumstances.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;It is not the purpose of    this section to induce you to infringe any patents or other    property right claims or to contest validity of any such    claims; this section has the sole purpose of protecting the    integrity of the free software distribution system, which is    implemented by public license practices.  Many people have made    generous contributions to the wide range of software    distributed through that system in reliance on consistent    application of that system; it is up to the author/donor to    decide if he or she is willing to distribute software through    any other system and a licensee cannot impose that    choice.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;This section is intended    to make thoroughly clear what is believed to be a consequence    of the rest of this License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;8. If the distribution    and/or use of the Program is restricted in certain countries    either by patents or by copyrighted interfaces, the original    copyright holder who places the Program under this License may    add an explicit geographical distribution limitation excluding    those countries, so that distribution is permitted only in or    among countries not thus excluded.  In such case, this License    incorporates the limitation as if written in the body of this    License.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;9. The Free Software    Foundation may publish revised and/or new versions of the    General Public License from time to time.  Such new versions    will be similar in spirit to the present version, but may    differ in detail to address new problems or    concerns.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;Each version is given a    distinguishing version number.  If the Program specifies a    version number of this License which applies to it and &quot;any    later version&quot;, you have the option of following the terms and    conditions either of that version or of any later version    published by the Free Software Foundation.  If the Program does    not specify a version number of this License, you may choose    any version ever published by the Free Software    Foundation.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;10. If you wish to    incorporate parts of the Program into other free programs whose    distribution conditions are different, write to the author to    ask for permission.  For software which is copyrighted by the    Free Software Foundation, write to the Free Software    Foundation; we sometimes make exceptions for this.  Our    decision will be guided by the two goals of preserving the free    status of all derivatives of our free software and of promoting    the sharing and reuse of software generally.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;NO WARRANTY&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;11. BECAUSE THE PROGRAM IS    LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM,    TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER    PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY    KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A    PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND    PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM    PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY    SERVICING, REPAIR OR CORRECTION.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=    &apos;text-align:justify;text-autospace:none&apos;&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;12. IN NO EVENT UNLESS    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY    COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU    FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR    CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO    USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR    DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR    THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY    OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.&lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; align=&quot;center&quot; style=    &apos;text-align:center;text-autospace:none&apos;&gt;&lt;b&gt;&lt;span style=    &apos;font-size:10.0pt;font-family:Arial&apos;&gt;END OF TERMS AND    CONDITIONS&lt;/span&gt;&lt;/b&gt;&lt;/p&gt;    &lt;p class=&quot;licenseStyle&quot; style=&apos;text-autospace:none&apos;&gt;    &lt;span style=&apos;font-size:10.0pt; font-family:Arial&apos;&gt; &lt;/span&gt;&lt;/p&gt;  &lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Частичное наложение</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
-        <translation>Этот фильтр не может быть применен только к части видео</translation>
+        <translation>Этот фильтр нельзя применить только к части видео</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
-        <translation>Настройка</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location line="-2"/>
@@ -9194,29 +11026,70 @@
         <translation>Переместить вверх</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation>Предпросмотр</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation>ОТКЛЮЧЕНО </translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation>Этот фильтр не применим к части видео</translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Переместить вниз</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation>Дублировать</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Сделать частичным</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation>Включить / отключить</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation>Отключить</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation>Включить</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation>Сделать глобальным</translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation>Применить конфигурацию и закрыть диалог: %s</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
-        <translation type="unfinished">Загрузить фильтры видео...</translation>
+        <translation>Загрузить фильтры видео…</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save video filters..</source>
-        <translation type="unfinished">Сохранить фильтры видео...</translation>
+        <translation>Сохранить фильтры видео…</translation>
     </message>
 </context>
 <context>
@@ -9227,7 +11100,7 @@
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>_Продолжить</translation>
     </message>
@@ -9254,8 +11127,23 @@
         <source>Yes</source>
         <translation>Да</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation>н/д</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation>%d кбит/c</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation>(+%d байт)</translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9275,94 +11163,79 @@
         <translation>Стерео</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Video</source>
-        <translation>Видео</translation>
+        <translation type="vanished">Видео</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>Кодек 4CC:	</translation>
+        <translation type="vanished">Кодек 4CC:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Размер картинки:</translation>
+        <translation type="vanished">Размер картинки:</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>Соотношение сторон:</translation>
+        <translation type="vanished">Соотношение сторон:</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>Частота выборки:</translation>
+        <translation type="vanished">Частота выборки:</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Продолжительность:</translation>
+        <translation type="vanished">Общая длительность:</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Дополнительные свойства видео</translation>
+        <translation type="vanished">Дополнительные свойства видео</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>Размер дополнительных данных:</translation>
+        <translation type="vanished">Размер дополнительных данных:</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>Дополнительные данные:</translation>
+        <translation type="vanished">Дополнительные данные:</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>Звук</translation>
+        <translation type="vanished">Звук</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>Кодек:		</translation>
+        <translation type="vanished">Кодек:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Каналы:	</translation>
+        <translation type="vanished">Каналы:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>Битрейт:	</translation>
+        <translation type="vanished">Битрейт:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Частота выборки:</translation>
+        <translation type="vanished">Частота выборки:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation>Без звука</translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation>%2.3f кадров/с</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d,%03d</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
@@ -9373,7 +11246,7 @@
         <location filename="../ADM_userInterfaces/ADM_shell/Q_shell.cpp" line="+58"/>
         <source>Enter your commands then press the evaluate button or CTRL+ENTER.
 </source>
-        <translation>Введите команды и нажмите кнопку &quot;Выполнить&quot; или CTRL+ENTER.
+        <translation>Введите команды и нажмите кнопку «Выполнить» или CTRL+ENTER.
 </translation>
     </message>
     <message>
@@ -9389,7 +11262,7 @@
         <location line="+2"/>
         <source>Enter your commands then press the evaluate button or ⌘⏎.
 </source>
-        <translation>Введите команды и нажмите кнопку &quot;Выполнить&quot; или ⌘⏎.
+        <translation>Введите команды и нажмите кнопку «Выполнить» или ⌘⏎.
 </translation>
     </message>
     <message>
@@ -9407,31 +11280,31 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/alert_qt4.cpp" line="+33"/>
         <source>Alert</source>
-        <translation type="unfinished">Внимание</translation>
+        <translation>Оповещение</translation>
     </message>
     <message>
         <location line="+6"/>
         <location line="+25"/>
         <location line="+25"/>
         <source>Info</source>
-        <translation type="unfinished">Информация</translation>
+        <translation>Информация</translation>
     </message>
     <message>
         <location line="+26"/>
         <location line="+31"/>
         <source>Confirmation</source>
-        <translation type="unfinished">Подтверждение</translation>
+        <translation>Подтверждение</translation>
     </message>
     <message>
         <location line="+21"/>
         <location line="+33"/>
         <source>Question</source>
-        <translation type="unfinished">Вопрос</translation>
+        <translation>Вопрос</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Question?</source>
-        <translation type="unfinished">Вопрос?</translation>
+        <translation>Вопрос?</translation>
     </message>
 </context>
 <context>
@@ -9439,7 +11312,64 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_gui/ADM_qtray.cpp" line="+82"/>
         <source>Open Avidemux</source>
-        <translation type="unfinished">Открыть Avidemux</translation>
+        <translation>Открыть Avidemux</translation>
+    </message>
+</context>
+<context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation>Четырёхугольное преобразование</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation>Четырёхточечное преобразование.</translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation>Четырёхугольное преобразование</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation>Билинейная</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Бикубическая</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation>Интерполяция:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation>Масштаб:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation>Δy:</translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation>Δx:</translation>
     </message>
 </context>
 <context>
@@ -9447,7 +11377,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
         <source>Select Idx File</source>
-        <translation type="unfinished">Выбрать файл IDX</translation>
+        <translation>Выбрать файл IDX</translation>
     </message>
 </context>
 <context>
@@ -9460,17 +11390,17 @@
     <message>
         <location line="+3"/>
         <source>Video Only Muxer Settings</source>
-        <translation>Настройки мультиплексора Video Only</translation>
+        <translation>Настройки мультиплексора только для видео</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation>Сохранение чистого видеопотока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>None</source>
-        <translation>без контейнера</translation>
+        <translation>Нет</translation>
     </message>
 </context>
 <context>
@@ -9478,53 +11408,53 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/removePlane/removePlane.cpp" line="+45"/>
         <source>Remove  Plane</source>
-        <translation type="unfinished">Удалить плоскость</translation>
+        <translation>Удалить плоскость</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Y,U or V plane (used mainly to debug other filters).</source>
-        <translation type="unfinished">Удалить плоскость Y, U или V (используется в основном для отладки других фильтров).</translation>
+        <translation>Удалить плоскость Y, U или V (используется в основном для отладки других фильтров).</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Keep Y Plane</source>
-        <translation type="unfinished">Сохранить плоскость Y</translation>
+        <translation>Сохранить плоскость Y</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process luma plane</source>
-        <translation type="unfinished">Обработать плоскость luma</translation>
+        <translation>Обработать плоскость яркости (luma)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep U Plane</source>
-        <translation type="unfinished">Сохранить плоскость U</translation>
+        <translation>Сохранить плоскость U</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process chromaU plane</source>
-        <translation type="unfinished">Обработать плоскость chromaU</translation>
+        <translation>Обработать плоскость цветности (chroma) U</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Keep V Plane</source>
-        <translation type="unfinished">Сохранить плоскость V</translation>
+        <translation>Сохранить плоскость V</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Process chromaV plane</source>
-        <translation type="unfinished">Обработать плоскость chromaV</translation>
+        <translation>Обработать плоскость цветности (chroma) V</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove plane</source>
-        <translation type="unfinished">Удалить плоскость</translation>
+        <translation>Удалить плоскость</translation>
     </message>
 </context>
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Режим:</translation>
     </message>
@@ -9534,60 +11464,80 @@
         <translation>Новая _частота кадров:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
-        <translation>Ресамплировать видео</translation>
+        <translation>Преобразовать кадровую частоту</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Вручную</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>25  (PAL)</source>
-        <translation type="unfinished"></translation>
+        <translation>25  (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>23.976 (Film)</source>
-        <translation type="unfinished"></translation>
+        <translation>23,976 (Film)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>29.97 (NTSC)</source>
-        <translation type="unfinished"></translation>
+        <translation>29,97 (NTSC)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>50 (Pal)</source>
-        <translation type="unfinished"></translation>
+        <translation>50 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>59.94  (NTSC)</source>
-        <translation type="unfinished"></translation>
+        <translation>59,94  (NTSC)</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
-        <translation>Ресамплировать видео</translation>
+        <translation>Преобразовать кадровую частоту</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
-        <translation>Ресамплировать видео под данную частоту кадров при сохранении продолжительности и синхронизации.</translation>
+        <translation>Преобразовать кадровую частоту при сохранении длительности и синхронизации.</translation>
+    </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation>нет</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation>Смешивание</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation>Компенсация движения</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation>_Интерполяция:</translation>
     </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
-        <translation>Ширина и высота не могут быть нечетными</translation>
+        <translation>Ширина и высота не могут быть нечётными</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>swsResize</translation>
     </message>
@@ -9621,12 +11571,12 @@
         <translation>PAR на выходе:</translation>
     </message>
     <message>
-        <location line="+436"/>
+        <location line="+463"/>
         <source>Bicubic</source>
         <translation>Бикубический</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation>Соотношение сторон</translation>
     </message>
@@ -9641,7 +11591,7 @@
     </message>
     <message>
         <source>Destination:</source>
-        <translation type="obsolete">Приемник:</translation>
+        <translation type="obsolete">Приёмник:</translation>
     </message>
     <message>
         <location line="+90"/>
@@ -9704,7 +11654,17 @@
         <translation>0,00 / 0,00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation>0,0000</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation>(00:00)</translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Алгоритм изменения размера:</translation>
     </message>
@@ -9716,26 +11676,31 @@
     <message>
         <location line="+10"/>
         <source>Lanczos-3</source>
-        <translation>Ланчош-3</translation>
+        <translation>Ланцош-3</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Spline</source>
         <translation>Сплайн</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation>Ближайший сосед</translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Повернуть</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>None</source>
-        <translation>Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9743,6 +11708,11 @@
         <translation>90 градусов</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation>90° по часовой стрелке</translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 градусов</translation>
@@ -9753,29 +11723,31 @@
         <translation>270 градусов</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation>90° против часовой стрелки</translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>Угол:</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-158"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>Повернуть изображение на 90/180/270 градусов.</translation>
     </message>
     <message>
-        <location line="+156"/>
         <source>90°</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">270°</translation>
     </message>
 </context>
 <context>
@@ -9786,19 +11758,29 @@
         <translation>Предпросмотр</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation>Просмотр оригинала</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation>Показать необработанный ввод</translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>Назад на 1 мин</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;&lt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;&lt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Play</source>
-        <translation type="unfinished">Воспроизвести</translation>
+        <translation>Воспроизвести</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9808,17 +11790,17 @@
     <message>
         <location line="+1"/>
         <source>&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&gt;&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&gt;&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Forward one minute</source>
-        <translation>Вперед на 1 мин</translation>
+        <translation>Вперёд на 1 мин</translation>
     </message>
 </context>
 <context>
@@ -9826,12 +11808,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fields/ADM_vidSeparateField.cpp" line="+53"/>
         <source>Separate Fields</source>
-        <translation type="unfinished">Разделить поля</translation>
+        <translation>Разделить поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Split each image into 2 fields.</source>
-        <translation type="unfinished">Разделить каждое изображение на 2 поля.</translation>
+        <translation>Разделить каждое изображение на 2 поля.</translation>
     </message>
 </context>
 <context>
@@ -9839,7 +11821,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp" line="-3"/>
         <source>Reload shader</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезагрузить шейдер</translation>
     </message>
 </context>
 <context>
@@ -9847,12 +11829,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fastConvolution/Sharpen.cpp" line="+27"/>
         <source>Sharpen convolution.</source>
-        <translation type="unfinished">Свертка резкости</translation>
+        <translation>Свёртка резкости.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3x3 convolution filter :sharpen.</source>
-        <translation type="unfinished">Фильтр свертки 3x3 :sharpen</translation>
+        <translation>Фильтр свёртки 3x3 :sharpen.</translation>
     </message>
 </context>
 <context>
@@ -9860,29 +11842,29 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/stackField.cpp" line="+47"/>
         <source>Stack Fields</source>
-        <translation type="unfinished">Стековые поля</translation>
+        <translation>Кладка полей</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Put even lines on top, odd lines at bottom.</source>
-        <translation type="unfinished">Установить четные линии вверх, нечетные вниз.</translation>
+        <translation>Расположить чётные линии сверху, нечётные снизу.</translation>
     </message>
 </context>
 <context>
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Стоп-кадр</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Повторять кадр в течение заданного времени.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>_Начало:</translation>
     </message>
@@ -9897,12 +11879,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/swapUV/swapUV.cpp" line="+41"/>
         <source>Swap UV</source>
-        <translation type="unfinished">Замена UV</translation>
+        <translation>Замена UV</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Swap the U and V planes.</source>
-        <translation type="unfinished">Замена плоскостей U и V.</translation>
+        <translation>Замена плоскостей U и V.</translation>
     </message>
 </context>
 <context>
@@ -9910,158 +11892,158 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide.cpp" line="+45"/>
         <source>Decomb telecide</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановитель Decomb</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Donald Graft Telecide. Replace ivtc pattern by progressive frames. Video stays at 30 fps.</source>
-        <translation type="unfinished">Donald Graft Telecide. Заменить паттерн ivtc прогрессивными кадрами. Частота кадров видео остается на 30 кадрах/с.</translation>
+        <translation>Восстановитель Дональда Графта. Заменить паттерн ivtc прогрессивными кадрами. Частота кадров видео остаётся равной 30.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp" line="+186"/>
         <source>No strategy</source>
-        <translation type="unfinished">Без стратегии</translation>
+        <translation>Без стратегии</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3:2 pulldown</source>
-        <translation type="unfinished"></translation>
+        <translation>Преобразование 3:2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>PAL/SECAM</source>
-        <translation type="unfinished"></translation>
+        <translation>PAL/SECAM</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>NTSC converted from PAL</source>
-        <translation type="unfinished">NTSC, конвертированный из PAL</translation>
+        <translation>NTSC, конвертированный из PAL</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Top</source>
-        <translation type="unfinished">Вверх</translation>
+        <translation>Вверх</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bottom</source>
-        <translation type="unfinished">Вниз</translation>
+        <translation>Вниз</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Never</source>
-        <translation type="unfinished">Никогда</translation>
+        <translation>Никогда</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>If still combed</source>
-        <translation type="unfinished">Если &quot;расческа&quot; осталась</translation>
+        <translation>Если  «гребень» остался</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Always</source>
-        <translation type="unfinished">Всегда</translation>
+        <translation>Всегда</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>None but compute</source>
-        <translation type="unfinished">Нет, но вычислить</translation>
+        <translation>Нет, но вычислить</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postproc on best match</source>
-        <translation type="unfinished">Постпроцессинг на лучшем совпадении</translation>
+        <translation>Постобработка при лучшем совпадении</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postproc and show zones (debug)</source>
-        <translation type="unfinished">Постпроцессинг и медленные зоны (отладка)</translation>
+        <translation>Постобработка и медленные зоны (отладка)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Process image (not fields)</source>
-        <translation type="unfinished">Обработать изображение (не поля)</translation>
+        <translation>Обработать изображение (не поля)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Process image (not fields), debug</source>
-        <translation type="unfinished">Обработать изображение (не поля), отладка</translation>
+        <translation>Обработать изображение (не поля), отладка</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Strategy:</source>
-        <translation type="unfinished">_Стратегия:</translation>
+        <translation>_Стратегия:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Field order:</source>
-        <translation type="unfinished">Пор_ядок полей:</translation>
+        <translation>Пор_ядок полей:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Postprocessing:</source>
-        <translation type="unfinished">П_остобработка:</translation>
+        <translation>П_остобработка:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Try backward:</source>
-        <translation type="unfinished">В обр_атном направлении:</translation>
+        <translation>В обр_атном направлении:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Direct threshold:</source>
-        <translation type="unfinished">_Порог прямого направления:</translation>
+        <translation>_Порог прямого направления:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Backward threshold:</source>
-        <translation type="unfinished">По_рог для обратного направления:</translation>
+        <translation>По_рог для обратного направления:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Noise threshold:</source>
-        <translation type="unfinished">Порог _шума:</translation>
+        <translation>Порог _шума:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Postp_rocessing threshold:</source>
-        <translation type="unfinished">Порог пос_тобработки:</translation>
+        <translation>Порог пос_тобработки:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Use chroma to decide</source>
-        <translation type="unfinished">Использовать _цвет (chroma) для определения</translation>
+        <translation>Использовать _цветность (chroma) для определения</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sho_w info</source>
-        <translation type="unfinished">Показать _информацию</translation>
+        <translation>Показать _информацию</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Debu_g</source>
-        <translation type="unfinished">От_ладка</translation>
+        <translation>От_ладка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bl_end</source>
-        <translation type="unfinished">См_ешивание</translation>
+        <translation>См_ешивание</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Decomb Telecide</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановитель Decomb</translation>
     </message>
 </context>
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation> ч</translation>
     </message>
@@ -10079,7 +12061,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation>Сохранить файл</translation>
     </message>
@@ -10098,10 +12080,10 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
-        <translation>Обнаружены несколько файлов с последовательными именами. Загрузить их все?</translation>
+        <translation>Обнаружено несколько файлов с последовательными именами. Загрузить их все?</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -10109,7 +12091,7 @@
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+19"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
-        <translation>Индексирование</translation>
+        <translation>Индексация</translation>
     </message>
     <message>
         <location line="+161"/>
@@ -10119,7 +12101,7 @@
     <message>
         <location line="+1"/>
         <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported, stopping here.</source>
-        <translation>Разрешение видео изменяется при кадре %u с %ux%u на %ux%u. Это не поддерживается, индексирование прекращено.</translation>
+        <translation>Разрешение видео в кадре %u меняется с %ux%u на %ux%u. Это не поддерживается, индексирование прекращено.</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -10127,13 +12109,15 @@
         <source>The size of the video changes at frame %u from %ux%u to %ux%u. This is unsupported and will result in a crash.
 Proceed nevertheless?
 This warning won&apos;t be shown again for this video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Разрешение видео в кадре %u меняется с %ux%u на %ux%u. Подобное не поддерживается и приведёт к сбою.
+Продолжить всё равно?
+Это предупреждение больше не будет отображаться для этого видео.</translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp" line="+84"/>
         <source>This file&apos;s index has been created with an older version of avidemux.
 The file must be re-indexed. Proceed?</source>
-        <translation>Этот файл был индексирован более старой версией Авидемукса.
+        <translation>Этот файл был индексирован более старой версией Avidemux.
 Файл необходимо переиндексировать. Продолжить?</translation>
     </message>
 </context>
@@ -10142,12 +12126,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp" line="+205"/>
         <source>_Bitrate:</source>
-        <translation type="unfinished">Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>TwoLame Configuration</source>
-        <translation type="unfinished">Настройка TwoLame</translation>
+        <translation>Настройки TwoLame</translation>
     </message>
 </context>
 <context>
@@ -10155,37 +12139,37 @@
     <message>
         <location filename="../ADM_userInterfaces/ui_support.cpp" line="+49"/>
         <source>X11</source>
-        <translation type="unfinished"></translation>
+        <translation>X11</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>MS Windows GDI</source>
-        <translation type="unfinished"></translation>
+        <translation>MS Windows GDI</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Mac OS X Quartz 2D</source>
-        <translation type="unfinished"></translation>
+        <translation>Mac OS X Quartz 2D</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Mac OS X QuickDraw</source>
-        <translation type="unfinished"></translation>
+        <translation>Mac OS X QuickDraw</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>OpenGL</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenGL</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>MS Windows Direct3D</source>
-        <translation type="unfinished"></translation>
+        <translation>MS Windows Direct3D</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Default Raster</source>
-        <translation type="unfinished">Растер по умолчанию</translation>
+        <translation>Растр по умолчанию</translation>
     </message>
 </context>
 <context>
@@ -10193,12 +12177,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stackField/unstackField.cpp" line="+47"/>
         <source>Unstack Fields</source>
-        <translation type="unfinished">Нестековые поля</translation>
+        <translation>Нестековые поля</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Weave top and bottom halves.</source>
-        <translation type="unfinished">Верхние и нижние половины.</translation>
+        <translation>Сплетение верхних и нижних половин.</translation>
     </message>
 </context>
 <context>
@@ -10206,17 +12190,17 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffUtVideo/ADM_utvideoEncoder.cpp" line="+108"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Left Neighbour</source>
-        <translation type="unfinished"></translation>
+        <translation>Сосед слева</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Median</source>
-        <translation type="unfinished"></translation>
+        <translation>Средний</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -10226,7 +12210,7 @@
     <message>
         <location line="+2"/>
         <source>Ut Video Encoder Configuration</source>
-        <translation>Конфигурация кодировщика Ut Video</translation>
+        <translation>Настройки кодировщика Ut Video</translation>
     </message>
 </context>
 <context>
@@ -10234,7 +12218,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/directVaEnc/libvaencPlugin.cpp" line="+77"/>
         <source>vaH264 Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки vaH264</translation>
     </message>
 </context>
 <context>
@@ -10242,12 +12226,12 @@
     <message>
         <location line="-4"/>
         <source>_IDR Period:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Период IDR:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Bitrate(kbps)</source>
-        <translation type="unfinished"></translation>
+        <translation>_Битрейт (кбит/с)</translation>
     </message>
 </context>
 <context>
@@ -10260,27 +12244,27 @@
     <message>
         <location line="+1"/>
         <source>Deinterlace and optionally resize video using VA-API.</source>
-        <translation>Устранить чересстрочность и по выбору изменить размер видео с помощью VA-API.</translation>
+        <translation>Устранить череccтрочность и по выбору изменить размер видео с помощью VA-API.</translation>
     </message>
     <message>
         <location line="+316"/>
         <source>Bob</source>
-        <translation type="unfinished"></translation>
+        <translation>Качение</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Weave</source>
-        <translation type="unfinished"></translation>
+        <translation>Сплетение</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Motion-Adaptive</source>
-        <translation type="unfinished"></translation>
+        <translation>Согласно движению</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Motion-Compensated</source>
-        <translation type="unfinished"></translation>
+        <translation>Компенсация движения</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -10320,7 +12304,7 @@
     <message>
         <location line="+2"/>
         <source>Deinterlacing</source>
-        <translation>Чересстрочность</translation>
+        <translation>Деинтерлейсинг</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -10381,7 +12365,7 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/ADM_vidVaapiFilter.cpp" line="+58"/>
         <source>VA-API Resize</source>
-        <translation>Изменить размер: VA-API</translation>
+        <translation>Изменить размер с VA-API</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10454,7 +12438,7 @@
     <message>
         <location line="+2"/>
         <source>_IVTC</source>
-        <translation>_Обратный телесин</translation>
+        <translation>_Обратный телесин (IVTC)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10464,7 +12448,7 @@
     <message>
         <location line="-4"/>
         <source>_Deint Mode:</source>
-        <translation>_Режим деинтерлейсинга:</translation>
+        <translation>_Режим деинтерлейса:</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -10515,12 +12499,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/verticalFlip/verticalFlip.cpp" line="+47"/>
         <source>Vertical Flip</source>
-        <translation type="unfinished">Вертикальное отражение</translation>
+        <translation>Вертикальное отражение</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Vertically flip the image.</source>
-        <translation type="unfinished">Вертикально отразить изображение.</translation>
+        <translation>Вертикально отразить изображение.</translation>
     </message>
 </context>
 <context>
@@ -10528,17 +12512,17 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/vobsub.ui" line="+13"/>
         <source>Subtitle Font Size and Position</source>
-        <translation type="unfinished">Размер шрифта и положение субтитров</translation>
+        <translation>Размер шрифта и положение субтитров</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Delay :</source>
-        <translation type="unfinished">Задержка:</translation>
+        <translation>Задержка:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Select File</source>
-        <translation type="unfinished">Выбрать файл</translation>
+        <translation>Выбрать файл</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -10548,7 +12532,7 @@
     <message>
         <location line="+7"/>
         <source>Idx File :</source>
-        <translation type="unfinished">Файл IDX:</translation>
+        <translation>Файл IDX:</translation>
     </message>
 </context>
 <context>
@@ -10556,32 +12540,32 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp" line="+332"/>
         <source>Quality based</source>
-        <translation type="unfinished">По качеству</translation>
+        <translation>По качеству</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Режим:</translation>
+        <translation>_Режим:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>_Bitrate:</source>
-        <translation>&amp;Битрейт:</translation>
+        <translation>_Битрейт:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quality:</source>
-        <translation>&amp;Качество:</translation>
+        <translation>_Качество:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Vorbis Configuration</source>
-        <translation type="unfinished">Настройка Vorbis</translation>
+        <translation>Настройки Vorbis</translation>
     </message>
     <message>
         <location line="-26"/>
         <source>VBR</source>
-        <translation type="unfinished"></translation>
+        <translation>Переменный битрейт (VBR)</translation>
     </message>
 </context>
 <context>
@@ -10624,12 +12608,12 @@
     <message>
         <location line="+1"/>
         <source>Use as many threads as CPU cores</source>
-        <translation>Количество потоков равно количеству ядер процессора</translation>
+        <translation>Количество потоков равно числу ядер процессора</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>GOP Size</source>
-        <translation>Длина группы кадров</translation>
+        <translation>Размер группы кадров</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10654,12 +12638,12 @@
     <message>
         <location line="+3"/>
         <source>Miscellaneous</source>
-        <translation>Разное</translation>
+        <translation>Прочее</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>libvpx VP9 Encoder Configuration</source>
-        <translation>Конфигурация кодировщика VP9 libvpx</translation>
+        <translation>Настройки кодировщика VP9 libvpx</translation>
     </message>
 </context>
 <context>
@@ -10667,12 +12651,94 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/VapourSynth/qt4/vsProxy_qt4.cpp" line="+85"/>
         <source>Open VapourSynth File</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть файл VapourSynt</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>VS Script Files (*.vpy)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файлы скриптов VS (*.vpy)</translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation>Шумоподавитель Вейвлет</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation>На основе шумоподавителя Марко Россини.</translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation>Шумоподавитель Вейвлет</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation>Порог</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation>Мягкость</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation>Высокое качество</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation>Шумоподавление цветности</translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation>Увеличитель резкости Вейвлет</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation>На основе увеличителя резкости Марко Россини.</translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation>Увеличитель резкости Вейвлет</translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation>Сила</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation>Отсечка шума</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation>Радиус</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation>Высокое качество</translation>
     </message>
 </context>
 <context>
@@ -10707,7 +12773,7 @@
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
         <source>Processing</source>
-        <translation type="unfinished">Обработка</translation>
+        <translation>Обработка</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -10722,74 +12788,84 @@
     <message>
         <location line="+27"/>
         <source>00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00</translation>
     </message>
 </context>
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
-        <translation type="unfinished">Не разработано</translation>
+        <translation>Не разработано</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation type="unfinished">этот режим еще не разработан</translation>
+        <translation>этот режим ещё не разработан</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation>Автоматически</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location line="+1"/>
         <source>none</source>
-        <translation type="unfinished">нет</translation>
+        <translation>нет</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation>Неизвестно</translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
-        <translation type="unfinished">Вручную</translation>
+        <translation>Вручную</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
-        <translation type="unfinished">Целевой битрейт:</translation>
+        <translation>Целевой битрейт:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+19"/>
         <source>kbit/s</source>
-        <translation type="unfinished">кб/с</translation>
+        <translation>кбит/с</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Quantiser:</source>
-        <translation type="unfinished">Квантизатор:</translation>
+        <translation>Квантизатор:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quality:</source>
-        <translation type="unfinished">Качество:</translation>
+        <translation>Качество:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Целевой размер видео:</translation>
+        <translation>Целевой размер видео:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MB</source>
-        <translation type="unfinished">Мб</translation>
+        <translation>МБ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation type="unfinished">Средний битрейт:</translation>
+        <translation>Средний битрейт:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Адаптивная квантизация дисперсии будет включена автоматически.
+        <translation>Для оптимизации дерева макроблоков требуется включённое адаптивное квантование дисперсии.  Адаптивное квантование дисперсии будет включено автоматически.
 
 Вы хотите продолжить?</translation>
     </message>
@@ -10798,7 +12874,7 @@
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Оптимизация дерева макроблоков будет включена автоматически.
+        <translation>Для оптимизации дерева макроблоков требуется включённое адаптивное квантование дисперсии.  Оптимизация дерева макроблоков будет включена автоматически.
 
 Вы хотите продолжить?</translation>
     </message>
@@ -10807,59 +12883,59 @@
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="-84"/>
         <source>Cannot load preset</source>
-        <translation type="unfinished">Невозможно загрузить предустановку</translation>
+        <translation>Невозможно загрузить предустановку</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation type="unfinished">Сохранить профиль</translation>
+        <translation>Сохранить профиль</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Overwrite</source>
-        <translation type="unfinished">Перезаписать</translation>
+        <translation>Перезаписать</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation type="unfinished">Заменить следующую предустановку ?:</translation>
+        <translation>Заменить следующую предустановку ?:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot save preset</source>
-        <translation type="unfinished">Невозможно сохранить предустановку</translation>
+        <translation>Невозможно сохранить предустановку</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Cannot delete custom profile</source>
-        <translation type="unfinished">Невозможно удалить измененный профиль</translation>
+        <translation>Невозможно удалить изменённый профиль</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation type="unfinished">Вы действительно хотите удалить </translation>
+        <translation>Вы действительно хотите удалить </translation>
     </message>
     <message>
         <location line="+1"/>
         <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
-        <translation type="unfinished"> профиль ?.
+        <translation> профиль ?.
 Если этот профиль является системным, он будет создан заново при следующем запуске.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete preset</source>
-        <translation type="unfinished">Удалить предустановку</translation>
+        <translation>Удалить предустановку</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete</source>
-        <translation type="unfinished">Удалить</translation>
+        <translation>Удалить</translation>
     </message>
 </context>
 <context>
@@ -10867,626 +12943,625 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui" line="+375"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Управление битрейтом</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+2464"/>
         <source>Auto Variance</source>
-        <translation type="unfinished"></translation>
+        <translation>Авто-дисперсия</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Auto Variance Biased</source>
-        <translation type="unfinished"></translation>
+        <translation>Смещение авто-дисперсии</translation>
     </message>
     <message>
         <location line="+418"/>
         <source>Disable</source>
-        <translation type="unfinished">Запретить</translation>
+        <translation>Запретить</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">Автоопределение</translation>
+        <translation>Автоопределение</translation>
     </message>
     <message>
         <location line="-2303"/>
         <source>Motion Estimation</source>
-        <translation type="unfinished">Определение движения</translation>
+        <translation>Определение движения</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Diamond Search</source>
-        <translation type="unfinished">Алмазный поиск</translation>
+        <translation>Ромбовидный поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hexagonal Search</source>
-        <translation type="unfinished">Гексагональный поиск</translation>
+        <translation>Гексагональный поиск</translation>
     </message>
     <message>
         <location line="+97"/>
         <source>11 (Best)</source>
-        <translation type="unfinished"></translation>
+        <translation>11 (лучший)</translation>
     </message>
     <message>
         <location line="+216"/>
         <location line="+450"/>
         <location line="+36"/>
         <source>Disabled</source>
-        <translation type="unfinished">Выключено</translation>
+        <translation>Отключено</translation>
     </message>
     <message>
         <location line="-433"/>
         <location line="+2601"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="-3735"/>
         <location line="+1149"/>
         <source>Auto</source>
-        <translation type="unfinished">Авто</translation>
+        <translation>Авто</translation>
     </message>
     <message>
         <location line="+423"/>
         <source>Fast</source>
-        <translation type="unfinished">Быстро</translation>
+        <translation>Быстрый</translation>
     </message>
     <message>
         <location line="+1603"/>
         <source>Output</source>
-        <translation type="unfinished">Вывод</translation>
+        <translation>Вывод</translation>
     </message>
     <message>
         <location line="-565"/>
         <source>Normal</source>
-        <translation type="unfinished">Нормальный</translation>
+        <translation>Нормальное</translation>
     </message>
     <message>
         <location line="+595"/>
         <source>Pixel Aspect Ratio</source>
-        <translation type="unfinished">Cоотношение сторон:</translation>
+        <translation>Соотношение сторон:</translation>
     </message>
     <message>
         <location line="+232"/>
         <source>Crop</source>
-        <translation type="unfinished">Обрезка</translation>
+        <translation>Обрезка</translation>
     </message>
     <message>
         <location line="-3646"/>
         <source>x264 Configuraton</source>
-        <translation type="unfinished">Настройка x264</translation>
+        <translation>Настройки x264</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Configuration:</source>
-        <translation type="unfinished">Настройка</translation>
+        <translation>Настройки:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation type="unfinished">Сохранить как</translation>
+        <translation>Сохранить как</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+3157"/>
         <source>Delete</source>
-        <translation type="unfinished">Удалить</translation>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location line="-3115"/>
         <source>General</source>
-        <translation type="unfinished">Общий</translation>
+        <translation>Общий</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Basic</source>
-        <translation type="unfinished">Основной</translation>
+        <translation>Основной</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation type="unfinished">Использовать дополнительные настройки</translation>
+        <translation>Использовать дополнительные настройки</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Profile:</source>
-        <translation type="unfinished">Профиль:</translation>
+        <translation>Профиль:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Preset:</source>
-        <translation type="unfinished">Предустановка:</translation>
+        <translation>Предустановка:</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Tuning:</source>
-        <translation type="unfinished">Настройка:</translation>
+        <translation>Настройка:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IDC Level:</source>
-        <translation type="unfinished">Уровень IDC:</translation>
+        <translation>Уровень IDC:</translation>
     </message>
     <message>
         <location line="+38"/>
         <location line="+669"/>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <location line="-664"/>
         <source>1.1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1.2</source>
-        <translation type="unfinished"></translation>
+        <translation>1.2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1.3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2.1</source>
-        <translation type="unfinished"></translation>
+        <translation>2.1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>2.2</source>
-        <translation type="unfinished"></translation>
+        <translation>2.2</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+639"/>
         <source>3</source>
-        <translation type="unfinished"></translation>
+        <translation>3</translation>
     </message>
     <message>
         <location line="-634"/>
         <source>3.1</source>
-        <translation type="unfinished"></translation>
+        <translation>3.1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>3.2</source>
-        <translation type="unfinished"></translation>
+        <translation>3.2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>4</source>
-        <translation type="unfinished"></translation>
+        <translation>4</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>4.1</source>
-        <translation type="unfinished"></translation>
+        <translation>4.1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>4.2</source>
-        <translation type="unfinished"></translation>
+        <translation>4.2</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>5.1</source>
-        <translation type="unfinished"></translation>
+        <translation>5.1</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Fast Decode</source>
-        <translation type="unfinished">Быстрое декодирование</translation>
+        <translation>Быстрое декодирование</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Zero Latency</source>
-        <translation type="unfinished">Нулевой отклик</translation>
+        <translation>Нулевой отклик</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Fast First Pass</source>
-        <translation type="unfinished">Быстрый первый проход</translation>
+        <translation>Быстрый первый проход</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Threads </source>
-        <translation type="unfinished">Потоки </translation>
+        <translation>Потоки </translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Целевой размер файла:</translation>
+        <translation>Целевой размер видео:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation type="unfinished">Постоянный битрейт (1 проход)</translation>
+        <translation>Постоянный битрейт (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation type="unfinished">Постоянный квантизатор (1 проход)</translation>
+        <translation>Постоянный квантизатор (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation type="unfinished">Постоянный фактор частоты (1 проход)</translation>
+        <translation>Постоянный фактор битрейта (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation type="unfinished">Размер видео (2 прохода)</translation>
+        <translation>Размер видео (2 прохода)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation type="unfinished">Средний битрейт (2 прохода)</translation>
+        <translation>Средний битрейт (2 прохода)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation type="unfinished">Режим кодирования:</translation>
+        <translation>Режим кодирования:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>MB</source>
-        <translation type="unfinished">Мб</translation>
+        <translation>МБ</translation>
     </message>
     <message>
         <location line="+60"/>
         <location line="+200"/>
         <source>0 (High Quality)</source>
-        <translation type="unfinished">0 (высокое качество)</translation>
+        <translation>0 (высокое качество)</translation>
     </message>
     <message>
         <location line="-177"/>
         <location line="+200"/>
         <location line="+1649"/>
         <source>Quantiser</source>
-        <translation type="unfinished">Квантизатор</translation>
+        <translation>Квантизатор</translation>
     </message>
     <message>
         <location line="-1826"/>
         <location line="+200"/>
         <source>51 (Low Quality)</source>
-        <translation type="unfinished">51 (низкое качество)</translation>
+        <translation>51 (низкое качество)</translation>
     </message>
     <message>
         <location line="-101"/>
         <source>Advanced RC</source>
-        <translation type="unfinished">Дополнительный КЧ</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Rate Control</source>
-        <translation type="unfinished">Дополнительный контроль частоты</translation>
+        <translation>Расширенное управление битрейтом</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Maximum Constant Rate Factor</source>
-        <translation type="unfinished">Максимальный постоянный фактор частоты</translation>
+        <translation>Фактор максимального постоянного битрейта</translation>
     </message>
     <message>
         <location line="+158"/>
         <source>Macroblock-tree Rate Control</source>
-        <translation type="unfinished">Контроль частоты дерева макроблоков</translation>
+        <translation>Управление битрейтом дерева макроблоков</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation type="unfinished">Предвидение типа кадров:</translation>
+        <translation>Предсказание типа кадров:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+2495"/>
         <source>frames</source>
-        <translation type="unfinished">кадры:</translation>
+        <translation>кадры</translation>
     </message>
     <message>
         <location line="-2471"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation type="unfinished">Идентификатор установки параметров последовательности:</translation>
+        <translation>Идентификатор набора параметров последовательности:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>0</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>15</source>
-        <translation type="unfinished"></translation>
+        <translation>15</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>31</source>
-        <translation type="unfinished"></translation>
+        <translation>31</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Motion</source>
-        <translation type="unfinished">Движение</translation>
+        <translation>Движение</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Motion Estimation Method:</source>
-        <translation type="unfinished">Метод оценки движения:</translation>
+        <translation>Метод определения движения:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Uneven Multi-hexagonal Search</source>
-        <translation type="unfinished">Нечетный мультигексагональный поиск:</translation>
+        <translation>Поиск на основе неравного мультишестиугольника</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Exhaustive Search</source>
-        <translation type="unfinished">Расширенный поиск</translation>
+        <translation>Исчерпывающий поиск</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hadamard Exhaustive Search</source>
-        <translation type="unfinished">Расширенный поискHadamard</translation>
+        <translation>Исчерпывающий поиск Адамара</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>1 (Fast)</source>
-        <translation type="unfinished">1 (Быстрый)</translation>
+        <translation>1 (Быстрый)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Subpixel Refinement</source>
-        <translation type="unfinished">Субпиксельная точность</translation>
+        <translation>Субпиксельная точность</translation>
     </message>
     <message>
         <location line="+98"/>
         <source>Motion Vector</source>
-        <translation type="unfinished">Вектор движения</translation>
+        <translation>Вектор движения</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Maximum Motion Vector Length:</source>
-        <translation type="unfinished">Максимальная длина вектора движения:</translation>
+        <translation>Максимальная длина вектора движения:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Minimum Buffer Between Threads:</source>
-        <translation type="unfinished">Максимальный буфер между потоками:</translation>
+        <translation>Минимальный буфер между потоками:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation type="unfinished">Максимальный диапазон поиска вектора движения:</translation>
+        <translation>Максимальный диапазон поиска вектора движения:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation>Предсказание</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Weighted References</source>
-        <translation type="unfinished">Взвешенные отсылки</translation>
+        <translation>Взвешенные опорные</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Weighted References + Duplicates</source>
-        <translation type="unfinished">Взвешенные отсылки + дубликаты</translation>
+        <translation>Взвешенные опорные + дубликаты</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Direct Prediction Mode:</source>
-        <translation type="unfinished">Режим прямого предсказания:</translation>
+        <translation>Режим прямого предсказания:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation type="unfinished">Взвешенное предсказание для кадров P:</translation>
+        <translation>Взвешенное предсказание для P-кадров:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Spatial</source>
-        <translation type="unfinished">Пространственный</translation>
+        <translation>Пространственный</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Temporal</source>
-        <translation type="unfinished">Временной</translation>
+        <translation>Временной</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Weighted Prediction for B-frames</source>
-        <translation type="unfinished">Взвешенное предсказание для кадров B:</translation>
+        <translation>Взвешенное предсказание для B-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Constrained Intra Prediction</source>
-        <translation type="unfinished">Ограниченное внутреннее предсказание</translation>
+        <translation>Ограниченное внутреннее предсказание</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Partition</source>
-        <translation type="unfinished">Часть</translation>
+        <translation>Раздел</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Partition Search</source>
-        <translation type="unfinished">Поиск части</translation>
+        <translation>Поиск раздела</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>8x8 DCT Spatial Transform</source>
-        <translation type="unfinished">8x8 DCT пространственное трансформирование</translation>
+        <translation>8x8 DCT пространственное трансформирование</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8, 8x16 and 16x8 P-frame Intra-predicted Blocks</source>
-        <translation type="unfinished">8x8, 8x16 and 16x8 предсказанные внутренне блоки кадров P</translation>
+        <translation>8x8, 8x16 и 16x8 предсказанные внутренне блоки P-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8, 8x16 and 16x8 B-frame Intra-predicted Blocks</source>
-        <translation type="unfinished">8x8, 8x16 and 16x8 предсказанные внутренне блоки кадров B</translation>
+        <translation>8x8, 8x16 и 16x8 предсказанные внутренне блоки B-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4x4, 4x8 and 8x4 P-frame Intra-predicted Blocks</source>
-        <translation type="unfinished">4x4, 4x8 and 8x4 предсказанные внутренне блоки кадров P</translation>
+        <translation>4x4, 4x8 и 8x4 предсказанные внутренне блоки P-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>8x8 Intra-predicted Blocks</source>
-        <translation type="unfinished">8x8 предсказанные внутренне блоки</translation>
+        <translation>8x8 предсказанные внутренне блоки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>4x4 Intra-predicted Blocks</source>
-        <translation type="unfinished">4x4 предсказанные внутренне блоки</translation>
+        <translation>4x4 предсказанные внутренне блоки</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Frame</source>
-        <translation type="unfinished">Кадр</translation>
+        <translation>Кадр</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Frame Encoding</source>
-        <translation type="unfinished">Кодировка кадров</translation>
+        <translation>Кодировка кадров</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>CABAC</source>
-        <translation type="unfinished"></translation>
+        <translation>CABAC</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Loop Filter:</source>
-        <translation type="unfinished">Фильтр зацикливания:</translation>
+        <translation>Фильтр зацикливания:</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+1333"/>
         <source>Strength:</source>
-        <translation type="unfinished">Сила:</translation>
+        <translation>Уровень:</translation>
     </message>
     <message>
         <location line="-1294"/>
         <source>Threshold:</source>
-        <translation type="unfinished">Порог:</translation>
+        <translation>Порог:</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Open GOP:</source>
-        <translation type="unfinished">Открыть GOP:</translation>
+        <translation>Открытая группа кадров:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Normal Mode</source>
-        <translation type="unfinished">Нормальный режим</translation>
+        <translation>Нормальный режим</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Blu-ray Mode</source>
-        <translation type="unfinished">Режим Blu-ray</translation>
+        <translation>Режим Blu-ray</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Interlaced:</source>
-        <translation type="unfinished">Интерлейсинг:</translation>
+        <translation>Чересстрочный:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Bottom Field First</source>
-        <translation type="unfinished">Сначала нижнее поле</translation>
+        <translation>Сначала нижнее поле</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Top Field First</source>
-        <translation type="unfinished">Сначала верхнее поле</translation>
+        <translation>Сначала верхнее поле</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Maximum Reference Frames:</source>
-        <translation type="unfinished">Максимум кадров как ссылок:</translation>
+        <translation>Максимум опорных кадров:</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>B-frames</source>
-        <translation type="unfinished">B-кадры</translation>
+        <translation>B-кадры</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>B-frames as References:</source>
-        <translation type="unfinished">B-кадры как ссылки:</translation>
+        <translation>B-кадры как опорные:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Strictly Hierarchical Pyramid</source>
-        <translation type="unfinished">Строгая иерархическая пирамида</translation>
+        <translation>Строгая иерархическая пирамида</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Non-strict (Not Blu-ray Compatible)</source>
-        <translation type="unfinished">Нестрогая (не совместима с Blu-ray)</translation>
+        <translation>Нестрогое (несовместимо с Blu-ray)</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Optimal</source>
-        <translation type="unfinished">Оптимальная</translation>
+        <translation>Оптимальная</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>B-frame Bias:</source>
-        <translation type="unfinished">Смещение B-кадров:</translation>
+        <translation>Смещение B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation type="unfinished">Максимум последовательных B-кадров:</translation>
+        <translation>Максимум последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation type="unfinished">Адаптивное определение B-кадров:</translation>
+        <translation>Адаптивное определение B-кадров:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>I-frames</source>
-        <translation type="unfinished">I-кадры</translation>
+        <translation>I-кадры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>GOP Size:</source>
-        <translation type="unfinished">Размер GOP:</translation>
+        <translation>Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Minimum:</source>
-        <translation type="unfinished">Минимум:</translation>
+        <translation>Минимум:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Maximum:</source>
-        <translation type="unfinished">Максимум:</translation>
+        <translation>Максимум:</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -11496,363 +13571,363 @@
     <message>
         <location line="+36"/>
         <source>Periodic Intra Refresh</source>
-        <translation type="unfinished">Периодическое внутреннее обновление</translation>
+        <translation>Периодическое внутреннее обновление</translation>
     </message>
     <message>
         <location line="+24"/>
         <location line="+6"/>
         <source>Analysis</source>
-        <translation type="unfinished">Анализ</translation>
+        <translation>Анализ</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Mixed References</source>
-        <translation type="unfinished">Смешанные ссылки</translation>
+        <translation>Смешанные опорные</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Chroma Motion Estimation</source>
-        <translation type="unfinished">Оценка движения chroma</translation>
+        <translation>Оценка движения цветности (chroma)</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Trellis Quantization:</source>
-        <translation type="unfinished">Квантизация Треллиса:</translation>
+        <translation>Треллис-квантование:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Final Macroblock Only</source>
-        <translation type="unfinished">Только последний макроблок</translation>
+        <translation>Только последний макроблок</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Always On</source>
-        <translation type="unfinished">Всегда включено</translation>
+        <translation>Всегда включено</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Fast Skip Detection on P-frames</source>
-        <translation type="unfinished">Быстрый пропуск обнаружения на P-кадрах:</translation>
+        <translation>Быстрый пропуск обнаружения на P-кадрах</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>DCT Decimation on P-frames</source>
-        <translation type="unfinished">Децимация DCT на P-кадрах:</translation>
+        <translation>Децимация DCT на P-кадрах</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Psychovisual Rate Distortion Optimisation:</source>
-        <translation type="unfinished">Оптимизация психовизуального искажения частоты</translation>
+        <translation>Оптимизация психовизуального искажения частоты:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Psychovisual Trellis:</source>
-        <translation type="unfinished">Психовизуальный Треллис:</translation>
+        <translation>Психовизуальная треллис-модуляция:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Noise Reduction:</source>
-        <translation type="unfinished">Уменьшение шума:</translation>
+        <translation>Уменьшение шума:</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Luma Quantisation Deadzone</source>
-        <translation type="unfinished">Мертвая зона квантизации Luma</translation>
+        <translation>Мёртвая зона квантования яркости (luma)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Intra Luma Quantisation Deadzone:</source>
-        <translation type="unfinished">Мертвая зона квантизации внутренней Luma:</translation>
+        <translation>Мёртвая зона квантования внутренней яркости (luma):</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Inter Luma Quantisation Deadzone:</source>
-        <translation type="unfinished">Мертвая зона квантизации внешней Luma:</translation>
+        <translation>Мёртвая зона квантования внешней яркости (luma):</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Quantisation Matrix</source>
-        <translation type="unfinished">Матрица квантизации</translation>
+        <translation>Матрица квантования</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Flat Matrix</source>
-        <translation type="unfinished">Плоская матрица</translation>
+        <translation>Плоская матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>JVT Matrix</source>
-        <translation type="unfinished">Матрица JVT</translation>
+        <translation>Матрица JVT</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Matrix</source>
-        <translation type="unfinished">Собственная матрица</translation>
+        <translation>Собственная матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+861"/>
         <source>Edit</source>
-        <translation type="unfinished">Редактировать</translation>
+        <translation>Править</translation>
     </message>
     <message>
         <location line="-814"/>
         <source>Quantiser Control</source>
-        <translation type="unfinished">Управление квантизатором</translation>
+        <translation>Управление квантизатором</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Maximum Quantiser:</source>
-        <translation type="unfinished">Максимальный квантизатор:</translation>
+        <translation>Максимальный квантизатор:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I and P-frame Quantiser Ratio:</source>
-        <translation type="unfinished">Соотношение квантизатора I- и P-кадров:</translation>
+        <translation>Соотношение квантизатора I- и P-кадров:</translation>
     </message>
     <message>
         <location line="+85"/>
         <location line="+179"/>
         <location line="+307"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="-464"/>
         <source>Maximum Quantiser Step:</source>
-        <translation type="unfinished">Максимальный шаг квантизатора:</translation>
+        <translation>Максимальный шаг квантизатора:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>P and B-frame Quantiser Ratio:</source>
-        <translation type="unfinished">Соотношение квантизатора P- и B-кадров:</translation>
+        <translation>Соотношение квантизатора P- и B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Average Bitrate Tolerance:</source>
-        <translation type="unfinished">Допустимый средний битрейт:</translation>
+        <translation>Допуск среднего битрейта:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Chroma to Luma Quantiser Offset:</source>
-        <translation type="unfinished">Смещение квантизатора от Chroma до Luma:</translation>
+        <translation>Смещение квантизатора от Chroma до Luma:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Minimum Quantiser:</source>
-        <translation type="unfinished">Минимальный квантизатор:</translation>
+        <translation>Минимальный квантизатор:</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Quantiser Curve Compression</source>
-        <translation type="unfinished">Сжатие кривой квантизатора</translation>
+        <translation>Сжатие кривой квантизатора</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantiser Curve Compression:</source>
-        <translation type="unfinished">Сжатие кривой квантизатора:</translation>
+        <translation>Сжатие кривой квантизатора:</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
-        <translation type="unfinished">Уменьшить колебание до компрессии кривых:</translation>
+        <translation>Уменьшить колебание до сжатия кривых:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
-        <translation type="unfinished">Уменьшить колебание после компрессии кривых:</translation>
+        <translation>Уменьшить колебание после сжатия кривых:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Adaptive Quantisation</source>
-        <translation type="unfinished">Адаптивная квантизация</translation>
+        <translation>Адаптивное квантование</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Variance AQ:</source>
-        <translation type="unfinished">Отклонение адаптивной квантизации:</translation>
+        <translation>Адаптивное квантование дисперсии:</translation>
     </message>
     <message>
         <location line="+114"/>
         <source>Advanced 1</source>
-        <translation type="unfinished">Дополнительно 1</translation>
+        <translation>Дополнительно 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Video Buffer Verifier</source>
-        <translation type="unfinished"></translation>
+        <translation>Верификатор буфера видео (VBV)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Maximum VBV Bitrate:</source>
-        <translation type="unfinished">Максимальный битрейт VBV:</translation>
+        <translation>Максимальный битрейт VBV:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial VBV Buffer Occupancy:</source>
-        <translation type="unfinished">Начальное заполнение буфера VBV:</translation>
+        <translation>Начальное заполнение буфера VBV:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>kbit</source>
-        <translation type="unfinished">кбит</translation>
+        <translation>кбит</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>kbit/s</source>
-        <translation type="unfinished">кбит/с</translation>
+        <translation>кбит/с</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>VBV Buffer Size:</source>
-        <translation type="unfinished">Размер буфера VBV:</translation>
+        <translation>Размер буфера VBV:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Slicing</source>
-        <translation type="unfinished">Разделение на части</translation>
+        <translation>Срезание</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Slices per Frame:</source>
-        <translation type="unfinished">Частей на кадр:</translation>
+        <translation>Срезов на кадр:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Size per Slice:</source>
-        <translation type="unfinished">Максимальный размер на часть:</translation>
+        <translation>Максимальный размер на срез:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>bytes</source>
-        <translation type="unfinished">байт</translation>
+        <translation>байт</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Maximum Macroblocks per Slice:</source>
-        <translation type="unfinished">Максимум макроблоков на часть:</translation>
+        <translation>Максимум макроблоков на срез:</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Zones</source>
-        <translation type="unfinished">Зоны</translation>
+        <translation>Зоны</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Add</source>
-        <translation type="unfinished">Добавить</translation>
+        <translation>Добавить</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Advanced 2</source>
-        <translation type="unfinished">Дополнительно 2</translation>
+        <translation>Дополнительно 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Multithreading</source>
-        <translation type="unfinished">Многопоточность:</translation>
+        <translation>Многопоточность</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
-        <translation type="unfinished">Собственный:</translation>
+        <translation>Вручную:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Enforce Repeatability</source>
-        <translation type="unfinished">Принудительная повторяемость</translation>
+        <translation>Принудительная повторяемость</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slice-based Threading</source>
-        <translation type="unfinished">Многопоточность по частям</translation>
+        <translation>Поточность на основе срезов</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Threaded Lookahead Buffer:</source>
-        <translation type="unfinished">Буфер предвидения собственных потоков:</translation>
+        <translation>Ручной многопоточный буфер предсказания:</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Output 1</source>
-        <translation type="unfinished">Выход 1</translation>
+        <translation>Выход 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Generate Access Unit Delimiters</source>
-        <translation type="unfinished">Генерировать разделители единиц доступа</translation>
+        <translation>Генерировать разделители единиц доступа</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>BluRay compatibility</source>
-        <translation type="unfinished">Совместимость с BluRay</translation>
+        <translation>Совместимость с BluRay</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Generate fake interlaced</source>
-        <translation type="unfinished">Генерировать поддельный интерлейсинг</translation>
+        <translation>Создавать поддельную чересстрочность</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Custom:</source>
         <comment>PAR</comment>
-        <translation type="unfinished">Собственный:</translation>
+        <translation>Вручную:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>As Input</source>
-        <translation type="unfinished">Как вход</translation>
+        <translation>Как вход</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation type="unfinished">Предопределенное соотношение сторон:</translation>
+        <translation>Предопределённое соотношение сторон:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>16:15 (PAL 4:3)</source>
-        <translation type="unfinished"></translation>
+        <translation>16:15 (PAL 4:3)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>64:45 (PAL 16:9)</source>
-        <translation type="unfinished"></translation>
+        <translation>64:45 (PAL 16:9)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>8:9 (NTSC 4:3)</source>
-        <translation type="unfinished"></translation>
+        <translation>8:9 (NTSC 4:3)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>32:27 (NTSC 16:9)</source>
-        <translation type="unfinished"></translation>
+        <translation>32:27 (NTSC 16:9)</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Output 2</source>
-        <translation type="unfinished">Выход 2</translation>
+        <translation>Выход 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Video Usability Information</source>
-        <translation type="unfinished">Информация об использовании видео</translation>
+        <translation>Информация об использовании видео</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation type="unfinished">Эти настройки всего лишь предлагаются для воспроизведения на оборудовании. Используйте их на свой страх и риск.</translation>
+        <translation>Эти настройки всего лишь предлагаются для воспроизведения на оборудовании. Используйте их на свой страх и риск.</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Overscan:</source>
-        <translation type="unfinished">Пересканирование:</translation>
+        <translation>Пересканирование:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11861,155 +13936,155 @@
         <location line="+63"/>
         <location line="+73"/>
         <source>Undefined</source>
-        <translation type="unfinished">Не определено</translation>
+        <translation>Не определено</translation>
     </message>
     <message>
         <location line="-235"/>
         <source>Show</source>
-        <translation type="unfinished">Показать</translation>
+        <translation>Показать</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Video Format:</source>
-        <translation type="unfinished">Формат видео:</translation>
+        <translation>Формат видео:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Component</source>
-        <translation type="unfinished">Компонент</translation>
+        <translation>Компонент</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>PAL</source>
-        <translation type="unfinished"></translation>
+        <translation>PAL</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>NTSC</source>
-        <translation type="unfinished"></translation>
+        <translation>NTSC</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>SECAM</source>
-        <translation type="unfinished"></translation>
+        <translation>SECAM</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MAC</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Colour Primaries:</source>
-        <translation type="unfinished">Первичные цвета:</translation>
+        <translation>Первичные цвета:</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+63"/>
         <location line="+73"/>
         <source>BT709</source>
-        <translation type="unfinished"></translation>
+        <translation>BT709</translation>
     </message>
     <message>
         <location line="-131"/>
         <location line="+63"/>
         <source>BT470M</source>
-        <translation type="unfinished"></translation>
+        <translation>BT470M</translation>
     </message>
     <message>
         <location line="-58"/>
         <location line="+63"/>
         <location line="+73"/>
         <source>BT470BG</source>
-        <translation type="unfinished"></translation>
+        <translation>BT470BG</translation>
     </message>
     <message>
         <location line="-131"/>
         <location line="+136"/>
         <source>SMPTE170M</source>
-        <translation type="unfinished"></translation>
+        <translation>SMPTE170M</translation>
     </message>
     <message>
         <location line="-131"/>
         <location line="+78"/>
         <location line="+58"/>
         <source>SMPTE240M</source>
-        <translation type="unfinished"></translation>
+        <translation>SMPTE240M</translation>
     </message>
     <message>
         <location line="-131"/>
         <source>Film</source>
-        <translation type="unfinished"></translation>
+        <translation>Фильм</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Transfer Characteristics:</source>
-        <translation type="unfinished">Характеристики перехода:</translation>
+        <translation>Характеристики перехода:</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Linear</source>
-        <translation type="unfinished">Линейный</translation>
+        <translation>Линейный</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>LOG100</source>
-        <translation type="unfinished"></translation>
+        <translation>LOG100</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>LOG316</source>
-        <translation type="unfinished"></translation>
+        <translation>LOG316</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>SMPTEL170M</source>
-        <translation type="unfinished"></translation>
+        <translation>SMPTEL170M</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Colour Matrix:</source>
-        <translation type="unfinished">Цветовая матрица:</translation>
+        <translation>Цветовая матрица:</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>FCC</source>
-        <translation type="unfinished"></translation>
+        <translation>FCC</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>GBR</source>
-        <translation type="unfinished"></translation>
+        <translation>GBR</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>YCgCo</source>
-        <translation type="unfinished"></translation>
+        <translation>YCgCo</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>HRD Parameters:</source>
-        <translation type="unfinished">Параметры HRD:</translation>
+        <translation>Параметры HRD:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>VBR</source>
-        <translation type="unfinished"></translation>
+        <translation>Переменный битрейт (VBR)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CBR</source>
-        <translation type="unfinished"></translation>
+        <translation>Постоянный битрейт (CBR)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Chroma Sample Location:</source>
-        <translation type="unfinished">Местонахождение образца Chroma:</translation>
+        <translation>Положение образца цветности (chroma):</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Full Range Samples</source>
-        <translation type="unfinished">Образцы полного диапазона</translation>
+        <translation>Образцы полного диапазона</translation>
     </message>
 </context>
 <context>
@@ -12017,12 +14092,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/x264CustomMatrixDialog.ui" line="+16"/>
         <source>x264 Custom Matrix</source>
-        <translation type="unfinished">Собственная матрица x264</translation>
+        <translation>Ручная матрица x264</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Intra 4x4</source>
-        <translation type="unfinished">Внутренняя 4x4</translation>
+        <translation>Внутренняя 4x4</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -12030,43 +14105,43 @@
         <location line="+446"/>
         <location line="+703"/>
         <source>Luma:</source>
-        <translation type="unfinished"></translation>
+        <translation>Яркость (luma):</translation>
     </message>
     <message>
         <location line="-1385"/>
         <location line="+446"/>
         <source>Chroma U/V:</source>
-        <translation type="unfinished"></translation>
+        <translation>Цветность (chroma) U/V:</translation>
     </message>
     <message>
         <location line="-238"/>
         <source>Inter 4x4</source>
-        <translation type="unfinished">Внешняя 4x4</translation>
+        <translation>Внешняя 4x4</translation>
     </message>
     <message>
         <location line="+446"/>
         <source>Intra 8x8</source>
-        <translation type="unfinished">Внутренняя 8x8</translation>
+        <translation>Внутренняя 8x8</translation>
     </message>
     <message>
         <location line="+703"/>
         <source>Inter 8x8</source>
-        <translation type="unfinished">Внешняя 8x8</translation>
+        <translation>Внешняя 8x8</translation>
     </message>
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation type="unfinished">Загрузить файл</translation>
+        <translation>Загрузить файл</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Да</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
 </context>
 <context>
@@ -12074,13 +14149,13 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp" line="+238"/>
         <source>Not coded</source>
-        <translation type="unfinished">Не разработано</translation>
+        <translation>Не разработано</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>this mode has not been implemented
 </source>
-        <translation type="unfinished">этот режим не разработан
+        <translation>этот режим не разработан
 </translation>
     </message>
     <message>
@@ -12091,65 +14166,65 @@
     <message>
         <location line="+1"/>
         <source>none</source>
-        <translation type="unfinished">нет</translation>
+        <translation>нет</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Стандартный</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Неизвестно</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Custom</source>
-        <translation type="unfinished">Вручную</translation>
+        <translation>Вручную</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
-        <translation type="unfinished">Целевой битрейт</translation>
+        <translation>Целевой битрейт:</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+20"/>
         <source>kbit/s</source>
-        <translation type="unfinished">кбит/с</translation>
+        <translation>кбит/с</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Quantiser:</source>
-        <translation type="unfinished">Квантизатор:</translation>
+        <translation>Квантизатор:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Quality:</source>
-        <translation type="unfinished">Качество:</translation>
+        <translation>Качество:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Целевой размер видео:</translation>
+        <translation>Целевой размер видео:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MB</source>
-        <translation type="unfinished">Мб</translation>
+        <translation>МБ</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Average Bitrate:</source>
-        <translation type="unfinished">Средний битрейт</translation>
+        <translation>Средний битрейт:</translation>
     </message>
     <message>
         <location line="+128"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Адаптивная квантизация дисперсии будет включена автоматически.
+        <translation>Для оптимизации дерева макроблоков требуется включённое адаптивное квантование дисперсии.  Адаптивное квантование дисперсии будет включено автоматически.
 
 Вы хотите продолжить?</translation>
     </message>
@@ -12158,7 +14233,7 @@
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Macroblock-Tree optimisation will automatically be disabled.
 
 Do you wish to continue?</source>
-        <translation type="unfinished">Для оптимизации дерева макроблоков требуется включенная адаптивная квантизация дисперсии.  Оптимизация дерева макроблоков будет включена автоматически.
+        <translation>Для оптимизации дерева макроблоков требуется включённое адаптивное квантование дисперсии.  Оптимизация дерева макроблоков будет включена автоматически.
 
 Вы хотите продолжить?</translation>
     </message>
@@ -12167,118 +14242,118 @@
         <location line="+67"/>
         <location line="+17"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="-84"/>
         <source>Cannot load preset</source>
-        <translation type="unfinished">Невозможно загрузить предустановку</translation>
+        <translation>Невозможно загрузить предустановку</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Save Profile</source>
-        <translation type="unfinished">Сохранить профиль</translation>
+        <translation>Сохранить профиль</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Overwrite</source>
-        <translation type="unfinished">Перезаписать</translation>
+        <translation>Перезаписать</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Replace the following preset ?:</source>
-        <translation type="unfinished">Заменить следующую предустановку ?:</translation>
+        <translation>Заменить следующую предустановку ?:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cannot save preset</source>
-        <translation type="unfinished">Невозможно сохранить предустановку</translation>
+        <translation>Невозможно сохранить предустановку</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Cannot delete custom profile</source>
-        <translation type="unfinished">Невозможно удалить собственный профиль</translation>
+        <translation>Невозможно удалить ручной профиль</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Do you really want to delete the </source>
-        <translation type="unfinished">Вы действительно хотите удалить </translation>
+        <translation>Вы действительно хотите удалить </translation>
     </message>
     <message>
         <location line="+1"/>
         <source> profile ?.
 If it is a system profile it will be recreated next time.</source>
-        <translation type="unfinished"> профиль ?.
+        <translation> профиль?
 Если этот профиль является системным, он будет создан заново при следующем запуске.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Delete preset</source>
-        <translation type="unfinished">Удалить предустановку</translation>
+        <translation>Удалить предустановку</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Delete</source>
-        <translation type="unfinished">Удалить</translation>
+        <translation>Удалить</translation>
     </message>
 </context>
 <context>
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
-        <translation type="unfinished">Настройка x265</translation>
+        <source>x265 Configuration</source>
+        <translation>Настройки x265</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Configuration:</source>
-        <translation type="unfinished">Настройка:</translation>
+        <translation>Настройки:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Save As</source>
-        <translation type="unfinished">Сохранить как</translation>
+        <translation>Сохранить как</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+3061"/>
         <source>Delete</source>
-        <translation type="unfinished">Удалить</translation>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location line="-3019"/>
         <source>General</source>
-        <translation type="unfinished">Общий</translation>
+        <translation>Общий</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Basic</source>
-        <translation type="unfinished">Основной</translation>
+        <translation>Основной</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Use advanced configuration</source>
-        <translation type="unfinished">Использовать дополнительные настройки</translation>
+        <translation>Использовать расширенные настройки</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Profile:</source>
-        <translation type="unfinished">Профиль</translation>
+        <translation>Профиль:</translation>
     </message>
     <message>
         <location line="+81"/>
         <source>Preset:</source>
-        <translation type="unfinished">Предустановка</translation>
+        <translation>Предустановка:</translation>
     </message>
     <message>
         <location line="-14"/>
         <source>Tuning:</source>
-        <translation type="unfinished">Настройка</translation>
+        <translation>Настройка:</translation>
     </message>
     <message>
         <location line="+91"/>
         <source>IDC Level:</source>
-        <translation type="unfinished">Уровень IDC:</translation>
+        <translation>Уровень IDC:</translation>
     </message>
     <message>
         <source>Auto</source>
@@ -12287,22 +14362,22 @@
     <message>
         <location line="+572"/>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>3</source>
-        <translation type="unfinished"></translation>
+        <translation>3</translation>
     </message>
     <message>
         <location line="-661"/>
         <source>Pool Threads </source>
-        <translation type="unfinished">Потоки пула</translation>
+        <translation>Потоки пула </translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Frame Threads </source>
-        <translation type="unfinished">Потоки кадров</translation>
+        <translation>Потоки кадров </translation>
     </message>
     <message>
         <location line="+32"/>
@@ -12312,143 +14387,142 @@
     <message>
         <location line="+32"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Управление битрейтом</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Target Video Size:</source>
-        <translation type="unfinished">Целевой размер файла:</translation>
+        <translation>Целевой размер видео:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Constant Bitrate (Single Pass)</source>
-        <translation type="unfinished">Постоянный битрейт (1 проход)</translation>
+        <translation>Постоянный битрейт (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Quantiser (Single Pass)</source>
-        <translation type="unfinished">Постоянный квантизатор (1 проход)</translation>
+        <translation>Постоянный квантизатор (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Constant Rate Factor (Single Pass)</source>
-        <translation type="unfinished">Постоянный фактор частоты (1 проход)</translation>
+        <translation>Постоянный фактор битрейта (1 проход)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Video Size (Two Pass)</source>
-        <translation type="unfinished">Размер видео (2 прохода)</translation>
+        <translation>Размер видео (2 прохода)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Average Bitrate (Two Pass)</source>
-        <translation type="unfinished">Средний битрейт (2 прохода)</translation>
+        <translation>Средний битрейт (2 прохода)</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Encoding Mode:</source>
-        <translation type="unfinished">Режим кодирования:</translation>
+        <translation>Режим кодирования:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>MB</source>
-        <translation type="unfinished">Мб</translation>
+        <translation>МБ</translation>
     </message>
     <message>
         <location line="+44"/>
         <location line="+213"/>
         <source>0 (High Quality)</source>
-        <translation type="unfinished">0 (высокое качество)</translation>
+        <translation>0 (высокое качество)</translation>
     </message>
     <message>
         <location line="-190"/>
         <location line="+213"/>
         <location line="+1376"/>
         <source>Quantiser</source>
-        <translation type="unfinished">Квантизатор</translation>
+        <translation>Квантизатор</translation>
     </message>
     <message>
         <location line="-1566"/>
         <location line="+213"/>
         <source>51 (Low Quality)</source>
-        <translation type="unfinished">51 (низкое качество)</translation>
+        <translation>51 (низкое качество)</translation>
     </message>
     <message>
         <location line="-143"/>
         <source>Use Strict Constant Bitrate Mode</source>
-        <translation type="unfinished">Использовать режим строго постоянного битрейта</translation>
+        <translation>Использовать режим строго постоянного битрейта</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Advanced RC</source>
-        <translation type="unfinished">Дополнительный КЧ</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Advanced Rate Control</source>
-        <translation type="unfinished">Дополнительный контроль частоты</translation>
+        <translation>Расширенное управление битрейтом</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Maximum Constant Rate Factor</source>
-        <translation type="unfinished">Фактор максимальной постоянной частоты</translation>
+        <translation>Фактор максимального постоянного битрейта</translation>
     </message>
     <message>
         <location line="+158"/>
         <source>Coding Unit-tree Rate Control</source>
-        <translation type="unfinished">Управление частотой кодирования дерева частей</translation>
+        <translation>Управление битрейтом дерева частей</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Frametype Lookahead:</source>
-        <translation type="unfinished">Предвидение типа кадров:</translation>
+        <translation>Предсказание типа кадров:</translation>
     </message>
     <message>
         <location line="+14"/>
         <location line="+2441"/>
         <source>frames</source>
-        <translation type="unfinished">кадры</translation>
+        <translation>кадры</translation>
     </message>
     <message>
         <location line="-2417"/>
         <source>Sequence Parameter Set Identifer:</source>
-        <translation type="unfinished">Идентификатор установки параметра последовательности:</translation>
+        <translation>Идентификатор набора параметров последовательности:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>0</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>15</source>
-        <translation type="unfinished"></translation>
+        <translation>15</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>31</source>
-        <translation type="unfinished"></translation>
+        <translation>31</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Motion</source>
-        <translation type="unfinished">Движение</translation>
+        <translation>Движение</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Motion Estimation</source>
-        <translation type="unfinished">Определение движения</translation>
+        <translation>Определение движения</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Motion Estimation Method:</source>
-        <translation type="unfinished">Метод определения движения:</translation>
+        <translation>Метод определения движения:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -12463,12 +14537,12 @@
     <message>
         <location line="+5"/>
         <source>Uneven Multi-hexagonal Search</source>
-        <translation type="unfinished">Неравномерный мультигексагональный поиск</translation>
+        <translation>Поиск на основе неравного мультишестиугольника</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Star Search</source>
-        <translation>Звездообразный поиск</translation>
+        <translation>Звёздчатый поиск</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -12478,32 +14552,32 @@
     <message>
         <location line="+42"/>
         <source>1 (Fast)</source>
-        <translation type="unfinished">1 (быстрый)</translation>
+        <translation>1 (быстрый)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Subpixel Refinement</source>
-        <translation type="unfinished">Субпиксельная точность</translation>
+        <translation>Субпиксельная точность</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>7 (Best)</source>
-        <translation type="unfinished">7 (лучший)</translation>
+        <translation>7 (лучший)</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Motion Vector</source>
-        <translation type="unfinished">Вектор движения</translation>
+        <translation>Вектор движения</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Maximum Motion Vector Search Range:</source>
-        <translation type="unfinished">Диапазон поиска вектора максимального движения:</translation>
+        <translation>Диапазон поиска вектора максимального движения:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Prediction</source>
-        <translation type="unfinished">Предсказание:</translation>
+        <translation>Предсказание</translation>
     </message>
     <message>
         <source>Weighted Prediction for B-frames</source>
@@ -12512,39 +14586,39 @@
     <message>
         <location line="+31"/>
         <source>Constrained Intra Prediction</source>
-        <translation type="unfinished">Ограниченное внутреннее предсказание</translation>
+        <translation>Ограниченное внутреннее предсказание</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Weighted Prediction for P-frames:</source>
-        <translation type="unfinished">Взвешенное предсказание для P-кадров</translation>
+        <translation>Взвешенное предсказание для P-кадров:</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+269"/>
         <location line="+43"/>
         <source>Disabled</source>
-        <translation type="unfinished">Выключено</translation>
+        <translation>Отключено</translation>
     </message>
     <message>
         <location line="-307"/>
         <source>Weighted References</source>
-        <translation type="unfinished">Взвешенные ссылки</translation>
+        <translation>Взвешенные опорные</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Weighted References + Duplicates</source>
-        <translation type="unfinished">Взвешенные ссылки + дубликаты</translation>
+        <translation>Взвешенные опорные + дубликаты</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Frame</source>
-        <translation type="unfinished">Кадр</translation>
+        <translation>Кадр</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Frame Encoding</source>
-        <translation type="unfinished">Кодирование кадра</translation>
+        <translation>Кодирование кадра</translation>
     </message>
     <message>
         <source>Loop Filter:</source>
@@ -12552,7 +14626,7 @@
     </message>
     <message>
         <source>Open GOP:</source>
-        <translation type="obsolete">Открыть GOP:</translation>
+        <translation type="obsolete">Открыть группу кадров:</translation>
     </message>
     <message>
         <source>Normal Mode</source>
@@ -12565,42 +14639,42 @@
     <message>
         <location line="+6"/>
         <source>Loop Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Фильтр зацикливания</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Open GOP</source>
-        <translation type="unfinished"></translation>
+        <translation>Открытая группа кадров</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Interlaced:</source>
-        <translation type="unfinished">Интерлейсинг:</translation>
+        <translation>Чересстрочный:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Top Field First</source>
-        <translation type="unfinished">Сначала верхнее поле:</translation>
+        <translation>Сначала верхнее поле</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Bottom Field First</source>
-        <translation type="unfinished">Сначала нижнее поле:</translation>
+        <translation>Сначала нижнее поле</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Maximum Reference Frames:</source>
-        <translation type="unfinished">Максимум кадров-ссылок:</translation>
+        <translation>Максимум опорных кадров:</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>B-frames</source>
-        <translation type="unfinished">B-кадры</translation>
+        <translation>B-кадры</translation>
     </message>
     <message>
         <location line="+114"/>
         <source>B-frames as References:</source>
-        <translation type="unfinished">B-кадры как ссылки:</translation>
+        <translation>B-кадры как опорные:</translation>
     </message>
     <message>
         <source>Strictly Hierarchical Pyramid</source>
@@ -12613,87 +14687,87 @@
     <message>
         <location line="-28"/>
         <source>Fast</source>
-        <translation type="unfinished">Быстро</translation>
+        <translation>Быстро</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Optimal</source>
-        <translation type="unfinished">Оптимально</translation>
+        <translation>Оптимально</translation>
     </message>
     <message>
         <location line="-54"/>
         <source>B-frame Bias:</source>
-        <translation type="unfinished">Смещение B-кадров:</translation>
+        <translation>Смещение B-кадров:</translation>
     </message>
     <message>
         <location line="-267"/>
         <source>Motion Partitions:</source>
-        <translation type="unfinished"></translation>
+        <translation>Разделы движения:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Rectangular</source>
-        <translation type="unfinished"></translation>
+        <translation>Прямоугольный</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Asymmetric</source>
-        <translation type="unfinished"></translation>
+        <translation>Асимметричный</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Limit Motion Partition Modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ограничение режимов разделения движения</translation>
     </message>
     <message>
         <location line="+213"/>
         <source>Maximum Consecutive B-frames:</source>
-        <translation type="unfinished">Максимум последовательных B-кадров:</translation>
+        <translation>Максимум последовательных B-кадров:</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Adaptive B-frame Decision:</source>
-        <translation type="unfinished">Адаптивное определение B-кадров:</translation>
+        <translation>Адаптивное определение B-кадров:</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Включено</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>I-frames</source>
-        <translation type="unfinished">I-кадры</translation>
+        <translation>I-кадры</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>GOP Size:</source>
-        <translation type="unfinished">Размер GOP:</translation>
+        <translation>Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Minimum:</source>
-        <translation type="unfinished">Минимум:</translation>
+        <translation>Минимум:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Maximum:</source>
-        <translation type="unfinished">Максимум:</translation>
+        <translation>Максимум:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>I-frame Threshold:</source>
-        <translation type="unfinished">Порог I-кадров:</translation>
+        <translation>Порог I-кадров:</translation>
     </message>
     <message>
         <location line="+53"/>
         <location line="+6"/>
         <source>Analysis</source>
-        <translation type="unfinished">Анализ</translation>
+        <translation>Анализ</translation>
     </message>
     <message>
         <source>Trellis Quantization:</source>
-        <translation type="obsolete">Квантизация Треллиса:</translation>
+        <translation type="obsolete">Треллис-квантование:</translation>
     </message>
     <message>
         <source>Final Macroblock Only</source>
@@ -12706,12 +14780,12 @@
     <message>
         <location line="+6"/>
         <source>Fast Skip Detection on P-frames</source>
-        <translation type="unfinished">Быстрый пропуск обнаружения P-кадров</translation>
+        <translation>Быстрый пропуск обнаружения P-кадров</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>DCT Decimation on P-frames</source>
-        <translation type="unfinished">Децимация DCT на P-кадрах</translation>
+        <translation>Децимация DCT на P-кадрах</translation>
     </message>
     <message>
         <source>Psychovisual Rate Distortion Optimisation:</source>
@@ -12720,49 +14794,49 @@
     <message>
         <location line="-571"/>
         <source>Prediction for B-frames:</source>
-        <translation type="unfinished"></translation>
+        <translation>Предсказание для B-кадров:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Weighted Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation>Взвешенное предсказание</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Intra Prediction</source>
-        <translation type="unfinished"></translation>
+        <translation>Внутреннее предсказание</translation>
     </message>
     <message>
         <location line="+222"/>
         <source>Limit References by:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ограничение опорных:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>CU</source>
-        <translation type="unfinished"></translation>
+        <translation>CU</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Глубина</translation>
     </message>
     <message>
         <location line="+330"/>
         <source>Rate Distortion Optimisation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Оптимизация искажения частоты:</translation>
     </message>
     <message>
         <location line="+22"/>
         <location line="+88"/>
         <source>Level:</source>
-        <translation type="unfinished"></translation>
+        <translation>Уровень:</translation>
     </message>
     <message>
         <location line="-54"/>
         <location line="+88"/>
         <source>Psycho-visual Strength:</source>
-        <translation type="unfinished"></translation>
+        <translation>Психовизуальный уровень:</translation>
     </message>
     <message>
         <source>Noise Reduction:</source>
@@ -12771,89 +14845,89 @@
     <message>
         <location line="+38"/>
         <source>Noise Reduction Intra:</source>
-        <translation type="unfinished">Внутреннее уменьшение шума:</translation>
+        <translation>Подавление шума в интра-блоках:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Noise Reduction Inter:</source>
-        <translation type="unfinished">Внешнее уменьшение шума:</translation>
+        <translation>Подавление шума в интер-блоках</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Strong Intra Smoothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Сильное внешнее сглаживание</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Quantisation Matrix</source>
-        <translation type="unfinished">Матрица квантизации</translation>
+        <translation>Матрица квантования</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Flat Matrix</source>
-        <translation type="unfinished">Плоская матрица</translation>
+        <translation>Плоская матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>JVT Matrix</source>
-        <translation type="unfinished">Матрица JVT</translation>
+        <translation>Матрица JVT</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Matrix</source>
-        <translation type="unfinished">Собственная матрица</translation>
+        <translation>Ручная матрица</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+1080"/>
         <source>Edit</source>
-        <translation type="unfinished">Редактировать</translation>
+        <translation>Править</translation>
     </message>
     <message>
         <location line="-1033"/>
         <source>Quantiser Control</source>
-        <translation type="unfinished">Управление квантизатором</translation>
+        <translation>Управление квантизатором</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Chroma to Luma Quantiser Offset:</source>
-        <translation type="unfinished">Смещение квантизатора от Chroma до Luma:</translation>
+        <translation>Смещение квантизатора от Chroma до Luma:</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>I and P-frame Quantiser Ratio:</source>
-        <translation type="unfinished">Соотношение квантизатора I- и P-кадров:</translation>
+        <translation>Соотношение квантизатора I- и P-кадров:</translation>
     </message>
     <message>
         <location line="+182"/>
         <location line="+608"/>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <location line="-747"/>
         <source>Maximum Quantiser Step:</source>
-        <translation type="unfinished">Максимальный шаг квантизатора:</translation>
+        <translation>Максимальный шаг квантизатора:</translation>
     </message>
     <message>
         <location line="-321"/>
         <source>RDO in Quantization:</source>
-        <translation type="unfinished"></translation>
+        <translation>RDO квантования:</translation>
     </message>
     <message>
         <location line="+340"/>
         <source>Cb</source>
-        <translation type="unfinished"></translation>
+        <translation>Cb</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Cr</source>
-        <translation type="unfinished"></translation>
+        <translation>Cr</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>P and B-frame Quantiser Ratio:</source>
-        <translation type="unfinished">Соотношение квантизатора P- и B-кадров:</translation>
+        <translation>Соотношение квантизатора P- и B-кадров:</translation>
     </message>
     <message>
         <source>Average Bitrate Tolerance:</source>
@@ -12862,200 +14936,200 @@
     <message>
         <location line="+48"/>
         <source>Quantiser Curve Compression</source>
-        <translation type="unfinished">Компрессия кривых квантизатора</translation>
+        <translation>Сжатие кривых квантизатора</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Quantiser Curve Compression:</source>
-        <translation type="unfinished">Компрессия кривых квантизатора:</translation>
+        <translation>Сжатие кривых квантизатора:</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Reduce Fluctuation Before Curve Compression:</source>
-        <translation type="unfinished">Уменьшить колебание до компрессии кривых:</translation>
+        <translation>Уменьшить колебание до сжатия кривых:</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Reduce Fluctuation After Curve Compression:</source>
-        <translation type="unfinished">Уменьшить колебание после компрессии кривых:</translation>
+        <translation>Уменьшить колебание после сжатия кривых:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Adaptive Quantisation</source>
-        <translation type="unfinished">Адаптивная квантизация</translation>
+        <translation>Адаптивное квантование</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Variance AQ:</source>
-        <translation type="unfinished">Отклонение адаптивной квантизации:</translation>
+        <translation>Адаптивное квантование дисперсии:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Normal</source>
-        <translation type="unfinished">Нормальный</translation>
+        <translation>Нормальный</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Auto Variance AQ</source>
-        <translation type="unfinished">Автоматическое отклонение адаптивной квантизации:</translation>
+        <translation>Автоматич. адаптивное квантование дисперсии</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Auto-Variance Biased</source>
-        <translation type="unfinished"></translation>
+        <translation>Смещение авто-дисперсии</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Auto-Variance Edge</source>
-        <translation type="unfinished"></translation>
+        <translation>Граница авто-дисперсии</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Strength:</source>
-        <translation type="unfinished">Сила:</translation>
+        <translation>Уровень:</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Видео</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Color Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Описание цвета</translation>
     </message>
     <message>
         <location line="+160"/>
         <source>The value set here will almost always be ignored in favor of the aspect ratio stored in the container.  Configure that via the options in Output Format for the muxer chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Установленное здесь значение почти всегда будет игнорироваться в пользу соотношения сторон, сохранённого в контейнере. Настройте это с помощью параметров в формате вывода для выбранного мультиплексора.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Unspecified</source>
         <comment>PAR</comment>
-        <translation type="unfinished"></translation>
+        <translation>Не указано</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Custom Aspect Ratio:</source>
         <comment>PAR</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ручное соотношение сторон:</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Same as Input</source>
-        <translation type="unfinished"></translation>
+        <translation>Аналогичный входу</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Advanced 1</source>
-        <translation type="unfinished">Дополнительно 1</translation>
+        <translation>Дополнительно 1</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Video Buffer Verifier</source>
-        <translation type="unfinished"></translation>
+        <translation>Верификатор буфера видео (VBV)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Maximum VBV Bitrate:</source>
-        <translation type="unfinished">Максимальный битрейт VBV:</translation>
+        <translation>Максимальный битрейт VBV:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Initial VBV Buffer Occupancy:</source>
-        <translation type="unfinished">Начальное заполнение буфера VBV:</translation>
+        <translation>Начальное заполнение буфера VBV:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>kbit</source>
-        <translation type="unfinished">кбит</translation>
+        <translation>кбит</translation>
     </message>
     <message>
         <location line="+65"/>
         <source>kbit/s</source>
-        <translation type="unfinished">кбит/с</translation>
+        <translation>кбит/с</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>VBV Buffer Size:</source>
-        <translation type="unfinished">Размер буфера VBV:</translation>
+        <translation>Размер буфера VBV:</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Slicing</source>
-        <translation type="unfinished">Разделение на части</translation>
+        <translation>Срезание</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Slices per Frame:</source>
-        <translation type="unfinished">Частей на кадр:</translation>
+        <translation>Срезов на кадр:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum Size per Slice:</source>
-        <translation type="unfinished">Максимальный размер на часть:</translation>
+        <translation>Максимальный размер на срез:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>bytes</source>
-        <translation type="unfinished">байт</translation>
+        <translation>байт</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Maximum Macroblocks per Slice:</source>
-        <translation type="unfinished">Максимум макроблоков на часть:</translation>
+        <translation>Максимум макроблоков на срез:</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>Zones</source>
-        <translation type="unfinished">Зоны</translation>
+        <translation>Зоны</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Add</source>
-        <translation type="unfinished">Добавить</translation>
+        <translation>Добавить</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Advanced 2</source>
-        <translation type="unfinished">Дополнительно 2</translation>
+        <translation>Дополнительно 2</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Multithreading</source>
-        <translation type="unfinished">Многопоточность:</translation>
+        <translation>Многопоточность</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Disable</source>
-        <translation type="unfinished">Отключить</translation>
+        <translation>Отключить</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Auto-detect</source>
-        <translation type="unfinished">Автоопределение</translation>
+        <translation>Автоопределение</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Custom:</source>
         <comment>multithreading</comment>
-        <translation type="unfinished">Собственный:</translation>
+        <translation>Вручную:</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Enforce Repeatability</source>
-        <translation type="unfinished">Принудительная повторяемость</translation>
+        <translation>Принудительная повторяемость</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Slice-based Threading</source>
-        <translation type="unfinished">Многопоточность по частям</translation>
+        <translation>Поточность на основе срезов</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Custom Threaded Lookahead Buffer:</source>
-        <translation type="unfinished">Буфер предвидения собственных потоков:</translation>
+        <translation>Ручной многопоточный буфер предсказания:</translation>
     </message>
     <message>
         <source>Output 1</source>
@@ -13065,17 +15139,17 @@
         <location line="+59"/>
         <location line="+6"/>
         <source>Output</source>
-        <translation type="unfinished">Вывод</translation>
+        <translation>Вывод</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Generate Access Unit Delimiters</source>
-        <translation type="unfinished">Генерировать разделители единиц доступа</translation>
+        <translation>Генерировать разделители единиц доступа</translation>
     </message>
     <message>
         <location line="-606"/>
         <source>Pixel Aspect Ratio</source>
-        <translation type="unfinished">Cоотношение сторон</translation>
+        <translation>Соотношение сторон</translation>
     </message>
     <message>
         <source>Custom:</source>
@@ -13089,12 +15163,12 @@
     <message>
         <location line="+81"/>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <location line="-53"/>
         <source>Predefined Aspect Ratio:</source>
-        <translation type="unfinished">Предопределенное соотношение сторон:</translation>
+        <translation>Предопределённое соотношение сторон:</translation>
     </message>
     <message>
         <source>Output 2</source>
@@ -13103,73 +15177,73 @@
     <message>
         <location line="+588"/>
         <source>Video Usability Information</source>
-        <translation type="unfinished">Информация об использовании видео</translation>
+        <translation>Информация об использовании видео</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>These settings are only suggestions for the playback equipment.  Use at your own risk.</source>
-        <translation type="unfinished">Эти настройки всего лишь предлагаются для воспроизведения на оборудовании. Используйте их на свой страх и риск.</translation>
+        <translation>Эти настройки всего лишь предлагаются для воспроизведения на оборудовании. Используйте их на свой страх и риск.</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Overscan:</source>
-        <translation type="unfinished">Пересканирование:</translation>
+        <translation>Пересканирование:</translation>
     </message>
     <message>
         <location line="-785"/>
         <location line="+795"/>
         <source>Undefined</source>
-        <translation type="unfinished">Не определено</translation>
+        <translation>Не определено</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Show</source>
-        <translation type="unfinished">Показать</translation>
+        <translation>Показать</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Crop</source>
-        <translation type="unfinished">Обрезка</translation>
+        <translation>Обрезка</translation>
     </message>
     <message>
         <location line="-818"/>
         <source>Video Format:</source>
-        <translation type="unfinished">Формат видео:</translation>
+        <translation>Формат видео:</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Component</source>
-        <translation type="unfinished">Компонент</translation>
+        <translation>Компонент</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>PAL</source>
-        <translation type="unfinished"></translation>
+        <translation>PAL</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>NTSC</source>
-        <translation type="unfinished"></translation>
+        <translation>NTSC</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>SECAM</source>
-        <translation type="unfinished"></translation>
+        <translation>SECAM</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>MAC</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Colour Primaries:</source>
-        <translation type="unfinished">Первичные цвета:</translation>
+        <translation>Первичные цвета:</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Transfer Characteristics:</source>
-        <translation type="unfinished">Характеристики перехода:</translation>
+        <translation>Характеристики перехода:</translation>
     </message>
     <message>
         <source>Linear</source>
@@ -13178,37 +15252,37 @@
     <message>
         <location line="+28"/>
         <source>Colour Matrix:</source>
-        <translation type="unfinished">Цветовая матрица:</translation>
+        <translation>Цветовая матрица:</translation>
     </message>
     <message>
         <location line="+724"/>
         <source>HRD Parameters:</source>
-        <translation type="unfinished">Параметры HRD:</translation>
+        <translation>Параметры HRD:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>VBR</source>
-        <translation type="unfinished"></translation>
+        <translation>VBR</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>CBR</source>
-        <translation type="unfinished"></translation>
+        <translation>CBR</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Chroma Sample Location:</source>
-        <translation type="unfinished">Местонахождение образца Chroma:</translation>
+        <translation>Местонахождение образца Chroma:</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Full Range Samples</source>
-        <translation type="unfinished">Образцы полного диапазона</translation>
+        <translation>Образцы полного диапазона</translation>
     </message>
 </context>
 <context>
@@ -13216,12 +15290,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265CustomMatrixDialog.ui" line="+14"/>
         <source>x265 Custom Matrix</source>
-        <translation type="unfinished">Собственная матрица x265</translation>
+        <translation>Собственная матрица x265</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Intra 4x4</source>
-        <translation type="unfinished">Внутренняя 4x4</translation>
+        <translation>Внутренняя 4x4</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -13229,43 +15303,43 @@
         <location line="+446"/>
         <location line="+703"/>
         <source>Luma:</source>
-        <translation type="unfinished"></translation>
+        <translation>Яркость (luma):</translation>
     </message>
     <message>
         <location line="-1385"/>
         <location line="+446"/>
         <source>Chroma U/V:</source>
-        <translation type="unfinished"></translation>
+        <translation>Цветность (chroma) U/V:</translation>
     </message>
     <message>
         <location line="-238"/>
         <source>Inter 4x4</source>
-        <translation type="unfinished">Внешняя 4x4</translation>
+        <translation>Внешняя 4x4</translation>
     </message>
     <message>
         <location line="+446"/>
         <source>Intra 8x8</source>
-        <translation type="unfinished">Внутренняя 8x8</translation>
+        <translation>Внутренняя 8x8</translation>
     </message>
     <message>
         <location line="+703"/>
         <source>Inter 8x8</source>
-        <translation type="unfinished">Внешняя 8x8</translation>
+        <translation>Внешняя 8x8</translation>
     </message>
     <message>
         <location line="+727"/>
         <source>Load File</source>
-        <translation type="unfinished">Загрузить файл</translation>
+        <translation>Загрузить файл</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Да</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
 </context>
 <context>
@@ -13274,213 +15348,213 @@
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp" line="+32"/>
         <location line="+24"/>
         <source>None</source>
-        <translation type="unfinished">Не нужно</translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location line="-23"/>
         <source>Low</source>
-        <translation type="unfinished">Низкий</translation>
+        <translation>Низкий</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Medium</source>
-        <translation type="unfinished">Средне</translation>
+        <translation>Средний</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Custom</source>
-        <translation type="unfinished">Вручную</translation>
+        <translation>Вручную</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>4:3 (PAL)</source>
-        <translation type="unfinished"></translation>
+        <translation>4:3 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>4:3 (NTSC)</source>
-        <translation type="unfinished"></translation>
+        <translation>4:3 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>16:9 (PAL)</source>
-        <translation type="unfinished"></translation>
+        <translation>16:9 (PAL)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>16:9 (NTSC)</source>
-        <translation type="unfinished"></translation>
+        <translation>16:9 (NTSC)</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Threading</source>
-        <translation type="unfinished">Многопоточность</translation>
+        <translation>Многопоточность</translation>
     </message>
     <message>
         <location line="-2"/>
         <source>Motion Estimation</source>
-        <translation type="unfinished">Определение движения</translation>
+        <translation>Определение движения</translation>
     </message>
     <message>
         <location line="+35"/>
         <location line="+17"/>
         <source>Encoding Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Режим кодирования</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Frame Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки кадра</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Miscellaneous</source>
-        <translation type="unfinished"></translation>
+        <translation>Прочее</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Rate Control</source>
-        <translation type="unfinished">Управление битрейтом</translation>
+        <translation>Управление битрейтом</translation>
     </message>
     <message>
         <location line="-52"/>
         <source>Aspect Ratio:</source>
-        <translation type="unfinished">Соотношение сторон:</translation>
+        <translation>Соотношение сторон:</translation>
     </message>
     <message>
         <location line="-68"/>
         <source>Full</source>
-        <translation type="unfinished">Полный</translation>
+        <translation>Полный</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>H.263</source>
-        <translation type="unfinished"></translation>
+        <translation>H.263</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>MPEG</source>
-        <translation type="unfinished"></translation>
+        <translation>MPEG</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>DCT</source>
-        <translation type="unfinished"></translation>
+        <translation>DCT</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qpel16</source>
-        <translation type="unfinished"></translation>
+        <translation>Qpel16</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Qpel8</source>
-        <translation type="unfinished"></translation>
+        <translation>Qpel8</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Square</source>
-        <translation type="unfinished"></translation>
+        <translation>Квадрат</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>One thread</source>
-        <translation type="unfinished">1 поток</translation>
+        <translation>Один поток</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation type="unfinished">2 потока</translation>
+        <source>Two threads</source>
+        <translation>Два потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Three threads</source>
-        <translation type="unfinished">3 потока</translation>
+        <translation>Три потока</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Auto (#cpu)</source>
-        <translation type="unfinished">Автоматически (#cpu)</translation>
+        <translation>Авто (по числу ядер)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>1:1 (PC)</source>
-        <translation type="unfinished"></translation>
+        <translation>1:1 (ПК)</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Mi_n. quantizer:</source>
-        <translation type="unfinished">_Мин. квантизатор:</translation>
+        <translation>_Мин. квантизатор:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ma_x. quantizer:</source>
-        <translation type="unfinished">М_акс. квантизатор:</translation>
+        <translation>М_акс. квантизатор:</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>_Trellis quantization</source>
-        <translation type="unfinished">Квантизация _Треллиса</translation>
+        <translation>_Треллис-квантование</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Number of B frames:</source>
-        <translation>_Количество B-кадров:</translation>
+        <translation>_Число B-кадров:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Drop identical frames (this disables B-frames)</source>
-        <translation>_Сбрасывать одинаковые кадры (это отключает B-кадры)</translation>
+        <translation>_Сбрасывать одинаковые кадры (отключает B-кадры)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Framedrop _Ratio:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Частота выпадения кадров:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Quantization type:</source>
-        <translation type="unfinished">_Тип квантизации:</translation>
+        <translation>_Тип квантования:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>_Macroblock decision:</source>
-        <translation type="unfinished">_Определение макроблоков:</translation>
+        <translation>_Определение макроблоков:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Profile:</source>
-        <translation type="unfinished">Профиль:</translation>
+        <translation>Профиль:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>_Gop Size:</source>
-        <translation type="unfinished">_Размер GOP:</translation>
+        <translation>_Размер группы кадров:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use XVID fcc (else DIVX)</source>
-        <translation type="unfinished">Использовать XVID fcc (или DIVX)</translation>
+        <translation>Использовать XVID fcc (или DIVX)</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Quantization</source>
-        <translation type="unfinished">Квантизация</translation>
+        <translation>Квантование</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Threads</source>
-        <translation type="unfinished">Потоки</translation>
+        <translation>Потоки</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Aspect Ratio</source>
-        <translation type="unfinished">Соотношение сторон</translation>
+        <translation>Соотношение сторон</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Xvid4 MPEG-4 ASP configuration</source>
-        <translation type="unfinished">Настройка Xvid4 MPEG-4 ASP</translation>
+        <translation>Настройки Xvid4 MPEG-4 ASP</translation>
     </message>
 </context>
 <context>
@@ -13488,12 +15562,12 @@
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/yadif/ADM_vidYadif.cpp" line="+132"/>
         <source>Yadif</source>
-        <translation type="unfinished"></translation>
+        <translation>Yadif</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Yadif, port of avisynth version (c) Fizick.</source>
-        <translation type="unfinished">Yadif, порт версии avisynth (c) Fizick.</translation>
+        <translation>Yadif, порт версии avisynth (c) Fizick.</translation>
     </message>
     <message>
         <location line="+70"/>
@@ -13508,52 +15582,215 @@
     <message>
         <location line="-7"/>
         <source>Frame : Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation>Кадр: временная и пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field :  Temporal &amp; spatial check</source>
-        <translation type="unfinished"></translation>
+        <translation>Поле: временная и пространственная проверка</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Frame : Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation>Кадр: пропустить пространственно-временную проверку</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Field : Skip spatial temporal check</source>
-        <translation type="unfinished"></translation>
+        <translation>Поле: пропустить временную и пространственную проверку</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Deint all</source>
-        <translation type="unfinished"></translation>
+        <translation>Деинтерлейс всего</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Deint interlaced</source>
-        <translation type="unfinished"></translation>
+        <translation>Деинтерлейс чересстрочности</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>_Mode:</source>
-        <translation type="unfinished">_Режим:</translation>
+        <translation>_Режим:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Deint:</source>
-        <translation type="unfinished"></translation>
+        <translation>_Деинтерлейсинг:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>_Order:</source>
-        <translation type="unfinished">Порядок:</translation>
+        <translation>Порядок:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>yadif</source>
-        <translation type="unfinished"></translation>
+        <translation>Yadif</translation>
+    </message>
+</context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation>Масштабирование</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation>Фильтр частичной обрезки.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation>Выборка: </translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation>Масштабирование</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation>Справа:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation>Сверху:</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation>Сброс</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation>Снизу:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation>Слева:</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation>Алгоритм изменения размера:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation>Билинейный</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Бикубический</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation>Ланцош-3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation>Сплайн</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation>Фиксировать соотношение сторон:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>&amp;Спрятать резиновые линии</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation>Выборка: </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation>Свободное</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation>Текущая выборка</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation>Источник</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation>21:9</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation>18:9</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation>16:9</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation>4:3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation>1:1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation>9:16</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation>Поля:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation>чёрные полосы</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation>эхо</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation>нет (растянуть)</translation>
     </message>
 </context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_sk.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_sk.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+425"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+433"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Nemožno nájsť rozkladač videa pre %s</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>Zlyhalo otvorenie %s!</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>width</source>
         <translation>šírka</translation>
     </message>
@@ -79,7 +79,7 @@
         <translation>Nepodporovaná veľkosť</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Kontrola platnosti časových údajov.</translation>
     </message>
@@ -89,12 +89,12 @@
         <translation>Toto video obsahuje snímky B, ale časové údaje prezentácie (PTS) chýbajú alebo sa monotónne zvyšujú. Avidemux sa môže pokúsiť rekonštruovať správne PTS dekódovaním celého videa. Môže to ale trvať veľmi dlho. Pokračovať?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Rozkladanie videa...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -499,12 +499,12 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+141"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+142"/>
         <source>&amp;Auto</source>
         <translation>Au&amp;tomaticky</translation>
     </message>
     <message>
-        <location line="-126"/>
+        <location line="-127"/>
         <source>Avidemux</source>
         <translation>Avidemux</translation>
     </message>
@@ -534,7 +534,7 @@
         <translation>&amp;Lišty nástrojov</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>&amp;Custom</source>
         <translation>V&amp;lastné</translation>
     </message>
@@ -626,12 +626,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigácia</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation>Prehrať [medzerník]</translation>
     </message>
@@ -650,6 +650,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -659,7 +661,7 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>Prejsť na predošlú snímku [šípka vľavo]</translation>
     </message>
@@ -689,7 +691,7 @@
         <translation>Nastaviť značku konca [Ctrl+Page Down]</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation>Nájsť predošlú čiernu snímku</translation>
     </message>
@@ -790,12 +792,22 @@
         <translation>Hlasi&amp;tosť</translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation> (0 stôp)</translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation>Vybrané: 000000</translation>
     </message>
@@ -911,6 +923,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Audiometer</translation>
     </message>
@@ -1184,6 +1206,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>Vynulovať značky</translation>
     </message>
@@ -1210,6 +1242,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>&amp;Filtre</translation>
@@ -1245,7 +1282,17 @@
         <translation>&amp;O programe</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
         <translation>Prvá snímka</translation>
     </message>
@@ -1270,6 +1317,46 @@
         <translation>Prejsť na čas</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Priblíženie 1:4</translation>
@@ -1338,7 +1425,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+396"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+445"/>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
@@ -1398,7 +1485,7 @@
         <translation>Ručne [dB]</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Gain</source>
         <translation>Zisk</translation>
     </message>
@@ -1424,8 +1511,8 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Remix:</source>
-        <translation>Premiešanie:</translation>
+        <source>Remix</source>
+        <translation>Premiešanie</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1443,7 +1530,7 @@
         <translation>Posun hodnoty [ms]:</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Audio Filters</source>
         <translation>Audio filtre</translation>
     </message>
@@ -1464,16 +1551,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-49"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>Xvideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1494,7 +1584,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1540,7 +1630,7 @@
     </message>
     <message>
         <location line="+23"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-46"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-116"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="+58"/>
@@ -1549,7 +1639,7 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -1634,7 +1724,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-70"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Horizontal deblocking</source>
         <translation>_Horizontálne odstránenie blokových artefaktov (deblocking)</translation>
     </message>
@@ -1655,7 +1745,7 @@
         <translation>Ro_zkladač (ffmpedeint)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-184"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Dekódovať video použitím DXVA2 (Windows)</translation>
     </message>
@@ -1675,12 +1765,12 @@
         <translation>Dekódovať video použitím VideoToolbox (macOS)</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation>Povoliť OpenGL podporu</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>Ak použijete hardvérové dekódovanie, je lepšie použiť pripôsobený ovládač zobrazovania</translation>
     </message>
@@ -1700,7 +1790,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Akceptovať neštandardnú frekvenciu zvuku pre DVD</translation>
     </message>
@@ -1780,7 +1870,27 @@
         <translation>Povoliť SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>Vlákna _LAV kodeku:</translation>
     </message>
@@ -1822,7 +1932,7 @@
         <translation>Nízka</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>Priorita _kódovania:</translation>
     </message>
@@ -1847,7 +1957,12 @@
         <translation>_Predvoliť priečinok naposledy načítaného súboru na uloženie</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation>Nastavenia automatického pripájania</translation>
     </message>
@@ -1862,7 +1977,37 @@
         <translation>_Veľkosť fragmentu:</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation>Zásobník dekódovaných obrázkov</translation>
     </message>
@@ -1872,37 +2017,36 @@
         <translation>Veľkosť _zásobníka:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>XVideo (best)</source>
-        <translation>Xvideo (najlepšie)</translation>
+        <translation type="vanished">Xvideo (najlepšie)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (najlepšie)</translation>
+        <translation type="vanished">VDPAU (najlepšie)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (najlepšie)</translation>
+        <translation type="vanished">DXVA2 (najlepšie)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (najlepšie)</translation>
+        <translation type="vanished">OpenGL (najlepšie)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (najlepšie)</translation>
+        <translation type="vanished">LIBVA (najlepšie)</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>SDL (good)</source>
-        <translation>SDL (dobré)</translation>
+        <translation type="vanished">SDL (dobré)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+25"/>
         <source>Video _display:</source>
         <translation>Zobrazenie _videa:</translation>
     </message>
@@ -1974,7 +2118,7 @@
         <translation>_Audio zariadenie</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation>Od_stránenie zvlnenia okolo hrán (deringing)</translation>
     </message>
@@ -1984,12 +2128,12 @@
         <translation>_Sila:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation>Východzie dodatočné spracovanie</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-64"/>
         <source>System language</source>
         <translation>Jazyk systému</translation>
     </message>
@@ -1999,17 +2143,27 @@
         <translation>_Jazyk</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>User Interface</source>
         <translation>Užívateľské rozhranie</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Output</source>
         <translation>Výstup</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+46"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Obmedziť obnovovací kmitočet</translation>
     </message>
@@ -2019,19 +2173,22 @@
         <translation>Strop obnovovacej frekvencie [ms]</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>Grafické užívateľské prostredie volieb prevodu</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Zobrazenie</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>HW akcelerácia</translation>
     </message>
@@ -2041,7 +2198,7 @@
         <translation>Vláknenie</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-271"/>
         <source>_Always ask which port to use</source>
         <translation>_Vždy sa opýtať, ktorý port sa má použiť</translation>
     </message>
@@ -2051,13 +2208,33 @@
         <translation>Predvolený port na použitie</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+12"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+262"/>
         <source>Preferences</source>
         <translation>Predvoľby</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-128"/>
         <source>Save as BMP</source>
         <translation>Uložiť ako BMP</translation>
     </message>
@@ -2077,12 +2254,12 @@
         <translation>Späť</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+18"/>
         <source>Pr&amp;eferences</source>
         <translation>Pre&amp;dvoľby</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>&amp;Advanced</source>
         <translation>Po&amp;kročilé</translation>
     </message>
@@ -2122,7 +2299,7 @@
         <translation>Ďalšia vnútorná snímka</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
         <translation>&amp;Predošlá čierna snímka</translation>
     </message>
@@ -2132,13 +2309,13 @@
         <translation>&amp;Nasledujúca čierna snímka</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="+1571"/>
+        <location filename="../../common/gui_main.cpp" line="+1621"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -2152,8 +2329,8 @@
         <translation>Chyba</translation>
     </message>
     <message>
-        <location line="-49"/>
-        <location line="+49"/>
+        <location line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Nemôžete odstrániť *všetky* videá
@@ -2249,7 +2426,7 @@
 To je potrebný na vytvorenie PSP kompatibilného videa.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>Vyberte skript/projekt na spustenie</translation>
     </message>
@@ -2275,13 +2452,13 @@
 Pokračovať?</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+114"/>
         <source>Not coded in this version</source>
         <translation>Nepodporované v tejto verzii</translation>
     </message>
     <message>
         <location line="+11"/>
-        <location line="+73"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Vyberte video súbor...</translation>
     </message>
@@ -2301,7 +2478,7 @@
         <translation>Vybrať video na pripojenie...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2333,7 +2510,7 @@
 Napriek tomu to skúsiť?</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Ste si istý?</translation>
     </message>
@@ -2419,7 +2596,7 @@
 PNapriek tomu pokračovať?</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>Chyba oprávnenia</translation>
     </message>
@@ -2471,12 +2648,12 @@
         <translation>Pri pripojovaní niečo zlyhalo</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Stalo sa niečo zlé (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -2484,7 +2661,7 @@
 Očakávajte problémy.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Kontrola videa</translation>
     </message>
@@ -2519,7 +2696,7 @@
         <translation>Prihodilo sa niečo zlé</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>_Stopa z videa:</translation>
     </message>
@@ -2592,7 +2769,7 @@
         <translation>Hex výpis snímiek</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+113"/>
         <source>Oops</source>
         <translation>Hoplá</translation>
     </message>
@@ -2602,7 +2779,7 @@
         <translation>Táto funkcia je vypnutá alebo je už neplatná</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Chyba inicializácie audio zariadenia</translation>
     </message>
@@ -2802,7 +2979,7 @@
         <translation>Nemožno pridať úlohu %s</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-251"/>
+        <location filename="../../common/gui_savenew.cpp" line="-253"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Znova použiť predošlé prvé údaje prechodu?
@@ -2810,7 +2987,7 @@
     </message>
     <message>
         <location line="+12"/>
-        <location line="+170"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -2845,20 +3022,20 @@
 Chcete aj tak pokračovať?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Zmiešavač</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation>Nemožno nastaviť kódovač pre prvý prechod. Konfigurácia dodaná do kódovača môže byť nekompatibilná alebo kódovač môže závisieť od funkcií nedostupných v tomto systéme.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Nemožno priradiť zmiešavač</translation>
     </message>
@@ -2889,17 +3066,19 @@
 Skúsiť to znovu?</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>Nemožno otvoriť </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-113"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>Vypnuté</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Automatické zisťovanie</translation>
     </message>
@@ -3146,12 +3325,12 @@
     <message>
         <location filename="../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp" line="+23"/>
         <source>%d minute(s)</source>
-        <translation>%n minút</translation>
+        <translation>%d minút</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>%d hour(s)</source>
-        <translation>%n hodín</translation>
+        <translation>%d hodín</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -3185,6 +3364,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -3264,6 +3448,11 @@
         <translation>8 bitové PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>Neznámy kodek</translation>
@@ -3289,7 +3478,7 @@
         <translation>Chyba pamäte</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Ukladanie</translation>
     </message>
@@ -3402,7 +3591,7 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3450,6 +3639,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation>Skript &quot;%s&quot; neexistuje.</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3478,6 +3716,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3524,6 +3819,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3630,6 +4067,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3661,9 +4206,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3681,35 +4252,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3806,12 +4382,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3891,12 +4462,12 @@
         <translation>Sp_odný okraj:</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Do not adjust</source>
         <translation>Neupravovať</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation>Upraviť pomer strán zobrazenia:</translation>
     </message>
@@ -3981,6 +4552,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Formát zmiešavania</translation>
     </message>
@@ -4133,7 +4724,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Začiernené okraje</translation>
     </message>
@@ -4189,17 +4780,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>Čierne snímky</translation>
+        <translation type="vanished">Čierne snímky</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Táto funkcia momentálne nie je podporovaná</translation>
+        <translation type="vanished">Táto funkcia momentálne nie je podporovaná</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Vyhľadávanie čiernej snímky.</translation>
     </message>
@@ -4228,6 +4818,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4270,7 +4926,7 @@
         <translation>Zmenou rýchlosti videa, ako keby ste menili snímkovú frekvenciu. Tento filter vytvára trvalé zmeny.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation>Snímok/s zdroja:</translation>
     </message>
@@ -4337,6 +4993,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4494,8 +5210,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
@@ -4505,8 +5221,8 @@
         <translation>Upraví kontrast, jas a farby.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Jas</translation>
     </message>
@@ -4535,12 +5251,11 @@
         <translation>Jasová zložka</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Process</source>
-        <translation>Priebeh</translation>
+        <translation type="vanished">Priebeh</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+7"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4608,7 +5323,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Orezanie</translation>
     </message>
@@ -4618,7 +5333,7 @@
         <translation>Filter orezávania</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Upozornenie na prílišnú šírku orezania! Šírka vynulovaná!
@@ -4632,12 +5347,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Veľkosť: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4652,13 +5368,13 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Vpravo:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Hore:</translation>
     </message>
@@ -4669,13 +5385,13 @@
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Dole:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Vľavo:</translation>
     </message>
@@ -4685,17 +5401,17 @@
         <translation>Automatické orezanie</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Veľkosť: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>&amp;Skryť gumičku</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4741,7 +5457,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4760,6 +5476,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+56"/>
@@ -4851,6 +5603,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+56"/>
@@ -4935,6 +5803,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4956,29 +5837,29 @@
     </message>
     <message>
         <location line="+32"/>
-        <location line="+254"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Neznámy</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+247"/>
+        <location line="-310"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Nie je</translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-310"/>
         <source>Phase:</source>
         <translation>Fáza:</translation>
     </message>
     <message>
-        <location line="-31"/>
+        <location line="+24"/>
         <source>Time Remaining:</source>
         <translation>Zostávajúci čas:</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+11"/>
         <source>Shut down computer when finished</source>
         <translation>Po ukončení vypnúť počítač</translation>
     </message>
@@ -5018,7 +5899,17 @@
         <translation>Po dokončení ponechajte dialógové okno otvorené</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>Minimalizovať na lištu</translation>
     </message>
@@ -5125,7 +6016,7 @@
         <translation>Upraví kontrast, jas, nasýtenie a gama.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Vynulovať</translation>
     </message>
@@ -5139,12 +6030,12 @@
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Gama&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>Nasýtenie</translation>
     </message>
@@ -5154,7 +6045,7 @@
         <translation>Jas</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+142"/>
         <source>Blue</source>
         <translation>Modrá</translation>
     </message>
@@ -5178,11 +6069,6 @@
         <source>Green</source>
         <translation>Zelená</translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5203,9 +6089,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Vytrácanie</translation>
@@ -5451,7 +6826,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+251"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+264"/>
         <source>Normal (4:3)</source>
         <translation>Normálne (4:3)</translation>
     </message>
@@ -5502,7 +6877,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dve vlákna</translation>
     </message>
     <message>
@@ -5654,7 +7029,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation>H.263</translation>
     </message>
@@ -5685,7 +7060,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dve vlákna</translation>
     </message>
     <message>
@@ -6179,7 +7554,7 @@
         <translation>[Zmätočné]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>Uloženie mpeg PS (ff)</translation>
     </message>
@@ -6240,12 +7615,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Voľné</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Formát zmiešavania</translation>
     </message>
@@ -6283,7 +7658,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Uloženie mpeg TS (ff)</translation>
     </message>
@@ -6304,9 +7679,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation>Základný</translation>
     </message>
@@ -6400,6 +7838,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6914,16 +8524,11 @@
         <source>Saturation</source>
         <translation>Nasýtenie</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HuffYUV</translation>
     </message>
@@ -6933,7 +8538,7 @@
         <translation>FF HuffYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
@@ -6957,6 +8562,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -7009,8 +8690,8 @@
         <translation>_Odstrániť duplikáty:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>Plná</translation>
     </message>
@@ -7027,8 +8708,8 @@
         <translation>Veľmi rýchla</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>Zmena _snímkovej frekvencie:</translation>
     </message>
@@ -7204,7 +8885,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7214,14 +8895,18 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+3"/>
         <source>_Quantizer:</source>
         <translation>_Kvantifikátor:</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>_Farebný priestor:</translation>
+        <translation type="vanished">_Farebný priestor:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7376,7 +9061,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>_Prenosová rýchlosť:</translation>
     </message>
@@ -7550,6 +9235,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7570,7 +9311,7 @@
         <translation>Správca video filtrov</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+219"/>
         <source>&lt;big&gt;&lt;b&gt;Active Filters&lt;/b&gt;&lt;/big&gt;</source>
         <translation>&lt;big&gt;&lt;b&gt;Aktívne filtre&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
@@ -7580,12 +9321,17 @@
         <translation>&lt;big&gt;&lt;b&gt;Dostupné filtre&lt;/b&gt;&lt;/big&gt;</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-99"/>
         <source>Transform</source>
         <translation>Transformovanie</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Prekladanie</translation>
     </message>
@@ -7643,12 +9389,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Matroska obrázky</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Matroska klustery</translation>
     </message>
@@ -7754,7 +9500,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8130,12 +9876,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Chyba čítania hlavičky SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation>Dekódovanie typu snímky</translation>
     </message>
@@ -8143,7 +9890,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Nepodporované</translation>
     </message>
@@ -8190,7 +9937,7 @@
         <translation>Podporované len pre audio AAC, AC3, DTS, E-AC3, MP2, MP3 a Vorbis</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>Uloženie mp4</translation>
     </message>
@@ -8205,6 +9952,11 @@
         <translation>Uloženie mov</translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Formát zmiešavania</translation>
@@ -8335,7 +10087,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -8360,7 +10112,12 @@
         <translation>Video nemá dostatok informácií o časovaní. Kopírujete z AVI?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation>Nemožno premenovať súbor (optimalizovať)</translation>
     </message>
@@ -8446,7 +10203,7 @@
         <translation>Náhľad. Kliknite na obrázok vyššie a nahrubo nastavte súradnice</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Veľkosť červeného obdĺžnika môžete meniť pomocou úchytiek </translation>
     </message>
@@ -8477,22 +10234,17 @@
         <translation>Filter MSharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Maska</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Sila</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Prah</translation>
     </message>
@@ -8502,7 +10254,7 @@
         <translation>Vysoká kvalita</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8510,22 +10262,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Nemožno prejsť ďalšiu snímku</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Nemožno prejsť na predošlú snímku</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>Hľadať</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
@@ -8634,9 +10386,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Chybná hlavička</translation>
     </message>
@@ -8649,7 +10401,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8722,27 +10474,39 @@
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Textová návesť</translation>
+        <translation type="vanished">Textová návesť</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Snímková frekvencia:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Celkové trvanie:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>Pomer strán:</translation>
     </message>
@@ -8757,22 +10521,39 @@
         <translation>Kodek 4CC:</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Extra Video Properties</source>
-        <translation>Zvláštne vlastnosti videa</translation>
+        <translation type="vanished">Zvláštne vlastnosti videa</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>ExtraDataSize:</source>
-        <translation>Veľkosť zvláštnych údajov:</translation>
+        <translation type="vanished">Veľkosť zvláštnych údajov:</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Extra data :</source>
-        <translation>Zvláštne údaje:</translation>
+        <translation type="vanished">Zvláštne údaje:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -8835,7 +10616,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Vybrať audio súbor</translation>
     </message>
@@ -8856,7 +10637,7 @@
         <translation>Niektoré stopy sú použité viackrát</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Stopa </translation>
     </message>
@@ -8871,7 +10652,7 @@
         <translation>Súbor </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>.... Pridať audio stopu</translation>
     </message>
@@ -8896,22 +10677,26 @@
         <translation>Na túto operáciu sú vyžadované základné výhradné práva.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Prvý prechod</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pass 1</source>
-        <translation>Prechod 1</translation>
+        <translation type="vanished">Prechod 1</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Prebieha kódovanie...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kódovanie je pozastavené. Chcete v ňom pokračovať, alebo ho ukončiť?</translation>
     </message>
@@ -8949,12 +10734,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Dostupná nová verzia&lt;/b&gt;&lt;br&gt; verzia %1&lt;br&gt;uvoľnená od %2.&lt;br&gt;Môžete si ju stiahnuť tu&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Automatickú aktualizáciu môžete zakázať v predvoľbách.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Nedávne &amp;súbory</translation>
     </message>
@@ -8964,12 +10749,17 @@
         <translation>Nedávne &amp;projekty</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Pre&amp;hrať/Zastaviť</translation>
     </message>
@@ -9004,6 +10794,16 @@
         <translation>Nastaviť značku konca</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>Presjť na prvú snímku</translation>
@@ -9034,24 +10834,34 @@
         <translation>Vpred o 1 minútu</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Aplikácia sa stretla s fatálnym problémom
 Súčasná úprava bola uložená a pri ďalšom štarte bude znovu načítaná</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation>Výber: </translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9109,7 +10919,7 @@
         <translation> Odporúčania</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation>&amp;Obnoviť predošlú reláciu</translation>
     </message>
@@ -9209,28 +11019,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Čiastočný</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Tento filter nemôže urobený ako čiastočný</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Pridať</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Odstrániť</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Konfigurovať</translation>
     </message>
@@ -9240,22 +11051,63 @@
         <translation>Posunúť hore</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Posunúť dole</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Vytvoriť čiastočný</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation>Stlačte %s pre akceptáciu dialógu</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>Nahrať video filtre..</translation>
     </message>
@@ -9273,7 +11125,7 @@
         <translation>Neznámy</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>_Zhrnutie</translation>
     </message>
@@ -9301,18 +11153,33 @@
         <translation>Áno</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+36"/>
         <source>%2.3f fps</source>
         <translation>%2.3f snímok/s</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+90"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
+    <message>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="-55"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9322,88 +11189,73 @@
         </translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="vanished">Video</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>Kodek 4CC:	</translation>
+        <translation type="vanished">Kodek 4CC:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Veľkosť obrázka:	</translation>
+        <translation type="vanished">Veľkosť obrázka:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>Pomer strán:	</translation>
+        <translation type="vanished">Pomer strán:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>Snímková frekvencia::	</translation>
+        <translation type="vanished">Snímková frekvencia::	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Celkové trvanie:	</translation>
+        <translation type="vanished">Celkové trvanie:	</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Zvláštne vlastnosti videa</translation>
+        <translation type="vanished">Zvláštne vlastnosti videa</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>Veľkosť zvláštnych údajov:	</translation>
+        <translation type="vanished">Veľkosť zvláštnych údajov:	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>Zvláštne údaje:	</translation>
+        <translation type="vanished">Zvláštne údaje:	</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="vanished">Audio</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>Kodek:		</translation>
+        <translation type="vanished">Kodek:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Kanály:	</translation>
+        <translation type="vanished">Kanály:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>Prenosová rýchlosť:	</translation>
+        <translation type="vanished">Prenosová rýchlosť:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Frekvencia:	</translation>
+        <translation type="vanished">Frekvencia:	</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+189"/>
         <source>No Audio</source>
         <translation>Žiadne audio</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-256"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+101"/>
         <source>Mono</source>
         <translation>Mono</translation>
     </message>
@@ -9489,6 +11341,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9509,7 +11418,7 @@
         <translation>Nastavenia len video zmiešavača</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation>Ukladanie surového videa</translation>
     </message>
@@ -9570,7 +11479,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+43"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+44"/>
         <source>Custom</source>
         <translation>Vlastné</translation>
     </message>
@@ -9600,7 +11509,7 @@
         <translation>59.94  (NTSC)</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>Prevzorkovať snímkovanie</translation>
     </message>
@@ -9610,7 +11519,22 @@
         <translation>Mení a vynucuje snímkovanie. Udržuje dobu trvanie a synchronizáciu.</translation>
     </message>
     <message>
-        <location line="+281"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation>_Režim:</translation>
     </message>
@@ -9620,6 +11544,11 @@
         <translation>_Nová snímková frekvencia:</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Resample fps</source>
         <translation>Prevzorkovať snímkovanie</translation>
@@ -9628,12 +11557,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Šírka a výška nemôžu byť nepárne</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>Softvérová zmena veľkosti</translation>
     </message>
@@ -9761,7 +11690,17 @@
         <translation>0,00/0,00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Metóda zmeny veľkosti:</translation>
     </message>
@@ -9785,22 +11724,27 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Rotácia</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-160"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>Otočí obrázok o 90/180/270/ stupňov.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+153"/>
         <source>None</source>
         <translation>Nie je</translation>
     </message>
@@ -9811,18 +11755,26 @@
     </message>
     <message>
         <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-1"/>
         <source>180 degrees</source>
         <translation>180 stupňov</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9830,9 +11782,8 @@
         <translation>270 stupňov</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9848,7 +11799,17 @@
         <translation>Náhľad</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>Späť o jednu minútu</translation>
     </message>
@@ -9934,17 +11895,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Statický obrázok</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Duplikuje snímky pre danú dobu trvania.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>Čas _štartu:</translation>
     </message>
@@ -10123,7 +12084,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation> h</translation>
     </message>
@@ -10141,7 +12102,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10160,7 +12121,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Existuje niekoľko súborov so sekvenčnými názvami súborov. Majú byť všetky načítané?</translation>
@@ -10730,6 +12691,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10786,7 +12829,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>Nekódované</translation>
     </message>
@@ -10798,17 +12841,27 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>nie je</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Vlastné</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Cieľová prenosová rýchlosť [kB/s]:</translation>
     </message>
@@ -10844,7 +12897,7 @@
         <translation>Priemerná prenosová rýchlosť:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12167,7 +14220,7 @@
         <translation>Vlastné</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Cieľová prenosová rýchlosť:</translation>
     </message>
@@ -12284,7 +14337,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>Konfigurácia x265</translation>
     </message>
     <message>
@@ -13506,7 +15559,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Dve vlákna</translation>
     </message>
     <message>
@@ -13729,4 +15782,167 @@
         <translation>yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Покушај да отворим %s није успео!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -493,7 +493,7 @@
         <translation type="unfinished">Видео кодер</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Без измене</translation>
@@ -518,7 +518,7 @@
         <translation type="unfinished">Филтери</translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+708"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -549,7 +549,7 @@
         <translation type="unfinished">Тип кадра:</translation>
     </message>
     <message>
-        <location line="-1278"/>
+        <location line="-1327"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -574,7 +574,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,12 +646,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -670,6 +670,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -679,7 +681,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -709,7 +711,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -779,12 +781,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,6 +900,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1051,7 +1073,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1071,7 +1093,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Дозволи нестандардне учестаности звука за ДВД</translation>
     </message>
@@ -1146,7 +1168,27 @@
         <translation type="unfinished">Омогући SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished">lavc _нити:</translation>
     </message>
@@ -1188,7 +1230,7 @@
         <translation type="unfinished">Ниско</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">Приоритет _кодирања:</translation>
     </message>
@@ -1213,7 +1255,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1228,22 +1275,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation type="unfinished">XVideo (најбоље)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation type="unfinished">SDL (добро)</translation>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="obsolete">XVideo (најбоље)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="obsolete">SDL (добро)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation type="unfinished">Видео _екран:</translation>
     </message>
@@ -1316,7 +1412,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">_Хоризонтално уклањање блокова</translation>
     </message>
@@ -1342,17 +1438,17 @@
         <translation type="unfinished">_Јачина :</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished">Подразумевана накнадна обрада</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation type="unfinished">Корисничко окружење</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation type="unfinished">Излаз</translation>
     </message>
@@ -1367,13 +1463,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished">Звук</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1381,7 +1477,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation type="unfinished">Процесори</translation>
     </message>
@@ -1391,8 +1487,7 @@
         <translation type="unfinished">Више нити</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+3"/>
+        <location line="+18"/>
         <source>Preferences</source>
         <translation type="unfinished">Поставке</translation>
     </message>
@@ -1402,7 +1497,7 @@
         <translation type="unfinished">Без измене</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+30"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Филтери</translation>
@@ -1490,7 +1585,7 @@
         <translation type="unfinished">Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation type="unfinished">_режим појачавања:</translation>
     </message>
@@ -1505,7 +1600,7 @@
         <translation type="unfinished">_Миксета:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation type="unfinished">Звучни филтери</translation>
     </message>
@@ -1516,11 +1611,13 @@
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation type="unfinished">SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished">XVideo</translation>
     </message>
@@ -1571,7 +1668,7 @@
         <translation type="unfinished">Није кодирано у овој верзији</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1590,7 +1687,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Да ли си сигуран?</translation>
     </message>
@@ -1655,7 +1752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished">Грешка са дозволама</translation>
     </message>
@@ -1707,19 +1804,19 @@
         <translation type="unfinished">Нешто није успело приликом додавања</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Нешто лоше се десило (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished">Проверавам видео</translation>
     </message>
@@ -1754,7 +1851,7 @@
         <translation type="unfinished">Нешто лоше се десило</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished">_Узми звук из видео датотеке:</translation>
     </message>
@@ -1858,8 +1955,8 @@
         <translation type="unfinished">Сачувано %d слика.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -1913,12 +2010,12 @@
         <translation type="unfinished">Средње</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation type="unfinished">Појачај</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-8"/>
         <source>DRC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1933,13 +2030,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1969,6 +2066,7 @@
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2063,7 +2161,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2078,22 +2176,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2103,22 +2201,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>OpenGL (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
@@ -2129,7 +2212,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+7"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2139,7 +2222,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2149,24 +2242,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2176,7 +2272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2289,6 +2385,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2319,6 +2425,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
@@ -2390,6 +2501,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2424,6 +2545,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2449,8 +2610,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2528,7 +2689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2553,8 +2714,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2574,14 +2735,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2592,7 +2753,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2623,7 +2784,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Упс...</translation>
     </message>
@@ -2633,7 +2794,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Проблеми при покретању звучне картице</translation>
     </message>
@@ -2755,13 +2916,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2783,20 +2944,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2824,17 +2985,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Нађи сам</translation>
     </message>
@@ -3110,6 +3273,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3189,6 +3357,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3214,7 +3387,7 @@
         <translation type="unfinished">Грешка у меморији</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3321,7 +3494,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3369,6 +3542,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3397,6 +3619,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3443,6 +3722,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3549,6 +3970,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3580,9 +4109,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3600,35 +4155,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3724,12 +4284,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3797,12 +4352,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3885,6 +4440,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4037,7 +4612,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4093,17 +4668,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4132,6 +4698,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4174,7 +4806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4241,6 +4873,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4398,8 +5090,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished">Контраст</translation>
     </message>
@@ -4409,8 +5101,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4454,12 +5146,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4513,7 +5200,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4523,7 +5210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4535,12 +5222,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4560,25 +5248,25 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4588,17 +5276,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4644,7 +5332,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4663,6 +5351,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4754,6 +5478,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4838,6 +5678,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4853,25 +5706,35 @@
         <translation type="unfinished">Kодирање...</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+247"/>
+        <location line="+24"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Ништа</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished">Непознато</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4945,17 +5808,17 @@
         <translation type="unfinished">0 kB/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Угаси рачунар након завршеног посла</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation type="unfinished">Приоритет:</translation>
     </message>
@@ -4985,7 +5848,7 @@
         <translation type="unfinished">Ниско</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Пауза / Прекид</translation>
     </message>
@@ -4995,17 +5858,17 @@
         <translation type="unfinished">Напредније</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+15"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+183"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5028,7 +5891,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5047,17 +5910,17 @@
         <translation type="unfinished">Осветљеност</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+122"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5081,11 +5944,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5106,9 +5964,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5354,7 +6701,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">Подразумевано</translation>
     </message>
@@ -5425,7 +6772,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5557,7 +6904,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5608,7 +6955,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6062,7 +7409,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6115,12 +7462,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6158,7 +7505,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6179,9 +7526,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6273,6 +7683,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6762,16 +8344,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6781,7 +8358,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6805,6 +8382,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6857,8 +8510,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Потпуно</translation>
     </message>
@@ -6875,8 +8528,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Промена _учестаности кадрова:</translation>
     </message>
@@ -7052,12 +8705,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">_Квантизер:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7067,8 +8720,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7224,7 +8877,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Битски проток:</translation>
     </message>
@@ -7390,6 +9043,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7416,6 +9125,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished">Преплитање</translation>
     </message>
@@ -7483,12 +9197,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7594,7 +9308,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7958,12 +9672,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Проблем при читању SVQ3 заглавља</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7971,7 +9686,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">Није подржано</translation>
     </message>
@@ -8006,7 +9721,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8021,6 +9736,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8151,7 +9871,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">Звук</translation>
     </message>
@@ -8176,7 +9896,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8261,7 +9986,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8292,22 +10017,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8317,7 +10037,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8325,22 +10045,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Грешка</translation>
     </message>
@@ -8449,9 +10169,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Неисправно заглавље</translation>
     </message>
@@ -8464,7 +10184,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8533,18 +10253,35 @@
         <translation type="unfinished">Видео</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation type="unfinished">Учестаност кадрова:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation type="unfinished">Укупно трајање:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Размера:</translation>
     </message>
@@ -8559,7 +10296,27 @@
         <translation type="unfinished">Кодек 4CC:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished">Звук</translation>
     </message>
@@ -8589,31 +10346,7 @@
         <translation type="unfinished">Кодек:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>ExtraDataSize:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8645,7 +10378,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8666,7 +10399,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8681,7 +10414,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8706,22 +10439,22 @@
         <translation type="unfinished">Администраторска овлашћења су потребна за извршавање ове операције.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8759,12 +10492,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8774,12 +10507,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8814,6 +10552,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8844,23 +10592,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8918,7 +10676,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9018,28 +10776,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished">Половично</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Поставке</translation>
     </message>
@@ -9049,22 +10808,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9082,7 +10882,7 @@
         <translation type="unfinished">Непознато</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9109,8 +10909,23 @@
         <source>Yes</source>
         <translation type="unfinished">Да</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9130,94 +10945,23 @@
         <translation type="unfinished">Стерео</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9292,6 +11036,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9312,7 +11113,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9373,7 +11174,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Режим:</translation>
     </message>
@@ -9383,7 +11184,7 @@
         <translation type="unfinished">_Нова учестаност кадрова:</translation>
     </message>
     <message>
-        <location line="-323"/>
+        <location line="-400"/>
         <source>Custom</source>
         <translation type="unfinished">Произвољно</translation>
     </message>
@@ -9413,7 +11214,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9423,7 +11224,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9431,12 +11252,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Висина и ширина не могу бити непарни бројеви</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9476,7 +11297,7 @@
         <translation type="unfinished">200%</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation type="unfinished">Би-линеарни</translation>
     </message>
@@ -9486,7 +11307,7 @@
         <translation type="unfinished">Би-квадратни</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9562,7 +11383,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9576,12 +11407,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">Ротирај</translation>
     </message>
@@ -9596,6 +11432,11 @@
         <translation type="unfinished">90 степени</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 степени</translation>
@@ -9606,24 +11447,26 @@
         <translation type="unfinished">270 степени</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished">_Угао:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9639,7 +11482,17 @@
         <translation type="unfinished">Преглед</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9725,17 +11578,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9914,7 +11767,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9932,7 +11785,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9951,7 +11804,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10520,6 +12373,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10545,7 +12480,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10556,17 +12491,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">Произвољно</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10602,7 +12547,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11919,7 +13864,7 @@
         <translation type="unfinished">Произвољно</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12031,7 +13976,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13172,7 +15117,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13339,4 +15284,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Pokušaj da otvorim %s nije uspeo!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,7 +74,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -493,7 +493,7 @@
         <translation type="unfinished">Video koder</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+461"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Bez izmene</translation>
@@ -518,7 +518,7 @@
         <translation type="unfinished">Filteri</translation>
     </message>
     <message>
-        <location line="+660"/>
+        <location line="+708"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -549,7 +549,7 @@
         <translation type="unfinished">Tip kadra:</translation>
     </message>
     <message>
-        <location line="-1278"/>
+        <location line="-1327"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -574,7 +574,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,12 +646,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -670,6 +670,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -679,7 +681,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -709,7 +711,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+74"/>
         <source>Search previous black frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -779,12 +781,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1044"/>
+        <location line="-1092"/>
         <source> (0 tracks)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1007"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+449"/>
         <source>Selection: 000000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,6 +900,16 @@
     </message>
     <message>
         <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
         <source>&amp;Audio Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1051,7 +1073,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1071,7 +1093,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Dozvoli nestandardne učestanosti zvuka za DVD</translation>
     </message>
@@ -1146,7 +1168,27 @@
         <translation type="unfinished">Omogući SSSE3</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation type="unfinished">lavc _niti:</translation>
     </message>
@@ -1188,7 +1230,7 @@
         <translation type="unfinished">Nisko</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation type="unfinished">Prioritet _kodiranja:</translation>
     </message>
@@ -1213,7 +1255,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1228,22 +1275,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>XVideo (best)</source>
-        <translation type="unfinished">XVideo (najbolje)</translation>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>DXVA2 (best)</source>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>SDL (good)</source>
-        <translation type="unfinished">SDL (dobro)</translation>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XVideo (best)</source>
+        <translation type="obsolete">XVideo (najbolje)</translation>
+    </message>
+    <message>
+        <source>SDL (good)</source>
+        <translation type="obsolete">SDL (dobro)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation type="unfinished">Video _ekran:</translation>
     </message>
@@ -1316,7 +1412,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
         <source>_Horizontal deblocking</source>
         <translation type="unfinished">_Horizontalno uklanjanje blokova</translation>
     </message>
@@ -1342,17 +1438,17 @@
         <translation type="unfinished">_Jačina :</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Default Postprocessing</source>
         <translation type="unfinished">Podrazumevana naknadna obrada</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation type="unfinished">Korisničko okruženje</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation type="unfinished">Izlaz</translation>
     </message>
@@ -1367,13 +1463,13 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation type="unfinished">Zvuk</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1381,7 +1477,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+38"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+108"/>
         <source>CPU</source>
         <translation type="unfinished">Procesori</translation>
     </message>
@@ -1391,8 +1487,7 @@
         <translation type="unfinished">Više niti</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+3"/>
+        <location line="+18"/>
         <source>Preferences</source>
         <translation type="unfinished">Postavke</translation>
     </message>
@@ -1402,7 +1497,7 @@
         <translation type="unfinished">Bez izmene</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+30"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation type="unfinished">Filteri</translation>
@@ -1490,7 +1585,7 @@
         <translation type="unfinished">Dolby Pro Logic II</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>_Gain mode:</source>
         <translation type="unfinished">_režim pojačavanja:</translation>
     </message>
@@ -1505,7 +1600,7 @@
         <translation type="unfinished">_Mikseta:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation type="unfinished">Zvučni filteri</translation>
     </message>
@@ -1516,11 +1611,13 @@
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation type="unfinished">SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished">XVideo</translation>
     </message>
@@ -1571,7 +1668,7 @@
         <translation type="unfinished">Nije kodirano u ovoj verziji</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
@@ -1590,7 +1687,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation type="unfinished">Da li si siguran?</translation>
     </message>
@@ -1655,7 +1752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation type="unfinished">Greška sa dozvolama</translation>
     </message>
@@ -1707,19 +1804,19 @@
         <translation type="unfinished">Nešto nije uspelo prilikom dodavanja</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation type="unfinished">Nešto loše se desilo (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation type="unfinished">Proveravam video</translation>
     </message>
@@ -1754,7 +1851,7 @@
         <translation type="unfinished">Nešto loše se desilo</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation type="unfinished">_Uzmi zvuk iz video datoteke:</translation>
     </message>
@@ -1858,8 +1955,8 @@
         <translation type="unfinished">Sačuvano %d slika.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -1913,12 +2010,12 @@
         <translation type="unfinished">Srednje</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation type="unfinished">Pojačaj</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-8"/>
         <source>DRC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1933,13 +2030,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
+        <source>Remix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1969,6 +2066,7 @@
     </message>
     <message>
         <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2063,7 +2161,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+220"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2078,22 +2176,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+107"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2103,22 +2201,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>VDPAU (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>OpenGL (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>LIBVA (best)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation type="unfinished"></translation>
@@ -2129,7 +2212,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+7"/>
         <source>System language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2139,7 +2222,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2149,24 +2242,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2176,7 +2272,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2289,6 +2385,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2319,6 +2425,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
@@ -2390,6 +2501,16 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Previous Black Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2424,6 +2545,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation type="unfinished"></translation>
@@ -2449,8 +2610,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation type="unfinished"></translation>
@@ -2528,7 +2689,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2553,8 +2714,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2574,14 +2735,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation type="unfinished"></translation>
@@ -2592,7 +2753,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation type="unfinished"></translation>
@@ -2623,7 +2784,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+300"/>
         <source>Oops</source>
         <translation type="unfinished">Ups...</translation>
     </message>
@@ -2633,7 +2794,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation type="unfinished">Problemi pri pokretanju zvučne kartice</translation>
     </message>
@@ -2755,13 +2916,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2783,20 +2944,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2824,17 +2985,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation type="unfinished">Nađi sam</translation>
     </message>
@@ -3110,6 +3273,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3189,6 +3357,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation type="unfinished"></translation>
@@ -3214,7 +3387,7 @@
         <translation type="unfinished">Greška u memoriji</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3321,7 +3494,7 @@
         <translation type="unfinished">1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3369,6 +3542,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3397,6 +3619,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3443,6 +3722,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3549,6 +3970,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3580,9 +4109,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3600,35 +4155,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3724,12 +4284,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-96"/>
         <source>Adaptive strength</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3797,12 +4352,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3885,6 +4440,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4037,7 +4612,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4093,17 +4668,8 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
-        <source>BlackFrame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>This function is unsupported at the moment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4132,6 +4698,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4174,7 +4806,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4241,6 +4873,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4398,8 +5090,8 @@
     <name>contrast</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.cpp" line="+33"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation type="unfinished">Kontrast</translation>
     </message>
@@ -4409,8 +5101,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4454,12 +5146,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4513,7 +5200,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4523,7 +5210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation type="unfinished"></translation>
@@ -4535,12 +5222,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4560,25 +5248,25 @@
     </message>
     <message>
         <location line="+38"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4588,17 +5276,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4644,7 +5332,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4663,6 +5351,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+74"/>
@@ -4754,6 +5478,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4838,6 +5678,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4853,25 +5706,35 @@
         <translation type="unfinished">Kodiranje...</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <location line="+247"/>
+        <location line="+24"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation type="unfinished">Ništa</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation type="unfinished">Nepoznato</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-205"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+144"/>
         <source>Audio Codec:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4945,17 +5808,17 @@
         <translation type="unfinished">0 kB/s</translation>
     </message>
     <message>
-        <location line="-396"/>
+        <location line="-444"/>
         <source>Shut down computer when finished</source>
         <translation type="unfinished">Ugasi računar nakon završenog posla</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-11"/>
         <source>Time Remaining:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+31"/>
         <source>Priority:</source>
         <translation type="unfinished">Prioritet:</translation>
     </message>
@@ -4985,7 +5848,7 @@
         <translation type="unfinished">Nisko</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+117"/>
         <source>Pause / Abort</source>
         <translation type="unfinished">Pauza / Prekid</translation>
     </message>
@@ -4995,17 +5858,17 @@
         <translation type="unfinished">Naprednije</translation>
     </message>
     <message>
-        <location line="-199"/>
+        <location line="-231"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+15"/>
         <source>Phase:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+183"/>
         <source>Minimize to Tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5028,7 +5891,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5047,17 +5910,17 @@
         <translation type="unfinished">Osvetljenost</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+129"/>
+        <location line="+122"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5081,11 +5944,6 @@
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-162"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5106,9 +5964,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation type="unfinished"></translation>
@@ -5354,7 +6701,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+257"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+270"/>
         <source>Default</source>
         <translation type="unfinished">Podrazumevano</translation>
     </message>
@@ -5425,7 +6772,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5557,7 +6904,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+187"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+198"/>
         <source>H.263</source>
         <translation type="unfinished">H.263</translation>
     </message>
@@ -5608,7 +6955,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6062,7 +7409,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6115,12 +7462,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6158,7 +7505,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6179,9 +7526,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6273,6 +7683,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6762,16 +8344,11 @@
         <source>Saturation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6781,7 +8358,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6805,6 +8382,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -6857,8 +8510,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation type="unfinished">Potpuno</translation>
     </message>
@@ -6875,8 +8528,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation type="unfinished">Promena _učestanosti kadrova:</translation>
     </message>
@@ -7052,12 +8705,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation type="unfinished">_Kvantizer:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7067,8 +8720,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>_ColorSpace:</source>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7224,7 +8877,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation type="unfinished">_Bitski protok:</translation>
     </message>
@@ -7390,6 +9043,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7416,6 +9125,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation type="unfinished">Preplitanje</translation>
     </message>
@@ -7483,12 +9197,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7594,7 +9308,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7958,12 +9672,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation type="unfinished">Problem pri čitanju SVQ3 zaglavlja</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7971,7 +9686,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation type="unfinished">Nije podržano</translation>
     </message>
@@ -8006,7 +9721,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8021,6 +9736,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation type="unfinished"></translation>
@@ -8151,7 +9871,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation type="unfinished">Zvuk</translation>
     </message>
@@ -8176,7 +9896,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8261,7 +9986,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8292,22 +10017,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8317,7 +10037,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8325,22 +10045,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation type="unfinished">Greška</translation>
     </message>
@@ -8449,9 +10169,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation type="unfinished">Neispravno zaglavlje</translation>
     </message>
@@ -8464,7 +10184,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8533,18 +10253,35 @@
         <translation type="unfinished">Video</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation type="unfinished">Učestanost kadrova:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation type="unfinished">Ukupno trajanje:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation type="unfinished">Razmera:</translation>
     </message>
@@ -8559,7 +10296,27 @@
         <translation type="unfinished">Kodek 4CC:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation type="unfinished">Zvuk</translation>
     </message>
@@ -8589,31 +10346,7 @@
         <translation type="unfinished">Kodek:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>ExtraDataSize:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+123"/>
+        <location line="+12"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8645,7 +10378,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8666,7 +10399,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8681,7 +10414,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8706,22 +10439,22 @@
         <translation type="unfinished">Administratorska ovlašćenja su potrebna za izvršavanje ove operacije.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
+        <location line="+7"/>
+        <source>Second Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8759,12 +10492,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8774,12 +10507,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8814,6 +10552,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation type="unfinished"></translation>
@@ -8844,23 +10592,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8918,7 +10676,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9018,28 +10776,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation type="unfinished">Polovično</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation type="unfinished">Postavke</translation>
     </message>
@@ -9049,22 +10808,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Move down</source>
+        <location line="-405"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9082,7 +10882,7 @@
         <translation type="unfinished">Nepoznato</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9109,8 +10909,23 @@
         <source>Yes</source>
         <translation type="unfinished">Da</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9130,94 +10945,23 @@
         <translation type="unfinished">Stereo</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Codec 4CC:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Image Size:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Aspect Ratio:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Frame Rate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <location line="+33"/>
-        <source>Total Duration:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <source>Extra Video Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>ExtraDataSize:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Extra data:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Codec:		</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Channels:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Bitrate:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Frequency:	</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+152"/>
         <source>No Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-170"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-120"/>
         <source>%s (%u:%u)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9292,6 +11036,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9312,7 +11113,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9373,7 +11174,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation type="unfinished">_Režim:</translation>
     </message>
@@ -9383,7 +11184,7 @@
         <translation type="unfinished">_Nova učestanost kadrova:</translation>
     </message>
     <message>
-        <location line="-323"/>
+        <location line="-400"/>
         <source>Custom</source>
         <translation type="unfinished">Proizvoljno</translation>
     </message>
@@ -9413,7 +11214,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9423,7 +11224,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Resample fps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9431,12 +11252,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation type="unfinished">Visina i širina ne mogu biti neparni brojevi</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9476,7 +11297,7 @@
         <translation type="unfinished">200%</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation type="unfinished">Bi-linearni</translation>
     </message>
@@ -9486,7 +11307,7 @@
         <translation type="unfinished">Bi-kvadratni</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9562,7 +11383,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9576,12 +11407,17 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation type="unfinished">Rotiraj</translation>
     </message>
@@ -9596,6 +11432,11 @@
         <translation type="unfinished">90 stepeni</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation type="unfinished">180 stepeni</translation>
@@ -9606,24 +11447,26 @@
         <translation type="unfinished">270 stepeni</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation type="unfinished">_Ugao:</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>90°</source>
-        <translation type="unfinished">90°</translation>
+        <translation type="obsolete">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation type="unfinished">180°</translation>
+        <translation type="obsolete">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation type="unfinished">270°</translation>
+        <translation type="obsolete">270°</translation>
     </message>
     <message>
         <location line="-158"/>
@@ -9639,7 +11482,17 @@
         <translation type="unfinished">Pregled</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9725,17 +11578,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9914,7 +11767,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9932,7 +11785,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9951,7 +11804,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation type="unfinished"></translation>
@@ -10520,6 +12373,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>workingDialog</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/working.ui" line="+14"/>
@@ -10545,7 +12480,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10556,17 +12491,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation type="unfinished">Proizvoljno</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10602,7 +12547,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -11919,7 +13864,7 @@
         <translation type="unfinished">Proizvoljno</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12031,7 +13976,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13172,7 +15117,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13339,4 +15284,167 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+461"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+469"/>
         <source>Attempt to open %s failed!</source>
         <translation>%s açma girişimi başarısız oldu!</translation>
     </message>
@@ -14,7 +14,7 @@
         <translation>%s için bir demuxer bulunamıyor</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+66"/>
         <source>width</source>
         <translation>genişlik</translation>
     </message>
@@ -79,7 +79,7 @@
         <translation>Desteklenmeyen boyut</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Zaman damgalarının geçerli olup olmadığını kontrol ediliyor ..</translation>
     </message>
@@ -89,12 +89,12 @@
         <translation>Bu videoda B kareleri var, ancak sunum zaman damgaları (PTS) eksik veya monoton olarak artıyor. Avidemux, tüm videonun kodunu çözerek doğru PTS&apos;yi yeniden oluşturmayı deneyebilir. Bu çok zaman alabilir. Devam edilsin mi?</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation>Video kodu çözülüyor ...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -499,7 +499,7 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+475"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+476"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Kopya</translation>
@@ -524,12 +524,12 @@
         <translation>&amp;Shift:</translation>
     </message>
     <message>
-        <location line="+614"/>
+        <location line="+662"/>
         <source>Time:</source>
         <translation>Zaman:</translation>
     </message>
     <message>
-        <location line="-1208"/>
+        <location line="-1257"/>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</translation>
     </message>
@@ -539,7 +539,7 @@
         <translation>Vi&amp;deo</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;Audio</source>
         <translation>&amp;Ses</translation>
     </message>
@@ -554,7 +554,7 @@
         <translation>&amp;Araçlar</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>&amp;Edit</source>
         <translation>&amp;Düzenle</translation>
     </message>
@@ -564,7 +564,7 @@
         <translation>&amp;Görünüm</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>&amp;Custom</source>
         <translation>&amp;Özel</translation>
     </message>
@@ -579,7 +579,17 @@
         <translation> (0 parçalar)</translation>
     </message>
     <message>
-        <location line="+1204"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation>Önceki kesme noktasına git [SHIFT+AŞAĞI]</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation>Sonraki kesme noktasına git [SHIFT+YUKARI]</translation>
+    </message>
+    <message>
+        <location line="+646"/>
         <source>&amp;Open...</source>
         <translation>&amp;Açılıyor...</translation>
     </message>
@@ -632,7 +642,17 @@
         <translation>&amp;Çıktı</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+67"/>
+        <source>&amp;Toolbar</source>
+        <translation>&amp;Araç çubuğu</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation>Ctrl+Alt+B</translation>
+    </message>
+    <message>
+        <location line="+50"/>
         <source>Si&amp;de</source>
         <translation>Y&amp;an</translation>
     </message>
@@ -642,22 +662,22 @@
         <translation>&amp;Üst</translation>
     </message>
     <message>
-        <location line="-1703"/>
+        <location line="-1765"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;Video Kod Çözücü&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1138"/>
+        <location line="+1186"/>
         <source>Frame type:</source>
         <translation>Çerçeve tipi:</translation>
     </message>
     <message>
-        <location line="+553"/>
+        <location line="+567"/>
         <source>&amp;Separate</source>
         <translation>&amp;Ayrı</translation>
     </message>
     <message>
-        <location line="-1926"/>
+        <location line="-1989"/>
         <source>Avidemux</source>
         <translation>Avidemux</translation>
     </message>
@@ -667,7 +687,7 @@
         <translation>&amp;Araç çubukları</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>&amp;Auto</source>
         <translation>&amp;Oto</translation>
     </message>
@@ -709,12 +729,12 @@
     </message>
     <message>
         <location line="+126"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Gezinme</translation>
     </message>
     <message>
-        <location line="-912"/>
+        <location line="-960"/>
         <source>Play [SPACE]</source>
         <translation>Oynat [BOŞLUK]</translation>
     </message>
@@ -733,6 +753,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -742,7 +764,7 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-683"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>Önceki kareye git [SOL]</translation>
     </message>
@@ -772,17 +794,7 @@
         <translation>Bitiş işaretleyicisini ayarla [CTRL+SAYFA AŞAĞI]</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Search previous black frame</source>
-        <translation>Önceki siyah karede ara</translation>
-    </message>
-    <message>
-        <location line="+23"/>
-        <source>Search next black frame</source>
-        <translation>Sonraki siyah karede ara</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+120"/>
         <source>Go to first frame [HOME]</source>
         <translation>İlk kareye git [EV]</translation>
     </message>
@@ -913,7 +925,7 @@
         <translation>Ctrl+Alt+V</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Ses Ölçer</translation>
     </message>
@@ -923,6 +935,16 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
+        <location line="-801"/>
+        <source>Search previous black frame</source>
+        <translation>Önceki siyah karede ara</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Search next black frame</source>
+        <translation>Sonraki siyah karede ara</translation>
+    </message>
+    <message>
         <source>&amp;Calculator...</source>
         <translation type="vanished">&amp;Hesaplanıyor...</translation>
     </message>
@@ -1074,7 +1096,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+234"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+598"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>DXVA2 kullanarak video kodunu çözme (Windows)</translation>
     </message>
@@ -1094,7 +1116,7 @@
         <translation>Hw kod çözmeyi etkinleştirmek, çoklu iş parçacığını devre dışı bırakır, değişiklikleri uygulamak için uygulamayı yeniden başlatın</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-350"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>DVD için standart olmayan ses frekansını kabul edin</translation>
     </message>
@@ -1164,7 +1186,27 @@
         <translation>SSSE3&apos;ü etkinleştir</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+1"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
         <source>_lavc threads:</source>
         <translation>_Lavc İş Parçacığı:</translation>
     </message>
@@ -1206,7 +1248,7 @@
         <translation>Düşük</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>_Encoding priority:</source>
         <translation>_ Kodlama önceliği:</translation>
     </message>
@@ -1231,7 +1273,12 @@
         <translation>_Kaydedilmek için son okunan dosyanın dizinine varsayılan</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
+        <source>De_lete first pass log files by default</source>
+        <translation>Va_rsayılan olarak ilk geçiş günlük dosyalarını sil</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation>Otomatik Ekleme Ayarları</translation>
     </message>
@@ -1246,22 +1293,75 @@
         <translation>_Parça boyutu:</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation>_Paylaşılan önbelleği kullan</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>XVideo (best)</source>
-        <translation>XVideo (en iyi)</translation>
+        <translation type="vanished">XVideo (en iyi)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (en iyi)</translation>
+        <translation type="vanished">DXVA2 (en iyi)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>SDL (good)</source>
-        <translation>SDL (iyi)</translation>
+        <translation type="vanished">SDL (iyi)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Video _display:</source>
         <translation>Video_görüntüleme:</translation>
     </message>
@@ -1318,7 +1418,7 @@
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+17"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+80"/>
         <source>_Horizontal deblocking</source>
         <translation>_Yatay engelleme</translation>
     </message>
@@ -1334,17 +1434,17 @@
         <translation>Görüntü_ayrıştırma (ffmpegdeint)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>Default Postprocessing</source>
         <translation>Varsayılan Rötuş</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-33"/>
         <source>User Interface</source>
         <translation>Kullanıcı arayüzü</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+10"/>
         <source>Output</source>
         <translation>Çıktı</translation>
     </message>
@@ -1359,36 +1459,35 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Ses</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-239"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-241"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+42"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+112"/>
         <source>Threading</source>
         <translation>İş parçası</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+84"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+86"/>
         <source>Pr&amp;eferences</source>
         <translation>Te&amp;rcihler</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+11"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
         <source>Preferences</source>
         <translation>Tercihler</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-37"/>
         <source>Connect to avsproxy</source>
         <translation>Avsproxy&apos;ye bağlan</translation>
     </message>
@@ -1408,7 +1507,7 @@
         <translation>İşaretçi B&apos;yi ayarla</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+21"/>
         <location line="+9"/>
         <source>Filters</source>
         <translation>Filtreler</translation>
@@ -1429,7 +1528,7 @@
         <translation>Sonraki İç Çerçeve</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>Previous Black Frame</source>
         <translation>Önceki Siyah Çerçeve</translation>
     </message>
@@ -1476,7 +1575,7 @@
         <translation>5 kanallı</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>_Gain mode:</source>
         <translation>_Kazanç modu:</translation>
     </message>
@@ -1491,7 +1590,7 @@
         <translation>_Karıştırıcı:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation>Ses Filtreleri</translation>
     </message>
@@ -1537,7 +1636,7 @@
         <translation>Bu sürümde kodlanmamış</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+243"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Bu video, anahtar kareler olarak IDR yerine IDR olmayan kurtarma noktaları kullanıyor. Video akışındaki resim yeniden sıralama bilgileri IDR olmayan karelerde sıfırlanmaz. Yapıştırılan seçimin kesme noktaları, kopyalama modunda kaydedildiyse çerçevelerin ters görüntülenme sırası nedeniyle oynatma kesintisine neden olabilir.
@@ -1560,7 +1659,7 @@
 Yine de dene?</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+79"/>
         <source>Are you sure?</source>
         <translation>Emin misiniz?</translation>
     </message>
@@ -1635,7 +1734,7 @@
 Yine de devam edilsin mi?</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+117"/>
         <source>Permission error</source>
         <translation>İzin Hatası</translation>
     </message>
@@ -1687,12 +1786,12 @@
         <translation>Eklerken bir şey başarısız oldu</translation>
     </message>
     <message>
-        <location line="+320"/>
+        <location line="+319"/>
         <source>Something bad happened (II)</source>
         <translation>Kötü bir şey oldu (II)</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-201"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -1700,7 +1799,7 @@
 Sorunlar bekliyoruz.</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+102"/>
         <source>Checking video</source>
         <translation>Video kontrol ediliyor</translation>
     </message>
@@ -1735,7 +1834,7 @@
         <translation>Kötü bir şey oldu</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+108"/>
         <source>_Track from video:</source>
         <translation>_Videodan izleme:</translation>
     </message>
@@ -1829,8 +1928,8 @@
         <translation>%d resimi kaydedildi.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
@@ -1899,12 +1998,12 @@
         <translation>Geniş Arama</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-25"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
         <source>Gain</source>
         <translation>Kazanç</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-29"/>
         <source>Film to PAL</source>
         <translation>Film to PAL</translation>
     </message>
@@ -1964,14 +2063,14 @@
         <translation>Manuel (dB)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>_Maximum value:</source>
         <translation>_Azami değer:</translation>
     </message>
     <message>
         <location line="+11"/>
-        <source>Remix:</source>
-        <translation>Remix:</translation>
+        <source>Remix</source>
+        <translation>Remix</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2005,16 +2104,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -2030,7 +2132,7 @@
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation>İŞLEMCİ</translation>
     </message>
@@ -2120,7 +2222,7 @@
         <translation>_Halka azaltma</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-285"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-29"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>VDPAU (NVIDIA) kullanarak video kodunu çözme</translation>
     </message>
@@ -2135,17 +2237,17 @@
         <translation>VideoToolbox (macOS) kullanarak video kodunu çözme</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-38"/>
         <source>Enable openGl support</source>
         <translation>OpenGl desteğini etkinleştir</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="+44"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>Hw kod çözme kullanıyorsanız, eşleşen ekran sürücüsünü kullanmak daha iyidir</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-343"/>
         <source>_Check for new release</source>
         <translation>_Yeni sürüm olup olmadığını kontrol edin</translation>
     </message>
@@ -2155,7 +2257,7 @@
         <translation>SIMD</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+104"/>
         <source>Caching of decoded pictures</source>
         <translation>Çözülmüş resimlerin önbelleğe alınması</translation>
     </message>
@@ -2165,22 +2267,19 @@
         <translation>_Önbellek boyutu:</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (en iyi)</translation>
+        <translation type="vanished">VDPAU (en iyi)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (en iyi)</translation>
+        <translation type="vanished">OpenGL (en iyi)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (en iyi)</translation>
+        <translation type="vanished">LIBVA (en iyi)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+46"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation>Sdl sürücüsü</translation>
@@ -2207,7 +2306,7 @@
         <translation>_SesAygıtı</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+68"/>
         <source>De_ringing</source>
         <translation>Ça_lıyor</translation>
     </message>
@@ -2217,7 +2316,7 @@
         <translation>_Sertlik:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-62"/>
         <source>System language</source>
         <translation>Sistem dili</translation>
     </message>
@@ -2227,7 +2326,17 @@
         <translation>_Dil</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+12"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Yenileme Hızını Sınırla</translation>
     </message>
@@ -2237,24 +2346,27 @@
         <translation>Yenileme Hızı Sınırı (ms)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+4"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>GUI Rendering Options</source>
         <translation>GUI Oluşturma Seçenekleri</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+21"/>
         <source>Display</source>
         <translation>Görüntüleme</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location line="+35"/>
         <source>HW Accel</source>
         <translation>HW Hızlandırıcısı</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-262"/>
         <source>_Always ask which port to use</source>
         <translation>_Her zaman hangi bağlantı noktasını kullanacağınızı sor</translation>
     </message>
@@ -2264,7 +2376,7 @@
         <translation>Kullanılacak varsayılan bağlantı noktası</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-100"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-105"/>
         <source>Open</source>
         <translation>Aç</translation>
     </message>
@@ -2362,6 +2474,16 @@
     </message>
     <message>
         <location line="+5"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Reset Markers</source>
         <translation>İşaretleyicileri Sıfırla</translation>
     </message>
@@ -2387,6 +2509,11 @@
         <translation>Varsayılan Rötuş</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Play filtered</source>
         <translation>Filtrelenmiş oynat</translation>
@@ -2442,7 +2569,17 @@
         <translation>Sonraki Kare</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+3"/>
+        <source>Previous Cut Point</source>
+        <translation>Önceki Kesim Noktası</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation>Sonraki Kesim Noktası</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>First Frame</source>
         <translation>İlk Kare</translation>
     </message>
@@ -2467,6 +2604,46 @@
         <translation>Zamana Git</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Yaklaştır 1:4</translation>
@@ -2492,8 +2669,8 @@
         <translation>Pencereye sığdır</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Videonun * tamamını * kaldıramazsınız
@@ -2578,7 +2755,7 @@
 PSP uyumlu video oluşturmak gerekir.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1478"/>
+        <location filename="../../common/gui_main.cpp" line="-1527"/>
         <source>Select script/project to run</source>
         <translation>Çalıştırılacak komut dosyasını/projeyi seçin</translation>
     </message>
@@ -2603,8 +2780,8 @@
         <translation>Son kullanılan dosyaların ve projelerin listesini silmek üzeresiniz. Bu geri alınamaz. İlerlemek?</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+73"/>
+        <location line="+125"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Video Dosyası Seçin ...</translation>
     </message>
@@ -2624,7 +2801,7 @@
         <translation>Eklenecek Video Dosyasını Seçin ...</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+147"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2633,7 +2810,7 @@
 Yine de devam edilsin mi?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+143"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Kesme</translation>
@@ -2644,7 +2821,7 @@
         <translation>Keserken hata.</translation>
     </message>
     <message>
-        <location line="+799"/>
+        <location line="+822"/>
         <location line="+7"/>
         <source>Invalid audio index given</source>
         <translation>Geçersiz ses dizini verildi</translation>
@@ -2685,7 +2862,7 @@
         <translation>avsproxy</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+151"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -2695,7 +2872,7 @@
         <translation>Bu işlev devre dışı veya artık geçerli değil</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Ses cihazını başlatma sorunu</translation>
     </message>
@@ -2818,14 +2995,14 @@
         <translation>%s işi eklenemiyor</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-210"/>
+        <location filename="../../common/gui_savenew.cpp" line="-212"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Önceki ilk geçiş verileri yeniden kullanılsın mı?
 Uyarı, ayarların yakın olması gerekir.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+184"/>
         <source>Cannot instantiate video chain</source>
         <translation>Video zinciri başlatılamıyor</translation>
     </message>
@@ -2849,20 +3026,20 @@
 Yine de devam etmek istiyor musun ?</translation>
     </message>
     <message>
-        <location line="-257"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location line="-259"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Çoklayıcı</translation>
     </message>
     <message>
-        <location line="-326"/>
+        <location line="-327"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation>İlk geçiş için kodlayıcı kurulamıyor. Kodlayıcıya sağlanan konfigürasyon uyumsuz olabilir veya kodlayıcı bu sistemde bulunmayan özelliklere bağlı olabilir.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location line="+290"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Çoklayıcı somutlaştırılamıyor</translation>
     </message>
@@ -2893,17 +3070,19 @@
 Yine de denemek ister misiniz?</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <source>Cannot open </source>
         <translation>Açılamaz </translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+175"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="-2"/>
         <source>Disabled</source>
         <translation>Devre dışı</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+1"/>
         <source>Auto-detect</source>
         <translation>Otomatik-algıla</translation>
     </message>
@@ -3164,6 +3343,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation>WMA Kayıpsız</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -3243,6 +3427,11 @@
         <translation>8-bit PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+3"/>
         <source>Unknown codec</source>
         <translation>Bilinmeyen kodek</translation>
@@ -3268,7 +3457,7 @@
         <translation>Bellek hatası</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+510"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+512"/>
         <source>Saving</source>
         <translation>Kaydedildi</translation>
     </message>
@@ -3381,7 +3570,7 @@
         <translation>1:1</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -3466,6 +3655,55 @@
 Bir kareyi düşürmek videoda bozulmaya neden olabilir.
 Yine de devam edilsin mi?</translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3494,6 +3732,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation>Çözümleyici</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation>Boş filtre. Önizlemede Vektörskop, Dalga Biçimi kapsamları ve Histogramlar.</translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation>Çözümleyici</translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation>Karikatür</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation>Frei0r&apos;dan taşındı.</translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation>Karikatür</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation>Eşik</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation>Saçılma</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation>Renk seviyesi</translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3540,6 +3835,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation>Renk Tutma</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation>Tutulmuş renk(ler) ile tek renkli efekt.</translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation>Renk Tutma</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation>Üçüncül</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation>İkincil</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation>Birincil</translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation>Mesafe</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation>Kesme eğimi</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation>Renkleri Topla</translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation>Renk Anahtarı</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation>&quot;Yeşil ekranı&quot; bir resimle değiştirin.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation>Arka Plan Resmi Seç</translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation>Renk Anahtarı</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation>Birincil</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation>Üçüncül</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation>İkincil</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation>Kesme eğimi</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation>Renkleri Topla</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation>Görüntü Seç</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation>Kalibrasyon arka planını göster</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation>Dökülme kontrolü yok</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation>Ağırlıklı alfa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation>AVG alfa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation>RMS alfa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation>MIN alfa</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation>Mesafe</translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3646,6 +4083,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation>Dinamik Eşik</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation>Uyarlanabilir luma eşikleme </translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation>Dinamik Eşik</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation>Düzeyler</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation>Ofset</translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation>Izgara</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation>Video duvar efekti.</translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation>Izgara</translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation>Izgara boyutu</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation>Önceki kareleri yuvarla</translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation>Aynala</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation>Yatay veya dikey olarak aynalayın.</translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation>Aynala</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation>Yer değiştirme</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation>Yatay - soldan devam et</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation>Yatay - sağdan devam edin</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation>Dikey - üstte kal</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation>Dikey - altta kal</translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3677,9 +4222,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation>Posterleştir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation>Frei0r&apos;dan taşındı.</translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation>Posterleştir</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation>Düzeyler</translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation>VHS</translation>
     </message>
@@ -3697,35 +4268,40 @@
         <translation>VHS</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation>Luma bant genişliği</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation>Chroma bant genişliği</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation>Senkronizasyon hatası</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation>Kroma için sıfır gecikme filtresi kullanın</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation>Luma için sıfır gecikme filtresi kullanın</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation>Senkronizasyon hata filtresi</translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3832,16 +4408,15 @@
         <translation>Uyarlanabilir engelleme</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation>Tam önizlemeyi göster</translation>
-    </message>
-    <message>
-        <location line="-134"/>
+        <location line="-116"/>
         <source>ASharp</source>
         <translation>Keskin</translation>
     </message>
     <message>
+        <source>Show full preview</source>
+        <translation type="vanished">Tam önizlemeyi göster</translation>
+    </message>
+    <message>
         <source>Strength</source>
         <translation type="vanished">Sertlik</translation>
     </message>
@@ -3887,12 +4462,12 @@
         <translation>Alt_kenar boşluğu:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+12"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-148"/>
         <source>SSA/ASS/SRT</source>
         <translation>SSA/ASS/SRT</translation>
     </message>
@@ -3912,12 +4487,12 @@
         <translation>Bunun bir ASS/SSA dosyası olduğundan emin misiniz?</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Do not adjust</source>
         <translation>Ayarlama yapma</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation>Ekran en boy oranını ayarlayın:</translation>
     </message>
@@ -3997,6 +4572,26 @@
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Çoğullama Biçimi</translation>
     </message>
@@ -4149,7 +4744,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Sınırları Karart</translation>
     </message>
@@ -4205,17 +4800,16 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>Siyah Kare</translation>
+        <translation type="vanished">Siyah Kare</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>This function is unsupported at the moment</source>
-        <translation>Bu işlev şu anda desteklenmiyor</translation>
+        <translation type="vanished">Bu işlev şu anda desteklenmiyor</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Sonraki siyah karede ara.</translation>
     </message>
@@ -4244,6 +4838,72 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation>Bulanıklık</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation>Seçilen alanı bulanıklaştırın.</translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation>Bulanıklık</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation>yarıçap</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation>Sol:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation>Üst:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation>Alt:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation>Sağ:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation>Lastik Bandı &amp;Gizle</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation>Kutu bulanıklığı</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation>Yakın Gauss</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation>Gauss 2 geçişi</translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+40"/>
@@ -4286,7 +4946,7 @@
         <translation>Videoyu fps değiştiriyormuş gibi hızlandırın/yavaşlatın. Bu filtre süreyi değiştirir.</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+155"/>
         <source>Source Fps:</source>
         <translation>Kaynak Fps:</translation>
     </message>
@@ -4353,6 +5013,74 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation>Renk dengesi</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation>Gölge, orta ton ve vurguyu ayarlayın.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation>Renk dengesi</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation>Vurgu</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation>Doygunluk</translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation>Renk kayması</translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation>Gölge</translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation>Orta ton</translation>
+    </message>
+    <message>
+        <source>Peek Ranges</source>
+        <translation type="vanished">AralıklarA Bak</translation>
+    </message>
+    <message>
+        <source>Peek Original</source>
+        <translation type="vanished">Orijinale Bak</translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4515,14 +5243,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Parlaklık</translation>
     </message>
@@ -4566,15 +5294,14 @@
         <translation>RenklendirmeV</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Process</source>
-        <translation>İşleme</translation>
-    </message>
-    <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
+    <message>
+        <source>Process</source>
+        <translation type="vanished">İşleme</translation>
+    </message>
 </context>
 <context>
     <name>convolution</name>
@@ -4624,7 +5351,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Kes</translation>
     </message>
@@ -4634,7 +5361,7 @@
         <translation>Kesme filtresi</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Uyarı Çok fazla kırpma! Genişlik sıfırlandı!
@@ -4648,12 +5375,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Boyut: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation>Otomatik Kesme</translation>
     </message>
@@ -4678,40 +5406,40 @@
     </message>
     <message>
         <location line="-108"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+45"/>
         <source>Right:</source>
         <translation>Sağ:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+67"/>
         <source>Top:</source>
         <translation>Üst:</translation>
     </message>
     <message>
         <location line="+64"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-60"/>
         <source>Bottom:</source>
         <translation>Alt:</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-28"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-14"/>
         <source>Left:</source>
         <translation>Sol:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+113"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+191"/>
         <source>Size: </source>
         <translation>Boyut: </translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>Lastik Bandı &amp;Gizle</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation>Kilitleme</translation>
@@ -4757,7 +5485,7 @@
         <translation>9:16</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation>En Boy Oranını Kilitle:</translation>
     </message>
@@ -4776,6 +5504,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+75"/>
@@ -4867,6 +5631,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation>DelogoHQ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation>Keyfi şekilli logoyu temizleyin.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation>Seçilen görüntü farklı genişlik/yüksekliğe sahip.</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation>Kayıt başarısız!</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation>Önizlemede, logonun açıkça görülebildiği ve arka plana karışmadığı bir çerçeve bulun.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation>Bu kareyi PNG resmi olarak kaydedin.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation>Herhangi bir şeklin logosunun alanını beyaza ve diğer her şeyi düz siyaha boyamak için uygun bir görüntü düzenleyici kullanın.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation>Bu siyah beyaz görüntü, beyaz piksellerin kaldırılacak logoya karşılık geldiği bir maske görevi görecektir.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation>Logonun tamamen şeffaf alanları varsa, bunları siyah yaparak maskeden çıkarmanız önerilir.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation>Maske görüntüsünü yükleyin.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation>Not: Birden çok uzak logoyu (ör. karşıt köşeler) kaldırmak için, her logo için ayrı filtre örnekleri kullanmak çok daha hızlı olacaktır.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation>DelogoHQ nasıl kullanılır</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation>Seçili kareyi kaydet...</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation>Maskeyi yükle</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation>Yükleme başarısız!</translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation>DelogoHQ</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation>Maske</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation>Geçerli kareyi kaydet...</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation>Maskeyi yükle</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation>Rötuş</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation>Bulanıklık</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation>Renk Geçişi</translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+78"/>
@@ -4951,6 +5831,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation>Simüle edilmiş muxing</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation>(Yok)</translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4966,12 +5859,12 @@
         <translation>Kodlanıyor...</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+31"/>
         <source>Phase:</source>
         <translation>Evre:</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+296"/>
         <source>Audio Codec:</source>
         <translation>Ses Kod Çözücü:</translation>
     </message>
@@ -4986,15 +5879,15 @@
         <translation>Video Kod Çözücü:</translation>
     </message>
     <message>
-        <location line="-282"/>
-        <location line="+247"/>
+        <location line="-331"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Hiçbiri</translation>
     </message>
     <message>
-        <location line="-261"/>
-        <location line="+254"/>
+        <location line="-293"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Bilinmeyen</translation>
     </message>
@@ -5016,12 +5909,12 @@
         <translation>0</translation>
     </message>
     <message>
-        <location line="-521"/>
+        <location line="-522"/>
         <source>Time Remaining:</source>
         <translation>Kalan Süre:</translation>
     </message>
     <message>
-        <location line="+349"/>
+        <location line="+350"/>
         <source>Total Size:</source>
         <translation>Toplam Boyut:</translation>
     </message>
@@ -5031,7 +5924,7 @@
         <translation>Video Boyutu:</translation>
     </message>
     <message>
-        <location line="-312"/>
+        <location line="-360"/>
         <source>Shut down computer when finished</source>
         <translation>İşlem bittiğinde bilgisayarı kapat</translation>
     </message>
@@ -5071,7 +5964,17 @@
         <translation>İşlem bittiğinde iletişim kutusunu açık tut</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation>İlk geçiş günlük dosyalarını sil</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation>Çıktı Dosyası:</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>Tepsiye Küçült</translation>
     </message>
@@ -5106,12 +6009,12 @@
         <translation>Kareler/san:</translation>
     </message>
     <message>
-        <location line="-536"/>
+        <location line="-568"/>
         <source>Main</source>
         <translation>Ana</translation>
     </message>
     <message>
-        <location line="+364"/>
+        <location line="+396"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
@@ -5141,7 +6044,7 @@
         <translation>MPlayer eq2</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Sıfırla</translation>
     </message>
@@ -5165,7 +6068,7 @@
         <translation>Parlaklık</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+57"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Gama&lt;/b&gt;</translation>
     </message>
@@ -5195,9 +6098,8 @@
         <translation>Yeşil</translation>
     </message>
     <message>
-        <location line="-162"/>
         <source>Show full preview</source>
-        <translation>Tam önizlemeyi göster</translation>
+        <translation type="vanished">Tam önizlemeyi göster</translation>
     </message>
 </context>
 <context>
@@ -5219,9 +6121,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>Karartma</translation>
@@ -5467,7 +6858,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+290"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+303"/>
         <source>Threading</source>
         <translation>İş parçası</translation>
     </message>
@@ -5533,8 +6924,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>İkili İş Parçacığı)</translation>
+        <source>Two threads</source>
+        <translation>İkili İş Parçacığı</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5670,7 +7061,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+209"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+220"/>
         <source>Threading</source>
         <translation>İş parçası</translation>
     </message>
@@ -5721,8 +7112,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>İkili İş Parçacığı)</translation>
+        <source>Two threads</source>
+        <translation>İkili İş Parçacığı</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6200,7 +7591,7 @@
         <translation>[Uyumsuzluk]</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>Saving mpeg PS (ff)</source>
         <translation>MPEG PS (ff) kaydetme</translation>
     </message>
@@ -6261,12 +7652,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Boş</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Çoğullama Biçimi</translation>
     </message>
@@ -6304,7 +7695,7 @@
 <context>
     <name>fftsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Mpeg TS&apos;yi kaydetme (ff)</translation>
     </message>
@@ -6325,9 +7716,72 @@
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation>Golomb-Rice</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation>Aralık Kodlayıcı</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation>Küçük</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation>Büyük</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation>Kodlayıcı:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation>İçerik:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation>İş Parçacığı:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation>Hata düzeltme/tespit</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation>FFV1 Yapılandırması</translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation>Temel</translation>
     </message>
@@ -6421,6 +7875,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation>Boyuta sığdır</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation>Yeniden boyutlandırın ve belirtilen boyuta getirin.</translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation>Genişlik ve yükseklik tek olamaz</translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation>Boyuta sığdır</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation>Çıktı ayarları</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation>Genişlik:</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation>Yükseklik:</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation>Yuvarlama yok</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation>16&apos;nın En Yakın Katına Yuvarla</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation>En Yakın Çarpana Yuvarla</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation>En Yakın 4&apos;ün Katına Yuvarla</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation>Yeniden Boyutlandırma Yöntemi:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation>İki çizgili</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Bikübik</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation>Lanczos-3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation>Kama</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation>En boy oranı toleransı</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation>% 0</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation>Yüzde</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation>% 100</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation>Dolgu malzemesi</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation>siyah çubuklar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation>yankı</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation>Detaylar</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation>Mevcut giriş boyutları:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation>Yeniden boyutlandırıldı:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation>Gerekli dolgu:</translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation>Çevir</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation>Resmi Dikey/Yatay olarak çevirin.</translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation>Çevir</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation>Yatay çevirme</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation>Dikey çevirme</translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+88"/>
@@ -6936,15 +8562,14 @@
         <translation>Doygunluk</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Show full preview</source>
-        <translation>Tam önizlemeyi göster</translation>
+        <translation type="vanished">Tam önizlemeyi göster</translation>
     </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation>HuffYUV</translation>
     </message>
@@ -6954,7 +8579,7 @@
         <translation>FF HUFFYUV</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
@@ -6978,6 +8603,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation>Görüntü sabitleyici</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation>Kamera titremesini azaltın.</translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation>Görüntü sabitleyici</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation>Düzleme</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation>Çekimi</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation>Aradeğerleme</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation>İki çizgili</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Bikübik</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation>Hareket tahmini</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation>kesin</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation>hızlı</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation>Otomatik Yerçekimi</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation>Sahne eşiği</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation>Yakınlaştırma</translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+16"/>
@@ -7030,8 +8731,8 @@
         <translation>_Yinelenenleri kaldırın:</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+4"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>Full</source>
         <translation>Tam</translation>
     </message>
@@ -7048,8 +8749,8 @@
         <translation>ÇokHızlı</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>_ Kare hızı değişikliği:</translation>
     </message>
@@ -7225,12 +8926,12 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+102"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+99"/>
         <source>_Quantizer:</source>
         <translation>_Niceleştirici:</translation>
     </message>
     <message>
-        <location line="-12"/>
+        <location line="-4"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7240,9 +8941,13 @@
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>_RenkAlanı:</translation>
+        <translation type="vanished">_RenkAlanı:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7397,7 +9102,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>_Bit hızı:</translation>
     </message>
@@ -7571,6 +9276,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation>Luma sabitleyici</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation>Titremeyi azaltın.</translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation>Luma sabitleyici</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation>Filtre uzunluğu</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation>Sahne eşiği</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation>kareler</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation>Renklendirmeyi ayarla</translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation>Hedefi ayarla</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation>Kontrastı tercih et</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation>Parlaklığı tercih et</translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7597,6 +9358,11 @@
     </message>
     <message>
         <location line="+9"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>Interlacing</source>
         <translation>Karıştır</translation>
     </message>
@@ -7664,12 +9430,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+47"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+48"/>
         <source>Matroska Images</source>
         <translation>Matroska Görüntüleri</translation>
     </message>
     <message>
-        <location line="+544"/>
+        <location line="+586"/>
         <source>Matroska clusters</source>
         <translation>Matroska kümeleri</translation>
     </message>
@@ -7776,7 +9542,7 @@
 Yalnızca VP8/VP9/AV1 video ve Vorbis/Opus ses desteklenir</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation>WebM&apos;yi Kaydetme</translation>
     </message>
@@ -8152,12 +9918,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>SVQ3 başlıklarını okumada sorun</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation>Çözme çerçeve tipi</translation>
     </message>
@@ -8165,7 +9932,7 @@
 <context>
     <name>mp4muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+156"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+157"/>
         <source>Unsupported</source>
         <translation>Desteklenmeyen</translation>
     </message>
@@ -8200,7 +9967,7 @@
         <translation>Ses için yalnızca AAC, AC3, DTS, E-AC3, MP2, MP3 ve Vorbis desteklenir</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+203"/>
         <source>Saving mp4</source>
         <translation>MP4 kaydediliyor</translation>
     </message>
@@ -8215,6 +9982,11 @@
         <translation>Film kaydediliyor</translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation>Optimize ediliyor...</translation>
+    </message>
+    <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp" line="+38"/>
         <source>Muxing Format</source>
         <translation>Çoğullama Biçimi</translation>
@@ -8377,7 +10149,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Ses</translation>
     </message>
@@ -8402,7 +10174,12 @@
         <translation>Videoda yeterli zamanlama bilgisi yok. AVI&apos;dan mı kopyalama yapıyorsunuz?</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation>Optimize ediliyor</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Cannot rename file (optimize)</source>
         <translation>Dosya yeniden adlandırılamıyor (optimize et)</translation>
     </message>
@@ -8488,7 +10265,7 @@
         <translation>Ön izleme. Kutu koordinatlarını kaba bir şekilde ayarlamak için yukarıdaki resme tıklayın</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Sapları kullanarak kırmızı dikdörtgeni yeniden boyutlandırabilirsiniz </translation>
     </message>
@@ -8519,22 +10296,17 @@
         <translation>Msharpen</translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation>Tam önizlemeyi göster</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Maske</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="-21"/>
         <source>Strength</source>
         <translation>Sertlik</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+14"/>
         <source>Threshold</source>
         <translation>Eşik</translation>
     </message>
@@ -8544,30 +10316,34 @@
         <translation>Yüksek Kalite</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation>Renklendirme işlemi</translation>
     </message>
+    <message>
+        <source>Show full preview</source>
+        <translation type="vanished">Tam önizlemeyi göster</translation>
+    </message>
 </context>
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+235"/>
+        <location filename="../../common/gui_navigate.cpp" line="+374"/>
         <source>Cannot go to next keyframe</source>
         <translation>Bir sonraki ana kareye gidilemiyor</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+66"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Önceki ana kareye gidilemiyor</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+399"/>
         <source>Seek</source>
         <translation>Araştırma</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
@@ -8676,9 +10452,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Hatalı biçimlendirilmiş başlık</translation>
     </message>
@@ -8691,7 +10467,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation>&quot;%s&quot; yi kısmi hale getirin</translation>
     </message>
@@ -8764,18 +10540,35 @@
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+66"/>
         <source>Frame Rate:</source>
         <translation>Kare hızı:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+135"/>
+        <location line="-14"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Toplam Süre:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-170"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <location line="-226"/>
         <source>Aspect Ratio:</source>
         <translation>En Boy Oranı:</translation>
     </message>
@@ -8790,7 +10583,27 @@
         <translation>Codec 4CC:</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+35"/>
+        <source>Average Bitrate:</source>
+        <translation>Ortalama Bit Hızı:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation>Video Kodec Ekstra Verisi</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation>Boyut:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation>Ekstra veriler:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Audio</source>
         <translation>Ses</translation>
     </message>
@@ -8820,38 +10633,30 @@
         <translation>Kod Çözücü:</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation>MetinEtiketi</translation>
+        <location line="+12"/>
+        <source>Copy to Clipboard</source>
+        <translation>Panoya kopyala</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Extra Video Properties</source>
-        <translation>Ekstra Video Özellikleri</translation>
+        <location line="+29"/>
+        <source>OK</source>
+        <translation>TAMAM</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>ExtraDataSize:</source>
-        <translation>EkstraVeriBoyutu:</translation>
+        <source>TextLabel</source>
+        <translation type="vanished">MetinEtiketi</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Extra data :</source>
-        <translation>Ekstra veri :</translation>
+        <source>Extra Video Properties</source>
+        <translation type="vanished">Ekstra Video Özellikleri</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>Copy to Clipboard</source>
-        <translation>Panoya kopyala</translation>
+        <source>ExtraDataSize:</source>
+        <translation type="vanished">EkstraVeriBoyutu:</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>OK</source>
-        <translation>TAMAM</translation>
+        <source>Extra data :</source>
+        <translation type="vanished">Ekstra veri :</translation>
     </message>
 </context>
 <context>
@@ -8877,7 +10682,7 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+132"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+134"/>
         <source>Select audio file</source>
         <translation>Ses dosyasını Seçin</translation>
     </message>
@@ -8898,7 +10703,7 @@
         <translation>Bazı parçalar birden çok kez kullanılıyor</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Parça </translation>
     </message>
@@ -8913,7 +10718,7 @@
         <translation>Dosya </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>.... Add audio track</source>
         <translation>... Ses Parçası ekle</translation>
     </message>
@@ -8938,22 +10743,22 @@
         <translation>Bu işlemi gerçekleştirmek için kök ayrıcalıkları gerekir.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>İlk Geçiş</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Pass 1</source>
-        <translation>Geçiş 1</translation>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation>İkinci Geçiş</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Kodlanıyor...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Kodlama duraklatıldı. Devam etmek veya iptal etmek istiyor musunuz?</translation>
     </message>
@@ -8967,6 +10772,10 @@
         <source>Abort</source>
         <translation>İptal</translation>
     </message>
+    <message>
+        <source>Pass 1</source>
+        <translation type="vanished">Geçiş 1</translation>
+    </message>
 </context>
 <context>
     <name>qfile</name>
@@ -8991,12 +10800,12 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+244"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+260"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Yeni sürüm mevcut&lt;/b&gt;&lt;br&gt; Sürüm %1&lt;br&gt;Tarihinde çıktı %2.&lt;br&gt;Buradan indirebilirsiniz&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; Otomatik güncellemeyi devredışı bırakabilirsiniz.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>Son Dosyalar</translation>
     </message>
@@ -9006,12 +10815,17 @@
         <translation>Son Projeler</translation>
     </message>
     <message>
-        <location line="+591"/>
+        <location line="+32"/>
+        <source>Restore defaults</source>
+        <translation>Varsayılanları geri yükle</translation>
+    </message>
+    <message>
+        <location line="+592"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+240"/>
         <source>Play/Stop</source>
         <translation>Oynat/Durdur</translation>
     </message>
@@ -9046,6 +10860,16 @@
         <translation>Bitiş işaretini ayarla</translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Go to previous cut point</source>
+        <translation>Önceki kesme noktasına git</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation>Sonraki kesme noktasına git</translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Go to first frame</source>
         <translation>İlk kareye git</translation>
@@ -9076,24 +10900,34 @@
         <translation>Bir dakika ileri git</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+417"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+424"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Uygulama önemli bir sorunla karşılaştı
 Geçerli düzenleme kaydedildi ve bir sonraki başlangıçta yeniden yüklenecek</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+247"/>
+        <source>%c-%s</source>
+        <translation>%c-%s</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+78"/>
         <source>Selection: </source>
         <translation>Seçim: </translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9149,7 +10983,7 @@
         <translation> Referanslar</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location line="+176"/>
         <source>Restore previous session</source>
         <translation>Önceki oturumu geri yükle</translation>
     </message>
@@ -9249,28 +11083,29 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+441"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+500"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Kısmi</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-28"/>
         <source>This filter cannot be made partial</source>
         <translation>Bu filtre kısmi yapılamaz</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+344"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location line="-101"/>
-        <location line="+106"/>
+        <location line="-149"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Kaldır</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-156"/>
         <source>Configure</source>
         <translation>Yapılandır</translation>
     </message>
@@ -9280,22 +11115,63 @@
         <translation>Yukarı git</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-405"/>
+        <source>Preview</source>
+        <translation>Önizleme</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation>DEVRE DIŞI </translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Aşağı in</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Kısmi yap</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="-79"/>
+        <source>Enable/Disable</source>
+        <translation>Etkin/Devre dışı</translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation>Devre Dışı</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation>Etkin</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation>Diyaloğu kabul etmek için %s tuşuna basın</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>Video filtrelerini yükleyin..</translation>
     </message>
@@ -9313,7 +11189,7 @@
         <translation>Bilinmeyen</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>_Resume</source>
         <translation>_Devam et</translation>
     </message>
@@ -9340,8 +11216,23 @@
         <source>Yes</source>
         <translation>Evet</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation>%d kbps</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation>(+%d bayt)</translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9359,96 +11250,81 @@
         <translation>Stereo</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+152"/>
+        <source>No Audio</source>
+        <translation>Ses Yok</translation>
+    </message>
+    <message>
+        <location line="-254"/>
+        <source>%2.3f fps</source>
+        <translation>%2.3f fps</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location line="+105"/>
+        <source>%02d:%02d:%02d.%03d</source>
+        <translation>%02d:%02d:%02d.%03d</translation>
+    </message>
+    <message>
+        <location line="-120"/>
+        <source>%s (%u:%u)</source>
+        <translation>%s (%u:%u)</translation>
+    </message>
+    <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="vanished">Video</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Codec 4CC:	</source>
-        <translation>Codec 4CC:	</translation>
+        <translation type="vanished">Codec 4CC:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Image Size:	</source>
-        <translation>Görüntü boyutu:	</translation>
+        <translation type="vanished">Görüntü boyutu:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Aspect Ratio:	</source>
-        <translation>En Boy Oranı:	</translation>
+        <translation type="vanished">En Boy Oranı:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Frame Rate:	</source>
-        <translation>Kare hızı:	</translation>
+        <translation type="vanished">Kare hızı:	</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Toplam Süre:	</translation>
+        <translation type="vanished">Toplam Süre:	</translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>Extra Video Properties</source>
-        <translation>Ekstra Video Özellikleri</translation>
+        <translation type="vanished">Ekstra Video Özellikleri</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ExtraDataSize:	</source>
-        <translation>EkstraVeriBoyutu:	</translation>
+        <translation type="vanished">EkstraVeriBoyutu:	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra data:	</source>
-        <translation>EkstraVeri:	</translation>
+        <translation type="vanished">EkstraVeri:	</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Audio</source>
-        <translation>Ses</translation>
+        <translation type="vanished">Ses</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Codec:		</source>
-        <translation>Kodlayıcı:		</translation>
+        <translation type="vanished">Kodlayıcı:		</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Channels:	</source>
-        <translation>Kanallar:	</translation>
+        <translation type="vanished">Kanallar:	</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Bitrate:	</source>
-        <translation>Bit hızı:	</translation>
+        <translation type="vanished">Bit hızı:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Sıklık:	</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>No Audio</source>
-        <translation>Ses Yok</translation>
-    </message>
-    <message>
-        <location line="-170"/>
-        <source>%2.3f fps</source>
-        <translation>%2.3f fps</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+90"/>
-        <source>%02d:%02d:%02d.%03d</source>
-        <translation>%02d:%02d:%02d.%03d</translation>
-    </message>
-    <message>
-        <location line="-96"/>
-        <source>%s (%u:%u)</source>
-        <translation>%s (%u:%u)</translation>
+        <translation type="vanished">Sıklık:	</translation>
     </message>
 </context>
 <context>
@@ -9527,6 +11403,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation>Dörtgen dönüşüm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation>Dört nokta dönüşümü.</translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation>Dörtgen dönüşüm</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation>İki çizgili</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation>Bikübik</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation>Aradeğerleme:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation>Yakınlaştır:</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation>Δy:</translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation>Δx:</translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9547,7 +11480,7 @@
         <translation>Yalnızca Video Çoklayıcı Ayarları</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation>Ham video kaydetme</translation>
     </message>
@@ -9608,7 +11541,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+365"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+443"/>
         <source>_Mode:</source>
         <translation>_Kip:</translation>
     </message>
@@ -9618,12 +11551,12 @@
         <translation>_Yeni kare hızı:</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Resample fps</source>
         <translation>Fps&apos;yi yeniden örnekle</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Özel</translation>
     </message>
@@ -9653,7 +11586,7 @@
         <translation>59.93  (NTSC)</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>FPS&apos;yi yeniden örnekle</translation>
     </message>
@@ -9662,16 +11595,36 @@
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>FPS&apos;yi değiştirin ve uygulayın. Süreyi ve senkronizasyonu koru.</translation>
     </message>
+    <message>
+        <location line="+349"/>
+        <source>none</source>
+        <translation>yok</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation>Harman</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation>Hareket Telafisi</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>_Interpolation:</source>
+        <translation>_Aradeğerleme:</translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Genişlik ve yükseklik garip olamaz</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+81"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
         <source>swsResize</source>
         <translation>sws Yeniden Boyutlandırma</translation>
     </message>
@@ -9705,12 +11658,12 @@
         <translation>Hedef NOKTA:</translation>
     </message>
     <message>
-        <location line="+436"/>
+        <location line="+463"/>
         <source>Bicubic</source>
         <translation>Bikübik</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-540"/>
         <source>Aspect Ratio</source>
         <translation>En Boy Oranı</translation>
     </message>
@@ -9780,7 +11733,17 @@
         <translation>0.00 / 0.00</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation>0.0000</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation>(00:00)</translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Yeniden Boyutlandırma Yöntemi:</translation>
     </message>
@@ -9800,6 +11763,11 @@
         <translation>Spline</translation>
     </message>
     <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation>En yakın komşu</translation>
+    </message>
+    <message>
         <source>Source:</source>
         <translation type="vanished">Kaynak:</translation>
     </message>
@@ -9828,7 +11796,7 @@
     <name>rotate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+52"/>
-        <location line="+163"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Döndür</translation>
     </message>
@@ -9843,6 +11811,11 @@
         <translation>90°</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>180 degrees</source>
         <translation>180°</translation>
@@ -9853,29 +11826,31 @@
         <translation>270°</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>_Angle:</source>
         <translation>_Açı:</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-158"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>Görüntüyü 90/180/270 derece döndürün.</translation>
     </message>
     <message>
-        <location line="+156"/>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
         <source>90�</source>
@@ -9898,7 +11873,17 @@
         <translation>Ön izleme</translation>
     </message>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+89"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+108"/>
+        <source>Peek Original</source>
+        <translation>Orijinale Bak</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation>İşlenmemiş girişi göster</translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>Bir dakika geri git</translation>
     </message>
@@ -9984,17 +11969,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Hareketsiz görüntü</translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Belirli bir süre için kareleri çoğaltın.</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation>_Başlangıç saati:</translation>
     </message>
@@ -10173,7 +12158,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation> h</translation>
     </message>
@@ -10191,7 +12176,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation>Dosyayı Kaydet</translation>
     </message>
@@ -10210,7 +12195,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+266"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+337"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+86"/>
         <source>There are several files with sequential file names. Should they be all loaded ?</source>
         <translation>Sıralı dosya adlarına sahip birkaç dosya vardır. Hepsi yüklenmeli mi?</translation>
@@ -10804,6 +12789,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation>Dalgacık gürültü giderici</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation>Marco Rossini&apos;nin gürültü gidericisine dayanmaktadır.</translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation>Dalgacık Gürültü Giderici</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation>Eşik</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation>Yumuşaklık</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation>Yüksek kalite</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation>Gürültü rengi</translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation>Dalgacık kalemtıraş</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation>Marco Rossini&apos;nin kalemtıraşına dayanmaktadır.</translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation>Dalgacık Kalemtıraş</translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation>Kuvvet</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation>Yarıçap</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation>Yüksek kalite</translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Unsupported Video.
@@ -10860,7 +12927,7 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>Kodlanmamış</translation>
     </message>
@@ -10872,17 +12939,27 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+178"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+249"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>none</source>
         <translation>hiçbiri</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+1"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
         <source>Custom</source>
         <translation>Özel</translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+424"/>
         <source>Target Bitrate:</source>
         <translation>Hedef bit hızı:</translation>
     </message>
@@ -10918,7 +12995,7 @@
         <translation>Ortalama Bit hızı:</translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="+80"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12241,7 +14318,7 @@
         <translation>Özel</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+351"/>
         <source>Target Bitrate:</source>
         <translation>Hedef bit hızı:</translation>
     </message>
@@ -12358,7 +14435,7 @@
     <name>x265ConfigDialog</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui" line="+15"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>x265 Yapılandırması</translation>
     </message>
     <message>
@@ -13640,8 +15717,8 @@
     </message>
     <message>
         <location line="+1"/>
-        <source>Two threads)</source>
-        <translation>İkili İş Parçacığı)</translation>
+        <source>Two threads</source>
+        <translation>İkili İş Parçacığı</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -13807,4 +15884,167 @@
         <translation>yadif</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_uk.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_uk.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+500"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+510"/>
         <source> is </source>
         <translation> відмінна </translation>
     </message>
@@ -19,7 +19,7 @@
         <translation> відмінні </translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>Перевірка правильності тимчасових міток...</translation>
     </message>
@@ -38,17 +38,17 @@
 2) склеїти їх разом</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-43"/>
         <source>Attempt to open %s failed!</source>
         <translation>Помилка при відкритті %s!</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+81"/>
         <source>Decoding video...</source>
         <translation>Декодирую відео...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+66"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+68"/>
         <source>Unsupported size</source>
         <translation>Непідтримуваний розмір</translation>
     </message>
@@ -64,7 +64,7 @@
         <translation>Розміри відео %ux%u перевищують максимально підтримуваний розмір %ux%u.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+115"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -81,7 +81,7 @@
 Скинути інформацію про час?</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-197"/>
         <source>This video contains B-frames, but presentation time stamps (PTS) are either missing or monotonically increasing. Avidemux can try to reconstruct correct PTS by decoding the entire video. This may take a lot of time. Proceed?</source>
         <translation>Це відео містить двонаправлені кадри (B-frames), в той час як мітки час показу (PTS) або відсутній, або монотонно зростає. Авидемукс може спробувати відновити правильні PTS шляхом декодування всього відео. Це може зайняти багато часу. Продовжити?</translation>
     </message>
@@ -92,12 +92,12 @@
         <translation>Ширина відео %u px перевищує максимально підтримувану ширину %u.</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-92"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Неможливо знайти демультиплексор для %s</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+96"/>
         <source>The height of the video %u px exceeds maximum supported height %u.
 </source>
         <translation>Висота відео %u px перевищує максимально підтримувану висоту %u.</translation>
@@ -513,7 +513,7 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1508"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1557"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -523,7 +523,7 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="-779"/>
+        <location line="-827"/>
         <source>ms</source>
         <translation>мс</translation>
     </message>
@@ -533,12 +533,12 @@
         <translation>Пере&amp;хід</translation>
     </message>
     <message>
-        <location line="+1802"/>
+        <location line="+1864"/>
         <source>&amp;Top</source>
         <translation>&amp;Зверху</translation>
     </message>
     <message>
-        <location line="-1478"/>
+        <location line="-1540"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Копіювати</translation>
@@ -554,17 +554,17 @@
         <translation>Ав&amp;то</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="-22"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-57"/>
         <source>&amp;Help</source>
         <translation>Довід&amp;ка</translation>
     </message>
@@ -579,7 +579,7 @@
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location line="+200"/>
+        <location line="+201"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -594,6 +594,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -603,7 +605,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-299"/>
+        <location line="-542"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
         <source>00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -649,6 +661,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+14"/>
         <source>Ctrl+Alt+M</source>
         <translation type="unfinished"></translation>
@@ -659,7 +681,7 @@
         <translation>З&amp;боку</translation>
     </message>
     <message>
-        <location line="-647"/>
+        <location line="-661"/>
         <source>Time:</source>
         <translation>Час:</translation>
     </message>
@@ -680,12 +702,12 @@
         <translation>Перший кадр [HOME]</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-166"/>
         <source>Go to next keyframe [UP]</source>
         <translation>Наступний ключовий кадр [UP]</translation>
     </message>
     <message>
-        <location line="+458"/>
+        <location line="+506"/>
         <source>Go to marker A [PAGE UP]</source>
         <translation>Перейти до маркера A [PAGE UP]</translation>
     </message>
@@ -696,12 +718,12 @@
         <translation>Зберегти проект</translation>
     </message>
     <message>
-        <location line="-1671"/>
+        <location line="-1719"/>
         <source>&amp;Audio</source>
         <translation>&amp;Аудіо</translation>
     </message>
     <message>
-        <location line="+1686"/>
+        <location line="+1734"/>
         <source>&amp;Input</source>
         <translation>&amp;Вхід</translation>
     </message>
@@ -711,27 +733,27 @@
         <translation>&amp;Вибір</translation>
     </message>
     <message>
-        <location line="-1742"/>
+        <location line="-1790"/>
         <source>&amp;Tools</source>
         <translation>&amp;Інструменти</translation>
     </message>
     <message>
-        <location line="+1295"/>
+        <location line="+1343"/>
         <source>Se&amp;lection</source>
         <translation>&amp;Вибір</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-383"/>
         <source>Set end marker [CTRL+PAGEDOWN]</source>
         <translation>Поставити маркер B [CTRL + PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+810"/>
+        <location line="+872"/>
         <source>&amp;Audio Metre</source>
         <translation>&amp;Аудіометр</translation>
     </message>
     <message>
-        <location line="-1576"/>
+        <location line="-1638"/>
         <location line="+142"/>
         <location line="+169"/>
         <location line="+181"/>
@@ -739,27 +761,27 @@
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location line="-727"/>
+        <location line="-728"/>
         <source>Vi&amp;deo</source>
         <translation>Ві&amp;део</translation>
     </message>
     <message>
-        <location line="+857"/>
+        <location line="+858"/>
         <source>Play [SPACE]</source>
         <translation>Відтворити [SPACE]</translation>
     </message>
     <message>
-        <location line="+744"/>
+        <location line="+792"/>
         <source>Audio &amp;Metre</source>
         <translation>&amp;Аудіометр</translation>
     </message>
     <message>
-        <location line="-1587"/>
+        <location line="-1636"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Панелі</translation>
     </message>
     <message>
-        <location line="+1634"/>
+        <location line="+1683"/>
         <source>&amp;Open...</source>
         <translation>&amp;Відкрити...</translation>
     </message>
@@ -785,7 +807,7 @@
         <translation>Попередній чорний кадр</translation>
     </message>
     <message>
-        <location line="-141"/>
+        <location line="-189"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>Попередній кадр [LEFT]</translation>
     </message>
@@ -795,7 +817,7 @@
         <translation>На&amp;лаштування кодека</translation>
     </message>
     <message>
-        <location line="+1585"/>
+        <location line="+1633"/>
         <source>Play filtered</source>
         <translation>Увімкнути фільтр</translation>
     </message>
@@ -805,22 +827,22 @@
         <translation>Перейти до маркера B [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="-995"/>
+        <location line="-1043"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
         <translation>&lt;b&gt; Аудіо на виході &lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1017"/>
+        <location line="+1065"/>
         <source>Selection: 000000</source>
         <translation>Вибірка: 000000</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-843"/>
         <source>&lt;b&gt;Output Format&lt;/b&gt;</source>
         <translation>&lt;b&gt;Вихідний формат&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1040"/>
+        <location line="+1088"/>
         <source>&amp;Load/Run Project...</source>
         <translation>&amp;Завантажити / Запустити проект...</translation>
     </message>
@@ -830,27 +852,27 @@
         <translation>Останній кадр [END]</translation>
     </message>
     <message>
-        <location line="-1065"/>
+        <location line="-1113"/>
         <source>&amp;Custom</source>
         <translation>Вла&amp;сне</translation>
     </message>
     <message>
-        <location line="+1713"/>
+        <location line="+1761"/>
         <source>&amp;Output</source>
         <translation>&amp;Вихід</translation>
     </message>
     <message>
-        <location line="-1688"/>
+        <location line="-1736"/>
         <source>&amp;Recent</source>
         <translation>&amp;Нещодавне</translation>
     </message>
     <message>
-        <location line="+1089"/>
+        <location line="+1137"/>
         <source>Forward one minute</source>
         <translation>Вперед на 1 хвилину</translation>
     </message>
     <message>
-        <location line="-556"/>
+        <location line="-604"/>
         <source>&amp;Shift:</source>
         <translation>Зсу&amp;в:</translation>
     </message>
@@ -860,7 +882,7 @@
         <translation>(0 доріжок)</translation>
     </message>
     <message>
-        <location line="+1353"/>
+        <location line="+1401"/>
         <source>&amp;Volume</source>
         <translation>&amp;Гучність</translation>
     </message>
@@ -875,12 +897,12 @@
         <translation>Вперед на 1 хвилину [CTRL + UP]</translation>
     </message>
     <message>
-        <location line="+684"/>
+        <location line="+698"/>
         <source>&amp;Separate</source>
         <translation>&amp;Відокремити</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-910"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
         <translation>Поставити маркер A [CTRL + PAGEUP]</translation>
     </message>
@@ -891,12 +913,12 @@
         <translation>Фільтри</translation>
     </message>
     <message>
-        <location line="+926"/>
+        <location line="+974"/>
         <source>Vol&amp;ume</source>
         <translation>&amp;Гучність</translation>
     </message>
     <message>
-        <location line="-1353"/>
+        <location line="-1401"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt; Декодер відео &lt;/b&gt;</translation>
     </message>
@@ -906,7 +928,7 @@
         <translation>&lt;b&gt; Відео на виході &lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1437"/>
+        <location line="+1485"/>
         <source>Save &amp;Project</source>
         <translation>Зберегти &amp;Проект</translation>
     </message>
@@ -916,23 +938,23 @@
         <translation>&amp;Інформація...</translation>
     </message>
     <message>
-        <location line="-751"/>
+        <location line="-799"/>
         <source>Go to next frame [RIGHT]</source>
         <translation>Наступний кадр [RIGHT]</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+258"/>
         <source>Backward one minute [CTRL+DOWN]</source>
         <translation>Назад на 1 хвилину [CTRL + DOWN]</translation>
     </message>
     <message>
-        <location line="-187"/>
+        <location line="-235"/>
         <source>Go to previous keyframe [DOWN]</source>
         <translation>Попередній ключовий кадр [DOWN]</translation>
     </message>
     <message>
         <location line="-150"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Навігація</translation>
     </message>
@@ -1101,7 +1123,7 @@
         <translation>Операція</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+303"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+336"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="+45"/>
         <source>Low</source>
         <translation>Низький</translation>
@@ -1123,7 +1145,7 @@
         <translation>Виконано</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+67"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+68"/>
         <source>Gain</source>
         <translation>Рівень нормалізації</translation>
     </message>
@@ -1139,7 +1161,7 @@
         <translation>Головний</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-20"/>
         <source>Mono</source>
         <translation>Моно</translation>
     </message>
@@ -1151,7 +1173,7 @@
         <translation>Немає</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1933"/>
+        <location filename="../../common/gui_main.cpp" line="+1985"/>
         <source>Oops</source>
         <translation>Попередження</translation>
     </message>
@@ -1181,7 +1203,7 @@
         <translation>Скасувати</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+6"/>
         <source>_Gain mode:</source>
         <translation>Режим:</translation>
     </message>
@@ -1192,7 +1214,7 @@
         <translation>Немає звукової доріжки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
         <source>Stereo+surround</source>
         <translation>Стерео + об&apos;ємний звук</translation>
     </message>
@@ -1219,13 +1241,13 @@
         <translation>Файл &quot;%s&quot; збережений некоректно.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
         <source>About</source>
         <translation>Про програму...</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+180"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+185"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="-606"/>
@@ -1234,17 +1256,17 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-81"/>
         <source>Close</source>
         <translation>&amp;Закрити файл</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -1252,18 +1274,18 @@
         <translation>Кодек</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-107"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-96"/>
         <source>Display only error alerts</source>
         <translation>Тільки повідомлення про помилки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-362"/>
+        <location filename="../../common/gui_main.cpp" line="-364"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -1277,14 +1299,14 @@
         <translation>Помилка</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+35"/>
         <source>Mixer</source>
         <translation>Мікшер</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-229"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location filename="../../common/gui_savenew.cpp" line="-231"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>Мультиплексор</translation>
     </message>
@@ -1309,8 +1331,8 @@
         <translation>Максимальне збільшення переповнення (%)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-326"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-327"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
@@ -1334,6 +1356,8 @@
 Помилка установки</translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+113"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>Вимкнено</translation>
@@ -1344,7 +1368,7 @@
         <translation>Неможливо підтвердити ланцюжок відео</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+60"/>
         <source>Decoder Option</source>
         <translation>Налаштування декодера</translation>
     </message>
@@ -1354,19 +1378,19 @@
         <translation>Не вдається виділити достатньо пам’яті</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-117"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-268"/>
         <source>Enable 3DNOWEXT</source>
         <translation>Увімкнути 3DNOWEXT</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-847"/>
+        <location filename="../../common/gui_main.cpp" line="-870"/>
         <source>Codec or codec settings across the deletion do not match. Playback of the video saved in copy mode may stop at this point.
 Proceed anyway?</source>
         <translation>Кодек або параметри кодування на точках розрізу не збігаються. Відтворення відео, збереженого в режимі копіювання, може на цих точках обриватися.
 Все одно продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+41"/>
         <source>Previous Black Frame</source>
         <translation>Попередній чорний кадр</translation>
     </message>
@@ -1380,7 +1404,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+728"/>
+        <location filename="../../common/gui_main.cpp" line="+751"/>
         <source>Main Audio Track</source>
         <translation>Головна звукова доріжка</translation>
     </message>
@@ -1390,12 +1414,12 @@
         <translation>Значення зсуву (мс):</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-770"/>
+        <location filename="../../common/gui_main.cpp" line="-793"/>
         <source>Error while cutting out.</source>
         <translation>Помилка обрізки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-55"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-56"/>
         <source>R_esampling (Hz):</source>
         <translation>Перетворення частоти (Hz):</translation>
     </message>
@@ -1405,17 +1429,17 @@
         <translation>Неможливо додати операцію %s</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+61"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+99"/>
         <source>_Cache size:</source>
         <translation>Розм_ір кешу:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+697"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+699"/>
         <source>Too short</source>
         <translation>Занадто коротко</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+666"/>
+        <location filename="../../common/gui_main.cpp" line="+669"/>
         <source>Marker A &gt; B</source>
         <translation>Мітка A&gt; B</translation>
     </message>
@@ -1426,23 +1450,23 @@
         <translation>Будь ласка, звільніть місце і натисніть RETRY, щоб спробувати заново.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
         <source>Connect to avsproxy</source>
         <translation>Помилка з&apos;єднання з AvsProxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+199"/>
         <source>GUI Rendering Options</source>
         <translation>Параметри графічного інтерфейсу</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-160"/>
-        <location line="+290"/>
+        <location filename="../../common/gui_savenew.cpp" line="-162"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>Не вдається створити екземпляр мультиплексора</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+522"/>
+        <location filename="../../common/gui_main.cpp" line="+544"/>
         <source>This function is disabled or no longer valid</source>
         <translation>Функція вимкнена або більше недійсна</translation>
     </message>
@@ -1452,7 +1476,7 @@
         <translation>Максимум кадрів B</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-259"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+27"/>
         <source>Ignore driver blacklist (Intel)</source>
         <translation>Ігнорувати чорний список драйверів (Intel)</translation>
     </message>
@@ -1467,7 +1491,7 @@
         <translation>Стерео + центр + об&apos;ємний звук</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+68"/>
         <source>Build Option</source>
         <translation>Опції збірки...</translation>
     </message>
@@ -1499,27 +1523,27 @@
         <translation>__невідомо__</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1753"/>
+        <location filename="../../common/gui_main.cpp" line="-1804"/>
         <source>Select script to run</source>
         <translation>Вибрати скрипт для запуску</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+160"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-155"/>
         <source>No downmixing</source>
         <translation>Без змішування</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-168"/>
         <source>Enable SSE2</source>
         <translation>Увімкнути SSE2</translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="+334"/>
         <source>Enabling Hw decoding disables multi-threading, restart application to apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-346"/>
         <source>_Swap markers if marker A is set past marker B or marker B before A in video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1539,7 +1563,7 @@
         <translation>Додатки аудіопристроїв</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1244"/>
+        <location filename="../../common/gui_main.cpp" line="+1273"/>
         <source>Something bad happened</source>
         <translation>Помилка при відкритті файлу для запису</translation>
     </message>
@@ -1549,7 +1573,7 @@
         <translation>Неможливо видалити виділене.</translation>
     </message>
     <message>
-        <location line="-406"/>
+        <location line="-405"/>
         <source>Multiple Audio Tracks</source>
         <translation>Кілька звукових доріжок</translation>
     </message>
@@ -1559,7 +1583,7 @@
         <translation>Помилка при додаванні відео</translation>
     </message>
     <message>
-        <location line="+668"/>
+        <location line="+687"/>
         <source>AvsProxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1584,9 +1608,8 @@
         <translation>Неможливо відкрити скрипт &quot;%s&quot;.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+95"/>
         <source>SDL (good)</source>
-        <translation>SDL (добре)</translation>
+        <translation type="vanished">SDL (добре)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-95"/>
@@ -1595,19 +1618,19 @@
         <translation>Перевищена квота</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1191"/>
+        <location filename="../../common/gui_main.cpp" line="-1221"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The cut points of the pasted selection may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Це відео використовує кадри прямого доступу без миттєвого оновлення декодування (non-IDR). Лічильник черговості показу зображень (POC) на таких ключових кадрах не скидається. Утворилися точки розрізу вставки при збереженні відео в режимі копіювання можуть призвести до затримки відтворення через порушений порядок показу зображень.
 Все одно продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+119"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+238"/>
         <source>User Interface</source>
         <translation>Інтерфейс</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+26"/>
+        <location filename="../../common/gui_savenew.cpp" line="+25"/>
         <source>Cannot open </source>
         <translation>Неможливо відкрити</translation>
     </message>
@@ -1632,7 +1655,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>G_ain value:</source>
         <translation>Значення:</translation>
     </message>
@@ -1647,7 +1670,7 @@
         <translation>Максимальний розмір GOP</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-338"/>
+        <location filename="../../common/gui_savenew.cpp" line="-339"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>Використовувати попередні дані проходу ще раз?
@@ -1659,12 +1682,12 @@
         <translation>В&amp;ідкрити папку з даними програми</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-168"/>
         <source>Above normal</source>
         <translation>Вище нормального</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-405"/>
+        <location filename="../../common/gui_main.cpp" line="-424"/>
         <source>Select script to save</source>
         <translation>Вибрати скрипт для збереження</translation>
     </message>
@@ -1681,12 +1704,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+269"/>
+        <location filename="../../common/gui_main.cpp" line="+272"/>
         <source>Select Video File to Append...</source>
         <translation>Вибрати файл відео для приєднання...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-33"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-55"/>
         <source>Enable SSSE3</source>
         <translation>Увімкнути SSSE3</translation>
     </message>
@@ -1701,7 +1724,7 @@
         <translation>Додатки декодерів відео</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1166"/>
+        <location filename="../../common/gui_main.cpp" line="+1212"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
         <translation>Неможливо встановити мову аудіо: відео не завантажене!</translation>
     </message>
@@ -1711,12 +1734,12 @@
         <translation>Вибрати доріжку...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
         <source>Below normal</source>
         <translation>Нижче нормального</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+284"/>
+        <location filename="../../common/gui_savenew.cpp" line="+286"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The choice of cut points may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Do you want to continue anyway?</source>
         <translation>Це відео використовує кадри прямого доступу без миттєвого оновлення декодування (non-IDR). Лічильник черговості показу зображень (POC) на таких ключових кадрах не скидається. Вибрані точки розрізу при збереження відео в режимі копіювання може призвести до затримки відтворення через порушений порядок показу зображень.
@@ -1728,12 +1751,12 @@
         <translation>Автовизначення</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Encoding priority:</source>
         <translation>_Пріоритет кодування:</translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-66"/>
         <source>Enable 3DNOW</source>
         <translation>Увімкнути 3DNOW</translation>
     </message>
@@ -1760,12 +1783,12 @@
         <translation>Неможливо вибрати кодек FLV1</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-272"/>
+        <location filename="../../common/gui_savenew.cpp" line="-274"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation>Не вдається встановити кодер для першого проходу. Конфігурація, надана кодеру, може бути несумісною, або кодер може залежати від функцій, недоступних у цій системі.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-831"/>
+        <location filename="../../common/gui_main.cpp" line="-854"/>
         <source>Cut points could not be checked.
 This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
 Proceed anyway?</source>
@@ -1783,7 +1806,7 @@
         <translation>Розмір GOP</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+154"/>
+        <location filename="../../common/gui_main.cpp" line="+158"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation>Спробуйте &quot;Файл-&gt;Завантажити/Запустити проект...&quot;</translation>
     </message>
@@ -1793,7 +1816,7 @@
         <translation>Не знайдено плагін аудиокодека AAC.</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+876"/>
+        <location filename="../../common/gui_main.cpp" line="+895"/>
         <source>Frame Hex Dump</source>
         <translation>Дамп кадру</translation>
     </message>
@@ -1813,17 +1836,17 @@
         <translation>Помилка прав доступу</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+13"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+14"/>
         <source>Audio Filters</source>
         <translation>Фільтри аудіо</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1097"/>
+        <location filename="../../common/gui_main.cpp" line="-1120"/>
         <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
         <translation>Вирізати відео цілком неприпустимо. Будь ласка, перевірте положення міток A і B.</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+184"/>
         <source>Permission error</source>
         <translation>Помилка прав доступу</translation>
     </message>
@@ -1844,21 +1867,20 @@
         <translation type="vanished">Установка мови доріжки неможлива: у відео немає файлу аудіо!</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+726"/>
+        <location filename="../../common/gui_main.cpp" line="+745"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
         <translation>Установка мови доріжки неможлива: невірний: Відео не має аудіофайлу!</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-879"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the deletion may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Це відео використовує кадри прямого доступу без миттєвого оновлення декодування (non-IDR). Лічильник черговості показу зображень (POC) на таких ключових кадрах не скидається. Вибрані кінцеві точки видалення при збереження відео в режимі копіювання може призвести до затримки відтворення через порушений порядок показу зображень.
 Все одно продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+77"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (краще)</translation>
+        <translation type="vanished">OpenGL (краще)</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="+21"/>
@@ -1866,7 +1888,7 @@
         <translation>Виберіть файл для збереження</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-69"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Append</source>
         <translation>&amp;Приєднати...</translation>
     </message>
@@ -1894,7 +1916,7 @@
         <translation>Вручну</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-405"/>
+        <location filename="../../common/gui_main.cpp" line="-432"/>
         <source>Not coded in this version</source>
         <translation>Ні в цій версії</translation>
     </message>
@@ -1914,7 +1936,7 @@
         <translation>Вихідний _файл:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+393"/>
+        <location filename="../../common/gui_main.cpp" line="+420"/>
         <source>The end point of the deletion is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
@@ -1927,12 +1949,12 @@
         <translation>Ігнорувати</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+628"/>
+        <location filename="../../common/gui_main.cpp" line="+631"/>
         <source>No error found</source>
         <translation>Помилки не знайдені</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+60"/>
         <source>Next Intra Frame</source>
         <translation>Наступний ключовий кадр</translation>
     </message>
@@ -1953,7 +1975,7 @@
         <translation>Внутрішня помилка пошуку кодека 0x%x</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+50"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+165"/>
         <source>Master</source>
         <translation>Майстер</translation>
     </message>
@@ -1998,7 +2020,7 @@
         <translation>Назва операції</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-622"/>
+        <location filename="../../common/gui_main.cpp" line="-625"/>
         <source>This video uses non-IDR recovery points instead of IDR as keyframes. Picture reordering information in the video stream is not reset at non-IDR frames. The chosen start and end points of the cut may result in playback interruption due to reversed display order of frames if saved in copy mode.
 Proceed anyway?</source>
         <translation>Це відео використовує кадри прямого доступу без миттєвого оновлення декодування (non-IDR). Лічильник черговості показу зображень (POC) на таких ключових кадрах не скидається. Вибрані кінцеві точки вирізу при збереження відео в режимі копіювання може призвести до затримки відтворення через порушений порядок показу зображень.
@@ -2015,18 +2037,18 @@
         <translation>Збережено зображень: %d</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-88"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-104"/>
         <source>Normal</source>
         <translation>Нормально</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
         <location line="+2"/>
         <source>Clear recent items</source>
         <translation>Очистити список</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-67"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+264"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Декодувати відео за допомогою DXVA2 (Windows)</translation>
     </message>
@@ -2036,12 +2058,12 @@
         <translation>Точність пошуку рухів</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-87"/>
         <source>Output</source>
         <translation>Вихідні дані</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1010"/>
+        <location filename="../../common/gui_main.cpp" line="+1033"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation>Неможливо з&apos;єднатися з AvsProxy.
@@ -2053,24 +2075,24 @@
         <translation>Неможливо створити потік</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-241"/>
         <source>Enable all SIMD</source>
         <translation>Увімкнути всі SIMD</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-11"/>
-        <source>Remix:</source>
-        <translation>Ремікс:</translation>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-12"/>
+        <source>Remix</source>
+        <translation>Ремікс</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>Не можна видалити всі відео</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+155"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+193"/>
         <source>_AudioDevice</source>
         <translation>_Аудіопристрій</translation>
     </message>
@@ -2085,13 +2107,13 @@
         <translation>Зберегти вибірку як послідовність JPEG</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-32"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-33"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
         <source>Stereo</source>
         <translation>Стерео</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1191"/>
+        <location filename="../../common/gui_main.cpp" line="-1221"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -2104,7 +2126,7 @@
         <translation>Широкий пошук</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-404"/>
+        <location filename="../../common/gui_main.cpp" line="-423"/>
         <source>Select script to debug</source>
         <translation>Вибрати скрипт для налагодження</translation>
     </message>
@@ -2119,19 +2141,19 @@
         <translation>Обмежений пошук</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+284"/>
+        <location filename="../../common/gui_savenew.cpp" line="+286"/>
         <source>Cut points could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
 Try anyway?</source>
         <translation>Не вдалося перевірити точки розрізу. Це вказує на проблему або з вихідним відео, або з кроками редагування, або є проявом помилки в програмі. За деталями зверніться, будь ласка, до журнального файлу додатки або до консольних повідомлень.
 Все одно продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+98"/>
         <source>First Frame</source>
         <translation>Перший кадр</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+721"/>
+        <location filename="../../common/gui_main.cpp" line="+751"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>Неможливо відкрити &quot;%s&quot;.</translation>
     </message>
@@ -2156,7 +2178,7 @@
         <translation>Останній кадр</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-8"/>
         <source>Next Frame</source>
         <translation>Наступний кадр</translation>
     </message>
@@ -2166,7 +2188,7 @@
         <translation>Неможливо підключитися до бази даних. У вас увімкнено управління операціями?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+20"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+31"/>
         <source>Zoom 1:1</source>
         <translation>Масштаб 1: 1</translation>
     </message>
@@ -2176,7 +2198,72 @@
         <translation>Масштаб 1:2</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="-83"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>Масштаб 1:4</translation>
     </message>
@@ -2191,12 +2278,11 @@
         <translation>Плагіни аудіокодеків</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (краще)</translation>
+        <translation type="vanished">DXVA2 (краще)</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-73"/>
         <source>Caching of decoded pictures</source>
         <translation>Кешування декодованих кадрів</translation>
     </message>
@@ -2229,33 +2315,33 @@
         <translation>Без змін</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-650"/>
+        <location filename="../../common/gui_main.cpp" line="-680"/>
         <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
         <translation>Ви намагаєтеся очистити список недавно відкритих файлів і проектів. Цей крок незворотній. Продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-63"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-76"/>
         <source>Auto-Append Settings</source>
         <translation>Автоматичне об&apos;єднання розчленованих потоків</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+67"/>
         <location line="+3"/>
         <source>Sdl driver</source>
         <translation>Драйвер SDL</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+151"/>
+        <location filename="../../common/gui_main.cpp" line="+154"/>
         <source>No engine</source>
         <translation>Немає рушія</translation>
     </message>
     <message>
-        <location line="+503"/>
+        <location line="+530"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; не існує.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-112"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-126"/>
         <source>Save as BMP</source>
         <translation>Зберегти бітовою матрицею (BMP)</translation>
     </message>
@@ -2270,7 +2356,7 @@
         <translation>Створення тимчасової карти</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-133"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+182"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>Декодувати відео за допомогою VDPAU (NVIDIA)</translation>
     </message>
@@ -2282,12 +2368,12 @@
 Це потрібно для створення відео, сумісного з PSP.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+49"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+51"/>
         <source>Load saved settings</source>
         <translation>Завантажити налаштування виводу за замовчуванням</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+911"/>
+        <location filename="../../common/gui_main.cpp" line="+930"/>
         <source>Frame size:</source>
         <translation>Розмір кадру:</translation>
     </message>
@@ -2297,14 +2383,13 @@
         <translation>Тип кадру:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+24"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+25"/>
         <source>Plugins</source>
         <translation>Плагіни...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+93"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (найкраще)</translation>
+        <translation type="vanished">VDPAU (найкраще)</translation>
     </message>
     <message>
         <location filename="../../common/ADM_toolkit/automation.cpp" line="+4"/>
@@ -2325,7 +2410,7 @@
 Все одно продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-910"/>
+        <location filename="../../common/gui_main.cpp" line="-929"/>
         <source>File error</source>
         <translation>Помилка файлу</translation>
     </message>
@@ -2340,12 +2425,12 @@
         <translation>%d хв.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
         <source>_Volume control:</source>
         <translation>Гучність звуку управляється:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+95"/>
         <source>Default Postprocessing</source>
         <translation>Постпроцесинг за замовчуванням</translation>
     </message>
@@ -2360,7 +2445,7 @@
         <translation>Вручну (дБ)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+466"/>
+        <location filename="../../common/gui_main.cpp" line="+465"/>
         <source>Checking video</source>
         <translation>Перевірка відео</translation>
     </message>
@@ -2370,12 +2455,12 @@
         <translation>Помилка збереження &quot;%s&quot;як BMP.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-272"/>
         <source>_Enable alternative keyboard shortcuts</source>
         <translation>_Увімкнути альтернативні гарячі клавіші</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="+343"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>Декодувати відео за допомогою LIBVA (INTEL)</translation>
     </message>
@@ -2385,14 +2470,13 @@
         <translation>Зберегти як PNG невдалось</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-430"/>
+        <location filename="../../common/gui_main.cpp" line="-429"/>
         <source>Cannot open project using the video loader.</source>
         <translation>Неможливо відкрити проект за допомогою завантажувача відео.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+101"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (найкраще)</translation>
+        <translation type="vanished">LIBVA (найкраще)</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
@@ -2405,7 +2489,7 @@
         <translation>Вкажіть файл для збереження</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-45"/>
         <source>_Limit Refresh Rate</source>
         <translation>_Обмеження частоти оновлення</translation>
     </message>
@@ -2425,7 +2509,7 @@
         <translation>Нова частота (Hz)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+690"/>
+        <location filename="../../common/gui_main.cpp" line="+709"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
         <translation>Установка мови доріжки неможлива: невірний Індекс доріжки!</translation>
     </message>
@@ -2434,12 +2518,12 @@
         <translation type="vanished">Ці параметри діють тільки для MPEG і DivX без апаратного прискорення декодування</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-212"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>_Зберігати відео в папці з останнім прочитаним файлом за замовчуванням</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+147"/>
         <source>_Language</source>
         <translation>_Мова</translation>
     </message>
@@ -2449,7 +2533,7 @@
         <translation>Файл не завантажений</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-630"/>
+        <location filename="../../common/gui_main.cpp" line="-649"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation>Файл містить кілька звукових доріжок.
@@ -2461,12 +2545,12 @@
         <translation>Відеокодек</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+142"/>
         <source>Threading</source>
         <translation>Багатопотоковість</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-105"/>
         <source>_Strength:</source>
         <translation>Рівень:</translation>
     </message>
@@ -2481,7 +2565,7 @@
         <translation>Збереження завдання</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-267"/>
         <source>_Check for new release</source>
         <translation>_Перевіряти оновлення</translation>
     </message>
@@ -2491,17 +2575,98 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+11"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
         <source>Multi-threading is disabled internally if HW accelerated decoding is enabled, restart application to apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>_Indexing/unpacking priority:</source>
         <translation>_Індексація/розпакування:</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+9"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+217"/>
         <source>PCM</source>
         <translation type="unfinished"></translation>
@@ -2517,11 +2682,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+84"/>
         <source>De_ringing</source>
         <translation>_Дерингинг</translation>
     </message>
     <message>
+        <location line="-24"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
         <source>_Deringing</source>
         <translation>_Дерингинг</translation>
@@ -2548,6 +2718,11 @@
     </message>
     <message>
         <location line="+1"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>WMA</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2627,6 +2802,11 @@
         <translation>8-бітний PCM</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-30"/>
         <source>Play filtered</source>
         <translation>Відтворювати фільтрованим</translation>
@@ -2652,7 +2832,7 @@
         <translation>Прискорення ключових кадрів (%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-159"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-236"/>
         <source>Enable MMX</source>
         <translation>Увімкнути MMX</translation>
     </message>
@@ -2662,7 +2842,17 @@
         <translation>Увімкнути SSE</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+282"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Ignore codec blacklist (Intel, HEVC 10bit)</source>
         <translation>Ігнорувати чорний список кодеків (Intel, HEVC 10bit)</translation>
     </message>
@@ -2678,14 +2868,12 @@
         <translation>файлова система переповнена</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+270"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+20"/>
         <source>HW Accel</source>
         <translation>Апаратне прискорення</translation>
     </message>
     <message>
-        <location line="-271"/>
+        <location line="-368"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>_Дозволяти нестандартну частоту звуку для DVD</translation>
     </message>
@@ -2695,7 +2883,7 @@
         <translation>Увімкнути MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-53"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-56"/>
         <source>Information</source>
         <translation>Власт&amp;ивості</translation>
     </message>
@@ -2711,16 +2899,19 @@
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+124"/>
         <source>SDL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-15"/>
         <source>XVideo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
         <source>VDPAU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2741,7 +2932,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+264"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <source>CPU</source>
         <translation>ЦП</translation>
     </message>
@@ -2751,12 +2942,12 @@
         <translation>Для створення файлу даного типу потрібно аудіодоріжка</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+566"/>
+        <location filename="../../common/gui_main.cpp" line="+585"/>
         <source>Cannot use that file as audio track</source>
         <translation>Неможливо використовувати файл для аудіодоріжки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-290"/>
         <source>Prioritisation</source>
         <translation>Пріоритет</translation>
     </message>
@@ -2776,17 +2967,17 @@
         <translation>Дуже високий</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1415"/>
+        <location filename="../../common/gui_main.cpp" line="-1464"/>
         <source>Select script/project to run</source>
         <translation>Вибрати скрипт/проект для запуску</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+223"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+23"/>
         <source>_Always ask which port to use</source>
         <translation>_Завжди вибирати порт</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+98"/>
         <source>Go To Marker A</source>
         <translation>Перейти до маркера A</translation>
     </message>
@@ -2801,12 +2992,12 @@
         <translation>Стерео (передній) + стерео (задній)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-60"/>
         <source>Pr&amp;eferences</source>
         <translation>&amp;Налаштування</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+627"/>
+        <location filename="../../common/gui_main.cpp" line="+653"/>
         <source>Codec or codec settings across the cut do not match. Playback of the video saved in copy mode may stop at this point.
 Proceed anyway?</source>
         <translation>Кодек або параметри кодування на точках розрізу не збігаються. Відтворення відео, збереженого в режимі копіювання, може на цих точках обриватися.
@@ -2818,7 +3009,7 @@
         <translation>Сцени з низьким бітрейтом (%)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>Проблема при ініціалізації аудіопристрою.</translation>
     </message>
@@ -2830,7 +3021,7 @@
 Помилка установки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-182"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+33"/>
         <source>Video _display:</source>
         <translation>Метод виведення відео:</translation>
     </message>
@@ -2841,17 +3032,17 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+131"/>
         <source>_Vertical deblocking</source>
         <translation>_Вертикальний деблокинг</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+612"/>
+        <location filename="../../common/gui_main.cpp" line="+615"/>
         <source>Errors found in %u frames</source>
         <translation>Знайдено помилки в %u кадрах</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-81"/>
         <source>_Local playback downmixing:</source>
         <translation>_Даунміксинг звуку при локальному відтворенні:</translation>
     </message>
@@ -2861,7 +3052,7 @@
         <translation>Всі повідомлення</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="+172"/>
         <source>Decode video using VideoToolbox (macOS)</source>
         <translation>Декодувати відео за допомогою VideoToolbox (macOS)</translation>
     </message>
@@ -2881,7 +3072,7 @@
         <translation>Ці параметри діють тільки для програмного декодування</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-671"/>
+        <location filename="../../common/gui_main.cpp" line="-674"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>Обрізка</translation>
@@ -2897,7 +3088,7 @@
         <translation>Кілька секунд</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+71"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+83"/>
         <source>Fit to window</source>
         <translation>Підігнати під розмір вікна</translation>
     </message>
@@ -2922,12 +3113,12 @@
         <translation>Менше хвилини</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-19"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-28"/>
         <source>Next Black Frame</source>
         <translation>Наступний чорний кадр</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+272"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-9"/>
         <source>Display</source>
         <translation>Відео</translation>
     </message>
@@ -2942,7 +3133,7 @@
         <translation>Перейти до часу...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-266"/>
         <source>Multi-threading</source>
         <translation>Використовувати багатопотоковість</translation>
     </message>
@@ -2972,7 +3163,7 @@
         <translation>З PAL у Фільм</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-64"/>
         <source>Reset Markers</source>
         <translation>Скидання маркерів</translation>
     </message>
@@ -2986,37 +3177,37 @@
         <translation type="vanished">Неможливо підключитися до бази даних. У вас увімкнено управління операціями?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+40"/>
         <source>Default port to use</source>
         <translation>Порт за замовчуванням</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="+65"/>
         <source>_Message level:</source>
         <translation>Рівень повідомлень:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+671"/>
+        <location filename="../../common/gui_main.cpp" line="+674"/>
         <source>You can&apos;t remove all frames</source>
         <translation>Ви не можете видалити всі кадри.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+37"/>
         <source>&amp;Advanced</source>
         <translation>&amp;Додатково</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-135"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+132"/>
         <source>Enable openGl support</source>
         <translation>Увімкнути підтримку OpenGL</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1010"/>
+        <location filename="../../common/gui_main.cpp" line="-1036"/>
         <source>tinyPy script is not enabled in this build</source>
         <translation>Скрипт tinyPy не увімкнений в цю збірку</translation>
     </message>
     <message>
-        <location line="+322"/>
+        <location line="+345"/>
         <source>Deleting</source>
         <translation>Видалення</translation>
     </message>
@@ -3026,8 +3217,8 @@
         <translation>Вихідний файл</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-347"/>
-        <location line="+73"/>
+        <location filename="../../common/gui_main.cpp" line="-374"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>Вибрати файл відео...</translation>
     </message>
@@ -3058,12 +3249,12 @@
         <translation>Невідомий</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-51"/>
         <source>Reset Edit</source>
         <translation>Скидання</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+19"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>Зберегти поточні налаштування виводу за замовчуванням</translation>
@@ -3086,18 +3277,17 @@
 Встановіть плагін LAME</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-49"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-51"/>
         <source>Save as Image</source>
         <translation>Зберегти як &amp;зображення</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+292"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
         <source>Preferences</source>
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1058"/>
+        <location filename="../../common/gui_main.cpp" line="+1104"/>
         <source>_Track from video:</source>
         <translation>Доріжка:</translation>
     </message>
@@ -3117,7 +3307,7 @@
         <translation>_Режим інтерлейсингу</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+79"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
         <source>Open Application &amp;Log</source>
         <translation>&amp;Відкрити журнал програми</translation>
     </message>
@@ -3134,7 +3324,7 @@
         <translation>Фільтр</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-255"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-334"/>
         <source>_lavc threads:</source>
         <translation>_lavc</translation>
     </message>
@@ -3149,12 +3339,12 @@
         <translation>_Відтінки сірого</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+205"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+240"/>
         <source>Refresh Rate Cap (ms)</source>
         <translation>Інтервал частоти оновлення (мс)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-28"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
         <source>Set Marker A</source>
         <translation>Встановити маркер А</translation>
     </message>
@@ -3175,7 +3365,7 @@
         <translation>Режим VHQ</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-792"/>
+        <location filename="../../common/gui_main.cpp" line="-815"/>
         <source>The end point of the cut is not on a keyframe.
 Video saved in copy mode will be corrupted at this point.
 Proceed anyway?</source>
@@ -3198,12 +3388,12 @@
         <translation>Зберегти як JPEG невдалось</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
         <source>Previous Frame</source>
         <translation>Попередній кадр</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-186"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-220"/>
         <source>_Playback priority:</source>
         <translation>_Відтворення:</translation>
     </message>
@@ -3213,13 +3403,13 @@
         <translation>Попередження</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+10"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+12"/>
         <source>_Use custom fragment size for auto-append of MPEG-TS files</source>
         <translation>_Використовувати нестандартний розмір фрагментів при автоматичному об&apos;єднанні файлів MPEG-TS</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="+13"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+100"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+176"/>
         <source>_Horizontal deblocking</source>
         <translation>_Горизонтальний деблокинг</translation>
     </message>
@@ -3234,12 +3424,12 @@
         <translation>Змінити частоту:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-88"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
         <source>Save as JPEG</source>
         <translation>Зберегти як JPEG</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-159"/>
+        <location filename="../../common/gui_main.cpp" line="-166"/>
         <source>Codec or codec settings across a cut point of the pasted video do not match.
 Playback of the video saved in copy mode may stop at this point.
 Proceed anyway?</source>
@@ -3252,7 +3442,7 @@
         <translation>Межа в 99999 кадрів досягнута.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-175"/>
         <source>_Fragment size:</source>
         <translation>Розмір _фрагментів:</translation>
     </message>
@@ -3267,12 +3457,12 @@
         <translation>2 проходи</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+350"/>
+        <location filename="../../common/gui_main.cpp" line="+361"/>
         <source>Could not open the file</source>
         <translation>Неможливо відкрити файл</translation>
     </message>
     <message>
-        <location line="-221"/>
+        <location line="-225"/>
         <source>It is impossible to delete the entire video. Please recheck the position of markers A and B.</source>
         <translation>Видалити Відео цілком неприпустимо. Будь ласка, перевірте позиції міток A і B.</translation>
     </message>
@@ -3304,12 +3494,12 @@
         <translation>.. зменшено на (%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+90"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
         <source>Previous Intra Frame</source>
         <translation>Попередній ключовий кадр</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+115"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+116"/>
         <source>System language</source>
         <translation>Системнна мова</translation>
     </message>
@@ -3319,19 +3509,18 @@
         <translation>Вихідний файл не вказано</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-124"/>
+        <location filename="../../common/gui_main.cpp" line="-131"/>
         <source>Cut points of the pasted video could not be checked. This indicates an issue with a source video, the state of editing or a bug in the program. Please check the application log file or console output for details.
 Try anyway?</source>
         <translation>Не вдалося перевірити точки розрізу вставки. Це вказує на проблему або з вихідним відео, або з кроками редагування, або є проявом помилки в програмі. За деталями зверніться, будь ласка, до журнального файлу додатки або до консольних повідомлень.
 Все одно продовжити?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-103"/>
         <source>XVideo (best)</source>
-        <translation>XVideo (найкраще)</translation>
+        <translation type="vanished">XVideo (найкраще)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+624"/>
+        <location line="+635"/>
         <location line="+43"/>
         <source>The tinypy plugin is missing.
 Expect problems.</source>
@@ -3344,12 +3533,12 @@
         <translation>Аудіокодеки</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+16"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+17"/>
         <source>_Maximum value:</source>
         <translation>_Максимальне значення:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+159"/>
+        <location filename="../../common/gui_main.cpp" line="+158"/>
         <source>Something bad happened (II)</source>
         <translation>Помилка при оновленні відео</translation>
     </message>
@@ -3366,12 +3555,12 @@
         <translation>Виберіть файл для збереження звуку</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+168"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
         <translation>Файл аудіо не знайдено у списку, хоча він повинен був там бути. Створіть звіт про помилку!</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-36"/>
         <source>PostProcessing</source>
         <translation>Постпроцесинг</translation>
     </message>
@@ -3411,7 +3600,7 @@
         <translation>Внутрішня помилка відкриття 0x%x</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-922"/>
+        <location filename="../../common/gui_main.cpp" line="-945"/>
         <source>Are you sure?</source>
         <translation>Ви впевнені?</translation>
     </message>
@@ -3441,6 +3630,55 @@
         <source>1:1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+73"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3469,6 +3707,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3515,6 +3810,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3621,6 +4058,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3652,9 +4197,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3672,35 +4243,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3807,16 +4383,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown flag</source>
         <translation type="vanished">Невідомий прапор</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-116"/>
         <source>ASharp</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3832,7 +4403,7 @@
 <context>
     <name>ass</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+232"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+238"/>
         <location line="+5"/>
         <location line="+9"/>
         <source>Error</source>
@@ -3849,7 +4420,7 @@
         <translation>Неможливо завантажити файл SRT.</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-162"/>
         <source>SSA/ASS/SRT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3859,7 +4430,7 @@
         <translation>Масштаб _шрифту:</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+14"/>
         <source>ASS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3874,7 +4445,7 @@
         <translation>Помилка SSA</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-194"/>
         <source>Select Subtitle File</source>
         <translation>Вибір файла субтитрів</translation>
     </message>
@@ -3884,14 +4455,14 @@
         <translation>М_іжрядковий інтервал:</translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+104"/>
         <source>Preparing the fonts can take a few minutes the first time.
 This message will not be displayed again.</source>
         <translation>У перший раз підготовка шрифтів може зайняти кілька хвилин.
 Це повідомлення більше показуватися не буде.</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-102"/>
         <source>_Top margin:</source>
         <translation>Чорна смуга с_верху:</translation>
     </message>
@@ -3911,7 +4482,7 @@
         <translation>_Файл субтитрів (ASS/SSA):</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+23"/>
         <source>This is a SRT file. Convert to SSA ?</source>
         <translation>Це файл SRT. Конвертувати в SSA?</translation>
     </message>
@@ -3926,17 +4497,17 @@
         <translation>Врахувати співвідношення сторін відео (DAR):</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="-6"/>
         <source>Do not adjust</source>
         <translation>Не враховувати</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+38"/>
         <source>Cannot save converted file.</source>
         <translation>Неможливо зберегти конвертований файл.</translation>
     </message>
     <message>
-        <location line="-78"/>
+        <location line="-84"/>
         <source>Are you sure this is an ASS/SSA file ?</source>
         <translation>Ви впевнені, що це файл ASS/SSA?</translation>
     </message>
@@ -3950,6 +4521,26 @@
     <name>avimuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>Формат мультиплексування</translation>
     </message>
@@ -4124,7 +4715,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>Зачорніння країв</translation>
     </message>
@@ -4180,19 +4771,18 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>Чорний кадр</translation>
+        <translation type="vanished">Чорний кадр</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>Пошук чорного кадру...</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>This function is unsupported at the moment</source>
-        <translation>В даний момент ця функція не підтримується</translation>
+        <translation type="vanished">В даний момент ця функція не підтримується</translation>
     </message>
 </context>
 <context>
@@ -4219,9 +4809,75 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+243"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+252"/>
         <source>Error</source>
         <translation>Помилка</translation>
     </message>
@@ -4231,7 +4887,7 @@
         <translation>Невірна частота кадрів</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-212"/>
         <source>Custom</source>
         <translation>Вручну</translation>
     </message>
@@ -4266,7 +4922,7 @@
         <translation>Змінити частоту кадрів</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+170"/>
         <source>Change fps</source>
         <translation>Змінити частоту кадрів</translation>
     </message>
@@ -4286,12 +4942,12 @@
         <translation>Режим вихідної частоти кадрів:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-155"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation>Прискорити або уповільнити відео за рахунок зміни частоти кадрів. Цей фільтр змінює тривалість відео.</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+160"/>
         <source>Destination Fps:</source>
         <translation>Режим цільової частоти кадрів:</translation>
     </message>
@@ -4328,6 +4984,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4490,14 +5206,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>Контраст</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>Яскравість</translation>
     </message>
@@ -4526,12 +5242,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Process</source>
-        <translation>Обробка</translation>
+        <translation type="vanished">Обробка</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+21"/>
         <source>MPEG2-&gt;PC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4599,17 +5314,18 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>Кадрування</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation>Розмір: </translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4619,7 +5335,7 @@
         <translation>Фільтр кадрування</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>Попередження: ширина занадто сильно обрізана! Її значення відновлено!
@@ -4643,13 +5359,13 @@
     </message>
     <message>
         <location line="+45"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+112"/>
         <source>Top:</source>
         <translation>Зверху:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-74"/>
         <source>Left:</source>
         <translation>Зліва:</translation>
     </message>
@@ -4660,17 +5376,17 @@
     </message>
     <message>
         <location line="-50"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Right:</source>
         <translation>Праворуч:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+120"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+184"/>
         <source>Size: </source>
         <translation>Розмір: </translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="-61"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4716,13 +5432,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-154"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-30"/>
         <source>Bottom:</source>
         <translation>Знизу:</translation>
     </message>
@@ -4732,7 +5448,7 @@
         <translation>Автокадрирование</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+95"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+70"/>
         <source>&amp;Hide Rubber Band</source>
         <translation>&amp;Сховати гумку</translation>
     </message>
@@ -4751,6 +5467,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+92"/>
@@ -4842,6 +5594,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4926,6 +5794,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4936,37 +5817,37 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+480"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+512"/>
         <location line="+31"/>
         <location line="+60"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-412"/>
+        <location line="-460"/>
         <source>Low</source>
         <translation>Низький</translation>
     </message>
     <message>
-        <location line="+247"/>
+        <location line="+295"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
         <translation>0 Мб</translation>
     </message>
     <message>
-        <location line="-288"/>
+        <location line="-336"/>
         <source>High</source>
         <translation>Високий</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-81"/>
         <source>Main</source>
         <translation>Головний</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <location line="+247"/>
+        <location line="+8"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>Немає</translation>
@@ -4977,12 +5858,12 @@
         <translation>Кодек аудіо:</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-241"/>
         <source>Priority:</source>
         <translation>Пріоритет:</translation>
     </message>
     <message>
-        <location line="+292"/>
+        <location line="+340"/>
         <source>Video Size:</source>
         <translation>Розмір відео:</translation>
     </message>
@@ -4992,12 +5873,12 @@
         <translation>Розмір аудіо:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-296"/>
         <source>Above Normal</source>
         <translation>Вище нормального</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+253"/>
         <source>Video Codec:</source>
         <translation>Кодек відео:</translation>
     </message>
@@ -5007,12 +5888,12 @@
         <translation>Оброблених кадрів:</translation>
     </message>
     <message>
-        <location line="-336"/>
+        <location line="-384"/>
         <source>Below Normal</source>
         <translation>Нижче нормального</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+448"/>
         <source>Elapsed:</source>
         <translation>Минуло часу:</translation>
     </message>
@@ -5022,32 +5903,32 @@
         <translation>0 Кб/с</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-455"/>
         <source>Time Remaining:</source>
         <translation>Залишилося часу:</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+52"/>
         <source>Normal</source>
         <translation>Нормально</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-76"/>
         <source>Phase:</source>
         <translation>Етап:</translation>
     </message>
     <message>
-        <location line="+416"/>
+        <location line="+472"/>
         <source>Quantiser:</source>
         <translation>Квантизатор:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation>Вимкнути після завершення</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+168"/>
         <source>Pause / Abort</source>
         <translation>Пауза/Перервати</translation>
     </message>
@@ -5057,22 +5938,32 @@
         <translation>Середній бітрейт:</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-350"/>
         <source>Keep dialog open when finished</source>
         <translation>Залишити діалог відкритим</translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+219"/>
         <source>Container:</source>
         <translation>Контейнер:</translation>
     </message>
     <message>
-        <location line="-316"/>
+        <location line="-348"/>
         <source>Encoding...</source>
         <translation>Кодування...</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+153"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>Згорнути в трей</translation>
     </message>
@@ -5092,8 +5983,8 @@
         <translation>Кадрів/сек:</translation>
     </message>
     <message>
-        <location line="-504"/>
-        <location line="+254"/>
+        <location line="-536"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>Невідомий</translation>
     </message>
@@ -5110,7 +6001,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>Скидання</translation>
     </message>
@@ -5128,7 +6019,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+246"/>
         <source>Red</source>
         <translation>Червоний</translation>
     </message>
@@ -5153,18 +6044,18 @@
         <translation>Вага</translation>
     </message>
     <message>
-        <location line="-177"/>
+        <location line="-170"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation>Контраст</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;Гамма&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>Насиченість</translation>
     </message>
@@ -5173,11 +6064,6 @@
         <source>Brightness</source>
         <translation>Яскравість</translation>
     </message>
-    <message>
-        <location line="+40"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5198,9 +6084,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+70"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+74"/>
         <source>To</source>
         <translation>Да</translation>
     </message>
@@ -5446,7 +6821,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+271"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+284"/>
         <source>Three threads</source>
         <translation>3 потоки</translation>
     </message>
@@ -5577,7 +6952,7 @@
     </message>
     <message>
         <location line="-58"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>2 потоки</translation>
     </message>
     <message>
@@ -5649,7 +7024,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+210"/>
         <source>Three threads</source>
         <translation>Три потоку</translation>
     </message>
@@ -5750,7 +7125,7 @@
     </message>
     <message>
         <location line="-21"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>Два потоку</translation>
     </message>
     <message>
@@ -6169,12 +7544,12 @@
 <context>
     <name>ffpsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>Вільно</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>Формат мультиплексування</translation>
     </message>
@@ -6184,7 +7559,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+209"/>
         <source> video not compatible
 </source>
         <translation>відео несумісне
@@ -6258,12 +7633,12 @@
 </translation>
     </message>
     <message>
-        <location line="-200"/>
+        <location line="-201"/>
         <source>[Mismatch]</source>
         <translation>[Незбіг]</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+166"/>
         <source> Bad width/height for DVD
 </source>
         <translation>Некоректна ширина/висота для DVD
@@ -6335,15 +7710,78 @@
         <translation>Мультиплексування VBR</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>Збереження mpeg TS (ff)</translation>
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
         <source>High</source>
         <translation>Високий</translation>
     </message>
@@ -6437,6 +7875,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+37"/>
@@ -6951,16 +8561,11 @@
         <source>Saturation</source>
         <translation>Насиченість</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+104"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+108"/>
         <source>HUFFYUV</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6970,7 +8575,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+3"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
@@ -6994,6 +8599,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+17"/>
@@ -7019,8 +8700,8 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+141"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+431"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+140"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+430"/>
         <source>Fast</source>
         <translation>Швидко</translation>
     </message>
@@ -7031,8 +8712,8 @@
         <translation>Повністю</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-5"/>
+        <location line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-4"/>
         <source>_Noise:</source>
         <translation>Шум:</translation>
     </message>
@@ -7048,30 +8729,30 @@
         <translation>Видалити дублікати:</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+14"/>
+        <location line="+11"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+11"/>
         <source>DupeRemover</source>
         <translation>Видаляч дублікатів</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-349"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-346"/>
         <source>Remove IVTC dupe.</source>
         <translation>Видалити подвоєння в IVTC</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-8"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+341"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-6"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+340"/>
         <source>VeryFast</source>
         <translation>Дуже швидко</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>Змінити частоту:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-345"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-342"/>
         <source>Remove the duplicate frames present after ivtc.</source>
         <translation>Видалити подвоєні кадри після ivtc.</translation>
     </message>
@@ -7241,7 +8922,7 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+90"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+95"/>
         <source>YUV422</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7251,9 +8932,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>_ColorSpace:</source>
-        <translation>_Колір простору:</translation>
+        <translation type="vanished">_Колір простору:</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -7413,7 +9098,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>Бітрейт:</translation>
     </message>
@@ -7587,6 +9272,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7602,7 +9343,7 @@
 <context>
     <name>mainFilterDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+135"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+144"/>
         <source>Noise</source>
         <translation>Придушення шуму</translation>
     </message>
@@ -7622,12 +9363,17 @@
         <translation>&amp;Закрити</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-311"/>
         <source>Video Filter Manager</source>
         <translation>Відеофільтри</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <source>Colors</source>
         <translation>Колір</translation>
     </message>
@@ -7652,12 +9398,12 @@
         <translation>&amp;Попередній перегляд</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-212"/>
         <source>Transform</source>
         <translation>Трансформація</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>Sharpness</source>
         <translation>Різкість</translation>
     </message>
@@ -7680,12 +9426,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+591"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+634"/>
         <source>Matroska clusters</source>
         <translation>Кластери Matroska</translation>
     </message>
     <message>
-        <location line="-544"/>
+        <location line="-586"/>
         <source>Matroska Images</source>
         <translation>Зображення Matroska</translation>
     </message>
@@ -7791,7 +9537,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8167,12 +9913,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>Помилка читання заголовків SVQ3</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation>Декодування типу кадрів</translation>
     </message>
@@ -8215,7 +9962,7 @@
         <translation>на 270 градусів</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+107"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+108"/>
         <source>Video track is incompatible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8230,7 +9977,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+215"/>
         <source>Saving PSP</source>
         <translation>Збереження у форматі PSP</translation>
     </message>
@@ -8240,7 +9987,12 @@
         <translation>Зберегти як mov</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
         <source>Saving mp4</source>
         <translation>Зберегти як MP4</translation>
     </message>
@@ -8256,7 +10008,7 @@
         <translation>Повернути кадр</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-198"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-205"/>
         <source>Only AAC, AC3, DTS, E-AC3, (L)PCM, MP2, MP3 and Vorbis supported for audio</source>
         <translation>Для аудіо підтримуються тільки AAC, AC3, E-AC3, LPCM, MP2, MP3 і Vorbis</translation>
     </message>
@@ -8380,7 +10132,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>Аудіо</translation>
     </message>
@@ -8390,7 +10142,12 @@
         <translation>Відео</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-121"/>
         <source>Audio format not supported, only AAC/MP3/AC3</source>
         <translation>Формат аудіо не підтримується, тільки AAC/MP3/AC3</translation>
     </message>
@@ -8496,7 +10253,7 @@
         <translation>Попередній перегляд</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>Ви можете змінити розмір червоного прямокутника за допомогою покажчиків</translation>
     </message>
@@ -8522,17 +10279,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+112"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+59"/>
         <source>Mask</source>
         <translation>Маска</translation>
     </message>
     <message>
-        <location line="-34"/>
+        <location line="-7"/>
         <source>Threshold</source>
         <translation>Пороги</translation>
     </message>
@@ -8542,7 +10294,7 @@
         <translation>Висока якість</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8555,22 +10307,22 @@
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+494"/>
+        <location filename="../../common/gui_navigate.cpp" line="+839"/>
         <source>Seek</source>
         <translation>Пошук</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>Помилка</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-486"/>
         <source>Cannot go to previous keyframe</source>
         <translation>Неможливо перейти до попереднього ключового кадру</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-66"/>
         <source>Cannot go to next keyframe</source>
         <translation>Неможливо перейти до наступного ключового кадру</translation>
     </message>
@@ -8679,9 +10431,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>Заголовок невірної форми</translation>
     </message>
@@ -8694,7 +10446,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8757,33 +10509,31 @@
 <context>
     <name>propsDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+169"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+183"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-163"/>
         <source>Video</source>
         <translation>Відео</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+236"/>
         <source>Bitrate:</source>
         <translation>Бітрейт:</translation>
     </message>
     <message>
-        <location line="-83"/>
         <source>Extra data :</source>
-        <translation>Додаткові дані:</translation>
+        <translation type="vanished">Додаткові дані:</translation>
     </message>
     <message>
-        <location line="-42"/>
         <source>Extra Video Properties</source>
-        <translation>Додаткові властивості відео</translation>
+        <translation type="vanished">Додаткові властивості відео</translation>
     </message>
     <message>
-        <location line="-52"/>
-        <location line="+135"/>
+        <location line="-184"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>Загальна тривалість:</translation>
     </message>
@@ -8793,32 +10543,68 @@
         <translation>Кодек:</translation>
     </message>
     <message>
-        <location line="-125"/>
         <source>ExtraDataSize:</source>
-        <translation>Розмір додаткових даних:</translation>
+        <translation type="vanished">Розмір додаткових даних:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="-270"/>
         <source>Properties</source>
         <translation>Властивості</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+30"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-212"/>
         <source>Image Size:</source>
         <translation>Розмір картинки:</translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+49"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-260"/>
+        <location line="-239"/>
         <source>Frame Rate:</source>
         <translation>Частота кадрів:</translation>
     </message>
     <message>
-        <location line="+170"/>
+        <location line="+149"/>
         <source>Variable Bitrate:</source>
         <translation>Змінна частота:</translation>
     </message>
@@ -8838,7 +10624,7 @@
         <translation>Частота вибірки:</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-142"/>
         <source>Codec 4CC:</source>
         <translation>Кодек 4СС:</translation>
     </message>
@@ -8848,13 +10634,8 @@
         <translation>Співвідношення сторін:</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>Текстова мітка</translation>
+        <translation type="vanished">Текстова мітка</translation>
     </message>
 </context>
 <context>
@@ -8880,38 +10661,38 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+517"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+522"/>
         <source>copy</source>
         <translation>Копіювати</translation>
     </message>
     <message>
-        <location line="-363"/>
+        <location line="-366"/>
         <location line="+161"/>
         <source>Error</source>
         <translation>Помилка</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+136"/>
         <source>File </source>
         <translation>Файл </translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-136"/>
         <source>Some tracks are used multiple times</source>
         <translation>Деякі доріжки використані кілька разів</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>Доріжка </translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>.... Add audio track</source>
         <translation>.... Додати аудіодоріжку</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-354"/>
         <source>Select audio file</source>
         <translation>Вибрати файл аудіо</translation>
     </message>
@@ -8921,7 +10702,7 @@
         <translation>Неможливо використовувати файл як аудіодоріжку</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+289"/>
         <source> from video</source>
         <translation> з відео</translation>
     </message>
@@ -8933,44 +10714,48 @@
 <context>
     <name>qencoding</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+406"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+469"/>
         <source>Abort</source>
         <translation>Перервати</translation>
     </message>
     <message>
-        <location line="-341"/>
+        <location line="-404"/>
         <location line="+20"/>
         <source>Privileges Required</source>
         <translation>Потрібні права</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>Pass 1</source>
-        <translation>1 прохід</translation>
+        <translation type="vanished">1 прохід</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+384"/>
         <source>Resume</source>
         <translation>Продовжити</translation>
     </message>
     <message>
-        <location line="-341"/>
+        <location line="-404"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
         <translation>Для виконання цієї операції потрібні права root.</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>Перший прохід</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>Кодування...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>Процес кодування призупинено. Ви хочете продовжити або перервати його?</translation>
     </message>
@@ -9002,54 +10787,69 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2293"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2740"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="-2049"/>
+        <location line="-2480"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation>&lt;b&gt;Нова версія&lt;/b&gt;&lt;br&gt;Версія %1&lt;br&gt;випущена %2.&lt; br&gt;Доступна для завантаження з адреси&lt;br&gt;&lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt; &lt;br&gt;&lt;small&gt;Ви можете вимкнути автоматичну перевірку оновлень в Налаштуваннях.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location line="+1076"/>
+        <location line="+1338"/>
         <source>Set start marker</source>
         <translation>Поставити маркер A</translation>
     </message>
     <message>
-        <location line="-825"/>
+        <location line="-884"/>
         <source>Recent Projects</source>
         <translation>Попередні проекти</translation>
     </message>
     <message>
-        <location line="+1558"/>
+        <location line="+1777"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>Додаток зіткнувся з критичною проблемою
 Хід поточного редагування збережений і буде завантажений при наступному запуску</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-901"/>
         <source>Go to previous keyframe</source>
         <translation>Попередній ключовий кадр</translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-877"/>
         <source>Recent Files</source>
         <translation>Попередні файли</translation>
     </message>
     <message>
+        <location line="+33"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+256"/>
         <source>Go to next keyframe</source>
         <translation>Наступний ключовий кадр</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Backward one minute</source>
         <translation>Назад на 1 хвилину</translation>
     </message>
@@ -9059,7 +10859,7 @@
         <translation>Перший кадр</translation>
     </message>
     <message>
-        <location line="-30"/>
+        <location line="-38"/>
         <source>Play/Stop</source>
         <translation>Старт/стоп</translation>
     </message>
@@ -9068,7 +10868,7 @@
         <translation type="vanished">Вибірка: 000000</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+46"/>
         <source>Go to marker A</source>
         <translation>Перейти до маркера A</translation>
     </message>
@@ -9078,27 +10878,37 @@
         <translation>Перейти до маркера B</translation>
     </message>
     <message>
-        <location line="+1021"/>
+        <location line="+439"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+671"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+80"/>
         <source>Selection: </source>
         <translation>Вибірка: </translation>
     </message>
     <message>
-        <location line="-1039"/>
+        <location line="-1216"/>
         <source>Set end marker</source>
         <translation>Поставити маркер B</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+48"/>
         <source>Forward one minute</source>
         <translation>Вперед на 1 хвилину</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-68"/>
         <source>Go to previous frame</source>
         <translation>Попередній кадр</translation>
     </message>
     <message numerus="yes">
-        <location line="+1361"/>
+        <location line="+1580"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation>
@@ -9108,12 +10918,12 @@
         </translation>
     </message>
     <message>
-        <location line="-1359"/>
+        <location line="-1578"/>
         <source>Go to next frame</source>
         <translation>Наступний кадр</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Go to last frame</source>
         <translation>Останній кадр</translation>
     </message>
@@ -9149,12 +10959,12 @@
         <translation type="vanished">Проект</translation>
     </message>
     <message>
-        <location line="+238"/>
+        <location line="+242"/>
         <source>Restore previous session</source>
         <translation>Відновити попередню сесію</translation>
     </message>
     <message>
-        <location line="-227"/>
+        <location line="-231"/>
         <source>&amp;Debug Project...</source>
         <translation>&amp;Налагодити проект...</translation>
     </message>
@@ -9278,22 +11088,38 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+690"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+844"/>
         <source>Add</source>
         <translation>Додати</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+240"/>
         <source>Save video filters..</source>
         <translation>Зберегти фільтри відео...</translation>
     </message>
     <message>
-        <location line="-280"/>
+        <location line="-388"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>Зробити частковим</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-490"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>Move up</source>
         <translation>Перемістити вгору</translation>
     </message>
@@ -9304,32 +11130,58 @@
     </message>
     <message>
         <location line="+1"/>
-        <location line="+106"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>Видалити</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="-152"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation>Натисніть %s, щоб прийняти діалогове вікно</translation>
     </message>
     <message>
-        <location line="-292"/>
+        <location line="-421"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>Часткове накладення</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>Перемістити вниз</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+377"/>
         <source>Load video filters..</source>
         <translation>Завантажити фільтри відео...</translation>
     </message>
     <message>
-        <location line="-414"/>
+        <location line="-569"/>
         <source>This filter cannot be made partial</source>
         <translation>Цей фільтр не може бути застосований тільки до частини відео</translation>
     </message>
@@ -9337,7 +11189,7 @@
 <context>
     <name>qprocessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+163"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+165"/>
         <source>_Resume</source>
         <translation>_Продовжити</translation>
     </message>
@@ -9347,12 +11199,12 @@
         <translation>Скасувати подальшу обробку?</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-98"/>
         <source>Unknown</source>
         <translation>Невідомий</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+97"/>
         <source>The processing is paused.</source>
         <translation>Процес призупинено.</translation>
     </message>
@@ -9370,83 +11222,88 @@
         <translation>Так</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <location line="+90"/>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-19"/>
+        <location line="-79"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
         <source>Mono</source>
         <translation>Моно</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Audio</source>
-        <translation>Звук</translation>
+        <translation type="vanished">Звук</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>Video</source>
-        <translation>Відео</translation>
+        <translation type="vanished">Відео</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Image Size:	</source>
-        <translation>Розмір картинки:</translation>
+        <translation type="vanished">Розмір картинки:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+155"/>
         <source>No Audio</source>
         <translation>Без звуку</translation>
     </message>
     <message>
-        <location line="-38"/>
         <source>Frame Rate:	</source>
-        <translation>Частота кадрів:	</translation>
+        <translation type="vanished">Частота кадрів:	</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation>%2.3f кадрів/с</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Extra data:	</source>
-        <translation>Додаткові дані:</translation>
+        <translation type="vanished">Додаткові дані:</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>Aspect Ratio:	</source>
-        <translation>Співвідношення сторін:</translation>
+        <translation type="vanished">Співвідношення сторін:</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra Video Properties</source>
-        <translation>Додаткові властивості відео</translation>
+        <translation type="vanished">Додаткові властивості відео</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Channels:	</source>
-        <translation>Канали:	</translation>
+        <translation type="vanished">Канали:	</translation>
     </message>
     <message>
-        <location line="-33"/>
         <source>Codec 4CC:	</source>
-        <translation>Кодек 4CC:	</translation>
+        <translation type="vanished">Кодек 4CC:	</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="+102"/>
         <source>Stereo</source>
         <translation>Стерео</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Codec:		</source>
-        <translation>Кодек:		</translation>
+        <translation type="vanished">Кодек:		</translation>
     </message>
     <message numerus="yes">
-        <location line="-118"/>
+        <location line="-39"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation>
@@ -9456,30 +11313,25 @@
         </translation>
     </message>
     <message>
-        <location line="-43"/>
+        <location line="-67"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+163"/>
         <source>Bitrate:	</source>
-        <translation>Бітрейт:	</translation>
+        <translation type="vanished">Бітрейт:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>Частота вибірки:</translation>
+        <translation type="vanished">Частота вибірки:</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>ExtraDataSize:	</source>
-        <translation>Розмір додаткових даних:</translation>
+        <translation type="vanished">Розмір додаткових даних:</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>Тривалість:</translation>
+        <translation type="vanished">Тривалість:</translation>
     </message>
 </context>
 <context>
@@ -9558,6 +11410,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9568,7 +11477,7 @@
 <context>
     <name>rawmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+84"/>
         <source>None</source>
         <translation>Нічого</translation>
     </message>
@@ -9639,17 +11548,17 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+83"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+85"/>
         <source>Resample FPS</source>
         <translation>Ресемплювати відео</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+366"/>
         <source>Resample fps</source>
         <translation>Ресемплювати відео</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>Вручну</translation>
     </message>
@@ -9679,17 +11588,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+317"/>
+        <location line="+386"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>_Mode:</source>
         <translation>_Режим:</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="+2"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-359"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>Ресемплювати відео під дану частоту кадрів при збереженні тривалості та синхронізації.</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+358"/>
         <source>_New frame rate:</source>
         <translation>Нова _частота кадрів:</translation>
     </message>
@@ -9697,12 +11626,12 @@
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+83"/>
         <source>swScale Resizer.</source>
         <translation>Змінити розмір за допомогою swScale.</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>Ширина і висота не можуть бути непарними</translation>
     </message>
@@ -9719,12 +11648,12 @@
         <translation type="vanished">Приймач:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+543"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui" line="+570"/>
         <source>Bilinear</source>
         <translation>Білінійний</translation>
     </message>
     <message>
-        <location line="-75"/>
+        <location line="-102"/>
         <source>Error X / Y:</source>
         <translation>Помилка X/Y:</translation>
     </message>
@@ -9743,12 +11672,12 @@
         <translation type="vanished">0,00/0,00</translation>
     </message>
     <message>
-        <location line="+518"/>
+        <location line="+545"/>
         <source>Lanczos-3</source>
         <translation>Ланчош-3</translation>
     </message>
     <message>
-        <location line="-539"/>
+        <location line="-566"/>
         <source>Resize</source>
         <translation>Змінити розмір</translation>
     </message>
@@ -9767,12 +11696,12 @@
         <translation>Відсоток</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+186"/>
         <source>Bicubic</source>
         <translation>Бікубічний</translation>
     </message>
     <message>
-        <location line="-468"/>
+        <location line="-495"/>
         <source>Source PAR:</source>
         <translation>PAR на вході:</translation>
     </message>
@@ -9837,7 +11766,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+33"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
         <source>Resize Method:</source>
         <translation>Метод зміни розміру:</translation>
     </message>
@@ -9846,46 +11785,36 @@
         <source>Spline</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>rotate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+206"/>
         <source>None</source>
         <translation>Немає</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>270°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Angle:</source>
         <translation>Кут:</translation>
     </message>
     <message>
-        <location line="-161"/>
-        <location line="+163"/>
+        <location line="-159"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>Повернути</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <source>90°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="-5"/>
         <source>180 degrees</source>
         <translation>180 градусів</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>180°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location line="+1"/>
         <source>270 degrees</source>
         <translation>270 градусів</translation>
@@ -9896,15 +11825,25 @@
         <translation>90 градусів</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-154"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>Повернути зображення на 90/180/270 градусів.</translation>
     </message>
+    <message>
+        <location line="+154"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>seekablePreviewDialog</name>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+91"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+127"/>
         <source>Play</source>
         <translation>Відтворити</translation>
     </message>
@@ -9914,7 +11853,17 @@
         <translation>Назад на 1 хв</translation>
     </message>
     <message>
+        <location line="-17"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +11943,23 @@
 <context>
     <name>stillimage</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+245"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+250"/>
         <source>_Start time:</source>
         <translation>_Почати:</translation>
     </message>
     <message>
-        <location line="-181"/>
+        <location line="-186"/>
         <source>Duplicate frames for a given duration.</source>
         <translation>Повторювати кадр протягом заданого часу.</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+187"/>
         <source>_Duration:</source>
         <translation>_Тривалість:</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <location line="+186"/>
+        <location line="-188"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation>Стоп-кадр</translation>
     </message>
@@ -10184,7 +12133,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation> г</translation>
     </message>
@@ -10202,7 +12151,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10226,7 +12175,7 @@
     </message>
     <message>
         <location line="-162"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+348"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+349"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+105"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
@@ -10791,6 +12740,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Display width</source>
@@ -10843,17 +12874,17 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+656"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+745"/>
         <source>MB</source>
         <translation>Мб</translation>
     </message>
     <message>
-        <location line="-478"/>
+        <location line="-495"/>
         <source>none</source>
         <translation>Немає</translation>
     </message>
     <message>
-        <location line="+629"/>
+        <location line="+652"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -10874,12 +12905,12 @@
         <translation>Зберегти профіль</translation>
     </message>
     <message>
-        <location line="-167"/>
+        <location line="-173"/>
         <source>Target Video Size:</source>
         <translation>Цільовий розмір відео:</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+246"/>
         <source>Do you really want to delete the </source>
         <translation>Ви дійсно хочете видалити </translation>
     </message>
@@ -10894,22 +12925,22 @@
         <translation>Видалити</translation>
     </message>
     <message>
-        <location line="-668"/>
+        <location line="-686"/>
         <source>Custom</source>
         <translation>Вручну</translation>
     </message>
     <message>
-        <location line="+648"/>
+        <location line="+666"/>
         <source>Cannot save preset</source>
         <translation>Неможливо зберегти передустановку</translation>
     </message>
     <message>
-        <location line="-231"/>
+        <location line="-237"/>
         <source>Quantiser:</source>
         <translation>Квантизатор:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>Не зроблено</translation>
     </message>
@@ -10920,12 +12951,12 @@
         <translation>Кб/с</translation>
     </message>
     <message>
-        <location line="+207"/>
+        <location line="+213"/>
         <source>Replace the following preset ?:</source>
         <translation>Замінити наступну передустановку?:</translation>
     </message>
     <message>
-        <location line="-227"/>
+        <location line="-233"/>
         <source>Target Bitrate:</source>
         <translation>Цільовий бітрейт:</translation>
     </message>
@@ -10946,7 +12977,7 @@
         <translation>Якість:</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+247"/>
         <source>Cannot delete custom profile</source>
         <translation>Неможливо видалити змінений профіль</translation>
     </message>
@@ -10956,7 +12987,17 @@
         <translation>Замінити</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-714"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+578"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12190,17 +14231,17 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+714"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+732"/>
         <source>MB</source>
         <translation>Мб</translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-442"/>
         <source>none</source>
         <translation>нічого</translation>
     </message>
     <message>
-        <location line="+609"/>
+        <location line="+627"/>
         <location line="+67"/>
         <location line="+17"/>
         <source>Error</source>
@@ -12241,12 +14282,12 @@
         <translation>Видалити</translation>
     </message>
     <message>
-        <location line="-624"/>
+        <location line="-642"/>
         <source>Custom</source>
         <translation>Вручну</translation>
     </message>
     <message>
-        <location line="+601"/>
+        <location line="+619"/>
         <source>Cannot save preset</source>
         <translation>Неможливо зберегти передустановку</translation>
     </message>
@@ -12304,7 +14345,7 @@
         <translation>Замінити</translation>
     </message>
     <message>
-        <location line="-672"/>
+        <location line="-690"/>
         <source>Auto</source>
         <translation>Авто</translation>
     </message>
@@ -12319,7 +14360,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+554"/>
+        <location line="+572"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -13104,7 +15145,7 @@
     </message>
     <message>
         <location line="-2966"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>Налаштування x265</translation>
     </message>
     <message>
@@ -13559,7 +15600,7 @@
     </message>
     <message>
         <location line="-36"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>2 потоки</translation>
     </message>
     <message>
@@ -13681,4 +15722,167 @@
         <translation>Нижнє поле спочатку</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_zh_CN.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>检查时间戳是否有效..</translation>
     </message>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+489"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+499"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,12 +81,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-68"/>
         <source>Attempt to open %s failed!</source>
         <translation>尝试开启 %s 失败!</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+115"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -495,7 +495,7 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1401"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1450"/>
         <source>?</source>
         <translation>?</translation>
     </message>
@@ -514,7 +514,7 @@
         <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-779"/>
+        <location line="-827"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -533,6 +533,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -542,12 +544,12 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="+317"/>
+        <location line="+331"/>
         <source>&amp;Top</source>
         <translation>上下并排(&amp;T)</translation>
     </message>
     <message>
-        <location line="-1478"/>
+        <location line="-1540"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>复制</translation>
@@ -569,17 +571,17 @@
         <translation>自动(&amp;U)</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="-22"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;File</source>
         <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-57"/>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
     </message>
@@ -589,17 +591,17 @@
         <translation>检视(&amp;V)</translation>
     </message>
     <message>
-        <location line="+1641"/>
+        <location line="+1690"/>
         <source>Open Video</source>
         <translation>开启视频</translation>
     </message>
     <message>
-        <location line="+199"/>
+        <location line="+213"/>
         <source>Si&amp;de</source>
         <translation>左右并排(&amp;D</translation>
     </message>
     <message>
-        <location line="-647"/>
+        <location line="-661"/>
         <source>Time:</source>
         <translation>时间:</translation>
     </message>
@@ -624,7 +626,7 @@
         <translation>转到第一帧 [HOME]</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-166"/>
         <source>Go to next keyframe [UP]</source>
         <translation>转到下一帧(关键帧或I帧) [UP]</translation>
     </message>
@@ -633,7 +635,7 @@
         <translation type="vanished">计算器(&amp;C)...</translation>
     </message>
     <message>
-        <location line="+458"/>
+        <location line="+506"/>
         <source>Go to marker A [PAGE UP]</source>
         <translation>转到标记 A [PAGE UP]</translation>
     </message>
@@ -644,12 +646,12 @@
         <translation>保存项目</translation>
     </message>
     <message>
-        <location line="-1671"/>
+        <location line="-1719"/>
         <source>&amp;Audio</source>
         <translation>音频(&amp;A)</translation>
     </message>
     <message>
-        <location line="+1686"/>
+        <location line="+1734"/>
         <source>&amp;Input</source>
         <translation>输入(&amp;I)</translation>
     </message>
@@ -659,33 +661,33 @@
         <translation>标志区段(&amp;S)</translation>
     </message>
     <message>
-        <location line="-1742"/>
+        <location line="-1790"/>
         <source>&amp;Tools</source>
         <translation>工具(&amp;T)</translation>
     </message>
     <message>
-        <location line="+1295"/>
+        <location line="+1343"/>
         <source>Se&amp;lection</source>
         <translation>标志区间段(&amp;L)</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-383"/>
         <source>Set end marker [CTRL+PAGEDOWN]</source>
         <translation>设定结束标记 [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+415"/>
+        <location line="+463"/>
         <location line="+16"/>
         <source>000000</source>
         <translation>000000</translation>
     </message>
     <message>
-        <location line="+379"/>
+        <location line="+393"/>
         <source>&amp;Audio Metre</source>
         <translation>音频画面(&amp;A)</translation>
     </message>
     <message>
-        <location line="-1576"/>
+        <location line="-1638"/>
         <location line="+142"/>
         <location line="+169"/>
         <location line="+181"/>
@@ -693,27 +695,27 @@
         <translation>配置</translation>
     </message>
     <message>
-        <location line="-727"/>
+        <location line="-728"/>
         <source>Vi&amp;deo</source>
         <translation>视频(&amp;D)</translation>
     </message>
     <message>
-        <location line="+857"/>
+        <location line="+858"/>
         <source>Play [SPACE]</source>
         <translation>播放 [SPACE]</translation>
     </message>
     <message>
-        <location line="+744"/>
+        <location line="+792"/>
         <source>Audio &amp;Metre</source>
         <translation>音频画面(&amp;M)</translation>
     </message>
     <message>
-        <location line="-1587"/>
+        <location line="-1636"/>
         <source>&amp;Toolbars</source>
         <translation>工具栏(&amp;T)</translation>
     </message>
     <message>
-        <location line="+1634"/>
+        <location line="+1683"/>
         <source>&amp;Open...</source>
         <translation>开启文件(&amp;O)...</translation>
     </message>
@@ -739,7 +741,7 @@
         <translation>搜寻上一帧黑框</translation>
     </message>
     <message>
-        <location line="-141"/>
+        <location line="-189"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>转到上一帧 [LEFT]</translation>
     </message>
@@ -749,7 +751,7 @@
         <translation>编译码器选项(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1585"/>
+        <location line="+1633"/>
         <source>Play filtered</source>
         <translation>过滤播放(&amp;P)</translation>
     </message>
@@ -759,7 +761,7 @@
         <translation>转到标记 B [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="-995"/>
+        <location line="-1043"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
         <translation>&lt;b&gt;输出音频编码佳AC3/Mp3&lt;/b&gt;</translation>
     </message>
@@ -769,7 +771,7 @@
         <translation>&lt;b&gt;视频输出格式(容器)佳Mp4/Mkv&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1040"/>
+        <location line="+1088"/>
         <source>&amp;Load/Run Project...</source>
         <translation>加载/执行项目(&amp;L)...</translation>
     </message>
@@ -779,32 +781,32 @@
         <translation>G转到最后一帧 [END]</translation>
     </message>
     <message>
-        <location line="-1065"/>
+        <location line="-1113"/>
         <source>&amp;Custom</source>
         <translation>自定义(&amp;C)</translation>
     </message>
     <message>
-        <location line="+1713"/>
+        <location line="+1761"/>
         <source>&amp;Output</source>
         <translation>输出(&amp;O)</translation>
     </message>
     <message>
-        <location line="-1688"/>
+        <location line="-1736"/>
         <source>&amp;Recent</source>
         <translation>最近(&amp;R)</translation>
     </message>
     <message>
-        <location line="+1089"/>
+        <location line="+1137"/>
         <source>Forward one minute</source>
         <translation>前进一分钟</translation>
     </message>
     <message>
-        <location line="-556"/>
+        <location line="-604"/>
         <source>&amp;Shift:</source>
         <translation>位移(±)(&amp;S):</translation>
     </message>
     <message>
-        <location line="+1208"/>
+        <location line="+1256"/>
         <source>&amp;Volume</source>
         <translation>音量(&amp;V)</translation>
     </message>
@@ -819,33 +821,33 @@
         <translation>前进一分钟 [CTRL+UP]</translation>
     </message>
     <message>
-        <location line="+684"/>
+        <location line="+698"/>
         <source>&amp;Separate</source>
         <translation>分离窗口(&amp;S)</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-910"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
         <translation>设定开始标记 [CTRL+PAGEUP]</translation>
     </message>
     <message>
-        <location line="-1078"/>
+        <location line="-1079"/>
         <source>Avidemux</source>
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+493"/>
+        <location line="+494"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation>过滤器-特效</translation>
     </message>
     <message>
-        <location line="+926"/>
+        <location line="+974"/>
         <source>Vol&amp;ume</source>
         <translation>音量(&amp;U)</translation>
     </message>
     <message>
-        <location line="-1353"/>
+        <location line="-1401"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;译码器.颜色.不编码直选COPY&lt;/b&gt;</translation>
     </message>
@@ -860,7 +862,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+778"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -885,12 +897,12 @@
         <translation>属性(&amp;I)...</translation>
     </message>
     <message>
-        <location line="-751"/>
+        <location line="-799"/>
         <source>Go to next frame [RIGHT]</source>
         <translation>转到下一帧</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+258"/>
         <source>Backward one minute [CTRL+DOWN]</source>
         <translation>倒退一分钟 [CTRL+DOWN]</translation>
     </message>
@@ -900,12 +912,22 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+53"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>Ctrl+Alt+M</source>
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-56"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -920,13 +942,13 @@
         <translation>Ctrl+Alt+V</translation>
     </message>
     <message>
-        <location line="-868"/>
+        <location line="-916"/>
         <source>Go to previous keyframe [DOWN]</source>
         <translation>转到上一帧(关键帧或I帧) [DOWN]</translation>
     </message>
     <message>
         <location line="-150"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>视频导航栏(&amp;N)</translation>
     </message>
@@ -1157,7 +1179,7 @@
         <translation>4MV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+231"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+232"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
@@ -1168,7 +1190,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+525"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+633"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1178,7 +1200,7 @@
         <translation>DRC</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-7"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-8"/>
         <source>DTS</source>
         <translation>DTS</translation>
     </message>
@@ -1208,7 +1230,12 @@
         <translation>MP3</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+2"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Float PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1218,14 +1245,19 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-222"/>
+        <location line="+9"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-297"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
+        <location line="+101"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-22"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1236,11 +1268,12 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-13"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-41"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+5"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -1276,12 +1309,12 @@
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+7"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+8"/>
         <source>Gain</source>
         <translation>增益</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-89"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
         <source>High</source>
         <translation>高</translation>
@@ -1307,7 +1340,7 @@
         <translation>OPUS</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-20"/>
         <source>Mono</source>
         <translation>单音</translation>
     </message>
@@ -1329,7 +1362,7 @@
         <translation>QDM2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1933"/>
+        <location filename="../../common/gui_main.cpp" line="+1985"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -1339,7 +1372,7 @@
         <translation>开启</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-42"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
         <source>SIMD</source>
         <translation>SIMD</translation>
     </message>
@@ -1369,7 +1402,7 @@
         <translation>复原</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+6"/>
         <source>_Gain mode:</source>
         <translation>增益模式:</translation>
     </message>
@@ -1380,7 +1413,7 @@
         <translation>没有音轨</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
         <source>Stereo+surround</source>
         <translation>立体+环绕</translation>
     </message>
@@ -1406,7 +1439,7 @@
         <translation>文件 %s 保存不正确。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
         <source>About</source>
         <translation>关于(&amp;U)</translation>
     </message>
@@ -1417,7 +1450,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+222"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="-606"/>
@@ -1426,17 +1459,17 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-81"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -1444,18 +1477,18 @@
         <translation>编译码器</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-107"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-96"/>
         <source>Display only error alerts</source>
         <translation>只显示错误警告</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-362"/>
+        <location filename="../../common/gui_main.cpp" line="-364"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -1474,14 +1507,14 @@
         <translation>HQ AC</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+35"/>
         <source>Mixer</source>
         <translation>混音频</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-229"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location filename="../../common/gui_savenew.cpp" line="-231"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>复合器</translation>
     </message>
@@ -1502,6 +1535,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-2"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-45"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1511,20 +1545,20 @@
         <translation>改进最大溢出(%)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-326"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-327"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location line="-198"/>
+        <location line="-200"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+200"/>
         <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1563,12 +1597,14 @@
         <translation>核心已编译，没有 VDPAUA 的支持，但它已编译应用程序，安装不匹配</translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+158"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>禁用</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-95"/>
         <source>Pro Logic II</source>
         <translation>第二代定向逻辑</translation>
     </message>
@@ -1578,17 +1614,17 @@
         <translation>不能安装视频链</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+60"/>
         <source>Decoder Option</source>
         <translation>译码器选项(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-135"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-173"/>
         <source>Enable 3DNOWEXT</source>
         <translation>启用 3DNOWEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+41"/>
         <source>Previous Black Frame</source>
         <translation>转到上一帧黑框</translation>
     </message>
@@ -1612,12 +1648,12 @@
         <translation>转变音量 (ms):</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-770"/>
+        <location filename="../../common/gui_main.cpp" line="-793"/>
         <source>Error while cutting out.</source>
         <translation>剪切时发生错误.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-55"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-56"/>
         <source>R_esampling (Hz):</source>
         <translation>重复取样 (Hz):</translation>
     </message>
@@ -1627,12 +1663,12 @@
         <translation>不能增加工作 %s</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+134"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+172"/>
         <source>Pro Logic</source>
         <translation>定向逻辑</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+691"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+693"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1642,7 +1678,7 @@
         <translation>太短</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+666"/>
+        <location filename="../../common/gui_main.cpp" line="+669"/>
         <source>Marker A &gt; B</source>
         <translation>标记 A &gt; B</translation>
     </message>
@@ -1653,23 +1689,23 @@
         <translation>请释放一些空间，然后按重试再试一次。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
         <source>Connect to avsproxy</source>
         <translation>联机至 avsproxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+97"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
         <source>GUI Rendering Options</source>
         <translation>GUI 渲染选项</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-160"/>
-        <location line="+290"/>
+        <location filename="../../common/gui_savenew.cpp" line="-162"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>不能安装复合器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+522"/>
+        <location filename="../../common/gui_main.cpp" line="+544"/>
         <source>This function is disabled or no longer valid</source>
         <translation>此功能被禁用或不再有效</translation>
     </message>
@@ -1689,7 +1725,7 @@
         <translation>立体+中央+环绕</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+68"/>
         <source>Build Option</source>
         <translation>建立选项(&amp;B)</translation>
     </message>
@@ -1720,22 +1756,32 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1753"/>
+        <location filename="../../common/gui_main.cpp" line="-1804"/>
         <source>Select script to run</source>
         <translation>选择脚本去执行</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-128"/>
         <source>No downmixing</source>
         <translation>没降混合</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-168"/>
         <source>Enable SSE2</source>
         <translation>启用 SSE2</translation>
     </message>
     <message>
-        <location line="-30"/>
+        <location line="+281"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Ignore driver blacklist (Intel)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1755,7 +1801,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-346"/>
         <source>_Swap markers if marker A is set past marker B or marker B before A in video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1775,7 +1821,7 @@
         <translation>插件-音频装置(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1244"/>
+        <location filename="../../common/gui_main.cpp" line="+1273"/>
         <source>Something bad happened</source>
         <translation>有些事发生问题</translation>
     </message>
@@ -1790,12 +1836,12 @@
         <translation>无法删除此选取范围。</translation>
     </message>
     <message>
-        <location line="-406"/>
+        <location line="-405"/>
         <source>Multiple Audio Tracks</source>
         <translation>多音轨</translation>
     </message>
     <message>
-        <location line="-417"/>
+        <location line="-428"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -1821,7 +1867,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+127"/>
         <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1881,7 +1927,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
+        <location line="+323"/>
         <source>Something failed when appending</source>
         <translation>当增加时某些事情失败</translation>
     </message>
@@ -1896,9 +1942,8 @@
         <translation>反转向上和向下箭头键进行导航</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>SDL (good)</source>
-        <translation>SDL (好)</translation>
+        <translation type="vanished">SDL (好)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-95"/>
@@ -1907,12 +1952,12 @@
         <translation>超出额配</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+119"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+238"/>
         <source>User Interface</source>
         <translation>用户接口</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+26"/>
+        <location filename="../../common/gui_savenew.cpp" line="+25"/>
         <source>Cannot open </source>
         <translation>不能开启 </translation>
     </message>
@@ -1922,7 +1967,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>G_ain value:</source>
         <translation>增益值:</translation>
     </message>
@@ -1942,7 +1987,7 @@
         <translation>最大Gop(图像群组)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-338"/>
+        <location filename="../../common/gui_savenew.cpp" line="-339"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>重用以前首先传递数据？警告，设定必须关闭.</translation>
@@ -1958,12 +2003,12 @@
         <translation>开启应用程序文件夹目录(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-168"/>
         <source>Above normal</source>
         <translation>高于一般</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-923"/>
+        <location filename="../../common/gui_main.cpp" line="-953"/>
         <source>Select script to save</source>
         <translation>选择脚本去保存</translation>
     </message>
@@ -1980,12 +2025,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+269"/>
+        <location filename="../../common/gui_main.cpp" line="+272"/>
         <source>Select Video File to Append...</source>
         <translation>选择视频去附加合并(二视带宽高比要一致)...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-33"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-55"/>
         <source>Enable SSSE3</source>
         <translation>启用 SSSE3</translation>
     </message>
@@ -2000,7 +2045,7 @@
         <translation>插件-视频译码器(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1166"/>
+        <location filename="../../common/gui_main.cpp" line="+1212"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
         <translation>无法设置音频语言：仍然未载入视频！</translation>
     </message>
@@ -2010,7 +2055,7 @@
         <translation>选择音频音轨(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
         <source>Below normal</source>
         <translation>低于一般</translation>
     </message>
@@ -2020,17 +2065,17 @@
         <translation>自动侦测</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Encoding priority:</source>
         <translation>编码优先次序:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-33"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-34"/>
         <source>Dolby Pro Logic</source>
         <translation>杜比定向逻辑</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-66"/>
         <source>Enable 3DNOW</source>
         <translation>启用 3DNOW</translation>
     </message>
@@ -2071,7 +2116,7 @@
         <translation>最小Gop(图像群组)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-677"/>
+        <location filename="../../common/gui_main.cpp" line="-696"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation>尝试 &apos;文件&apos; -&gt; &apos;加载/执行 项目...&apos;</translation>
     </message>
@@ -2081,17 +2126,17 @@
         <translation>发现没有 AAC 音频编码器插件程序。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+876"/>
+        <location filename="../../common/gui_main.cpp" line="+895"/>
         <source>Frame Hex Dump</source>
         <translation>帧十六进制转储</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+22"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+23"/>
         <source>_Mixer:</source>
         <translation>混合器:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation>音频过滤</translation>
     </message>
@@ -2106,7 +2151,7 @@
         <translation>AMR-NB</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-917"/>
+        <location filename="../../common/gui_main.cpp" line="-936"/>
         <source>Permission error</source>
         <translation>权限许可错误</translation>
     </message>
@@ -2122,14 +2167,13 @@
         <translation>核心已编译，没有 LIBVA 的支持，但它已编译应用程序，安装不匹配</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+726"/>
+        <location filename="../../common/gui_main.cpp" line="+745"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
         <translation>设定语言提供跟踪索引是不可能的：视频有没有音频檔！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+77"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (最好)</translation>
+        <translation type="vanished">OpenGL (最好)</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="+21"/>
@@ -2137,7 +2181,7 @@
         <translation>选择 JPEG 顺序进行保存</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-69"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Append</source>
         <translation>同宽高视频合并</translation>
     </message>
@@ -2160,7 +2204,7 @@
         <translation>自定义</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1261"/>
+        <location filename="../../common/gui_main.cpp" line="-1311"/>
         <source>Not coded in this version</source>
         <translation>没有编进这个版本</translation>
     </message>
@@ -2185,12 +2229,12 @@
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1021"/>
+        <location filename="../../common/gui_main.cpp" line="+1051"/>
         <source>No error found</source>
         <translation>没有找到错误</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+60"/>
         <source>Next Intra Frame</source>
         <translation>转到下一帧(关键帧或I帧)</translation>
     </message>
@@ -2211,7 +2255,7 @@
         <translation>发现编译码器内部错误</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+50"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+165"/>
         <source>Master</source>
         <translation>主要</translation>
     </message>
@@ -2241,18 +2285,18 @@
         <translation>已保存 %d 个图像。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-88"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-104"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
         <location line="+2"/>
         <source>Clear recent items</source>
         <translation>清除最近使用的 文件 及 项目</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-67"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+264"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>译码视频使用 DXVA2 (windows)</translation>
     </message>
@@ -2262,7 +2306,7 @@
         <translation>运动搜索精度</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-87"/>
         <source>Output</source>
         <translation>输出</translation>
     </message>
@@ -2272,25 +2316,25 @@
         <translation>不能建立流</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-241"/>
         <source>Enable all SIMD</source>
         <translation>启用所有 SIMD</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-11"/>
-        <source>Remix:</source>
-        <translation>重新混合:</translation>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-12"/>
+        <source>Remix</source>
+        <translation>重新混合</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>你不能删除*所有*的视频
 </translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+155"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+193"/>
         <source>_AudioDevice</source>
         <translation>音频装置</translation>
     </message>
@@ -2300,13 +2344,13 @@
         <translation>保存中</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-32"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-33"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
         <source>Stereo</source>
         <translation>立体声</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-13"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-14"/>
         <source>WMAPRO</source>
         <translation>WMAPRO</translation>
     </message>
@@ -2316,7 +2360,7 @@
         <translation>广泛搜寻</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1207"/>
+        <location filename="../../common/gui_main.cpp" line="-1236"/>
         <source>Select script to debug</source>
         <translation>选择脚本去调试</translation>
     </message>
@@ -2326,7 +2370,7 @@
         <translation>更多搜寻</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+9"/>
         <source>Ogg Vorbis</source>
         <translation>Ogg Vorbis</translation>
     </message>
@@ -2337,6 +2381,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
@@ -2346,12 +2391,12 @@
         <translation>PAL 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+76"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+81"/>
         <source>First Frame</source>
         <translation>转到第一帧(开始)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+721"/>
+        <location filename="../../common/gui_main.cpp" line="+751"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>无法开启 &quot;%s&quot;。</translation>
     </message>
@@ -2371,7 +2416,7 @@
         <translation>转到最后一帧(结束)</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-8"/>
         <source>Next Frame</source>
         <translation>转到下一帧</translation>
     </message>
@@ -2381,7 +2426,7 @@
         <translation>不能到达数据库，你有工作控制执行吗？</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+20"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+31"/>
         <source>Zoom 1:1</source>
         <translation>缩放 1:1</translation>
     </message>
@@ -2391,7 +2436,7 @@
         <translation>缩放 1:2</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-123"/>
         <source>Save as PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2401,12 +2446,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+38"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+35"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>缩放 1:4</translation>
     </message>
@@ -2426,12 +2536,11 @@
         <translation>插件-音频编码器(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (最好)</translation>
+        <translation type="vanished">DXVA2 (最好)</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+47"/>
         <source>No alerts</source>
         <translation>不显示任何警告</translation>
     </message>
@@ -2460,7 +2569,7 @@
         <translation>没有改变</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-650"/>
+        <location filename="../../common/gui_main.cpp" line="-680"/>
         <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
         <translation>你是要清除最近使用的文件和项目的列表，这不&apos;能撤销，是否继续？</translation>
     </message>
@@ -2471,17 +2580,17 @@
         <translation>Sdl 驱动程序r</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+151"/>
+        <location filename="../../common/gui_main.cpp" line="+154"/>
         <source>No engine</source>
         <translation>没有引擎</translation>
     </message>
     <message>
-        <location line="+503"/>
+        <location line="+530"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; 不存在。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-128"/>
         <source>Save as BMP</source>
         <translation>另存 BMP</translation>
     </message>
@@ -2491,7 +2600,7 @@
         <translation>建立时间轴</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-133"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+182"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>译码视频使用 VDPAU (NVIDIA)</translation>
     </message>
@@ -2502,12 +2611,12 @@
         <translation>你没&apos;有FAAC!，它是建立 PSP 兼容视频所需。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+52"/>
         <source>Load saved settings</source>
         <translation>加载保存设定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+911"/>
+        <location filename="../../common/gui_main.cpp" line="+930"/>
         <source>Frame size:</source>
         <translation>帧大小:</translation>
     </message>
@@ -2517,14 +2626,13 @@
         <translation>帧类型:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+24"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+25"/>
         <source>Plugins</source>
         <translation>插件程序(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+93"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (最好)</translation>
+        <translation type="vanished">VDPAU (最好)</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-129"/>
@@ -2538,7 +2646,7 @@
         <translation>NTSC 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+279"/>
+        <location filename="../../common/gui_savenew.cpp" line="+281"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
@@ -2547,7 +2655,7 @@
 您要继续吗 ?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-910"/>
+        <location filename="../../common/gui_main.cpp" line="-929"/>
         <source>File error</source>
         <translation>文件错误</translation>
     </message>
@@ -2562,12 +2670,12 @@
         <translation>%d 分(s)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
         <source>_Volume control:</source>
         <translation>音量控制:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+95"/>
         <source>Default Postprocessing</source>
         <translation>默认的后置处理</translation>
     </message>
@@ -2587,7 +2695,7 @@
         <translation>x86-64</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+466"/>
+        <location filename="../../common/gui_main.cpp" line="+465"/>
         <source>Checking video</source>
         <translation>正在检查视频</translation>
     </message>
@@ -2597,24 +2705,23 @@
         <translation>另存 %s 为 BMP 档失败。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-272"/>
         <source>_Enable alternative keyboard shortcuts</source>
         <translation>启用备用的键盘快捷方式</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="+343"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>译码视频使用 LIBVA (INTEL)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-430"/>
+        <location filename="../../common/gui_main.cpp" line="-429"/>
         <source>Cannot open project using the video loader.</source>
         <translation>使用视频加载器时无法开启项目。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+101"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (最好)</translation>
+        <translation type="vanished">LIBVA (最好)</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
@@ -2627,7 +2734,7 @@
         <translation>选择文件进行保存</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-45"/>
         <source>_Limit Refresh Rate</source>
         <translation>限制重整速率</translation>
     </message>
@@ -2647,17 +2754,17 @@
         <translation>重复取样频率 (Hz)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+690"/>
+        <location filename="../../common/gui_main.cpp" line="+709"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
         <translation>设定的语言无法提供跟踪索引：无效跟踪指标！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-212"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>默认为保存最后读取文件的目录</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+147"/>
         <source>_Language</source>
         <translation>语言</translation>
     </message>
@@ -2667,7 +2774,7 @@
         <translation>没有文件加载</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-630"/>
+        <location filename="../../common/gui_main.cpp" line="-649"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation>这文件刚刚加载包含一些音频轨道。
@@ -2679,12 +2786,12 @@
         <translation>视频编码器</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+142"/>
         <source>Threading</source>
         <translation>线程</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-105"/>
         <source>_Strength:</source>
         <translation>强度:</translation>
     </message>
@@ -2699,22 +2806,47 @@
         <translation>保存工作</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-267"/>
         <source>_Check for new release</source>
         <translation>检查有新版本</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+14"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
         <source>Multi-threading is disabled internally if HW accelerated decoding is enabled, restart application to apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>_Indexing/unpacking priority:</source>
         <translation>索引/拆开打包的优先次序:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,7 +2861,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2739,11 +2901,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+138"/>
         <source>De_ringing</source>
         <translation>去除环状色斑</translation>
     </message>
     <message>
+        <location line="-24"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
         <source>_Deringing</source>
         <translation>去除环状色斑</translation>
@@ -2764,7 +2957,7 @@
         <translation>关键帧提高(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-159"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-236"/>
         <source>Enable MMX</source>
         <translation>启用 MMX</translation>
     </message>
@@ -2774,7 +2967,7 @@
         <translation>启用 SSE</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+333"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>如果你使用硬件译码，最好使用匹配的显示驱动程序</translation>
     </message>
@@ -2785,14 +2978,12 @@
         <translation>文件系统已满</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+270"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+20"/>
         <source>HW Accel</source>
         <translation>HW 硬件加速器</translation>
     </message>
     <message>
-        <location line="-271"/>
+        <location line="-368"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>同意在 DVD 使用非标准的音频频率</translation>
     </message>
@@ -2807,7 +2998,7 @@
         <translation>启用 MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-83"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
         <source>Information</source>
         <translation>属性(&amp;I)</translation>
     </message>
@@ -2827,12 +3018,12 @@
         <translation>音频轨道有必要建立这样的档</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+566"/>
+        <location filename="../../common/gui_main.cpp" line="+585"/>
         <source>Cannot use that file as audio track</source>
         <translation>不能使用该档作为音频轨道</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+48"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
         <source>Prioritisation</source>
         <translation>优化</translation>
     </message>
@@ -2852,17 +3043,17 @@
         <translation>非常高</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1415"/>
+        <location filename="../../common/gui_main.cpp" line="-1464"/>
         <source>Select script/project to run</source>
         <translation>选择要执行的脚本/项目</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+223"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+23"/>
         <source>_Always ask which port to use</source>
         <translation>制作视频始终询问要使用哪个埠(Avidemux+Avisynth)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+98"/>
         <source>Go To Marker A</source>
         <translation>将标记A(选择开始)</translation>
     </message>
@@ -2877,7 +3068,7 @@
         <translation>前段立体+后段立体</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-60"/>
         <source>Pr&amp;eferences</source>
         <translation>首选项-偏好设定(&amp;E)</translation>
     </message>
@@ -2887,7 +3078,7 @@
         <translation>低比特率的场景（%）</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>音频装置初始化时发生问题</translation>
     </message>
@@ -2898,7 +3089,7 @@
         <translation>核心已编译，没有 XVBA 的支持，但它已编译应用程序，安装不匹配</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-182"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+33"/>
         <source>Video _display:</source>
         <translation>视频 显示:</translation>
     </message>
@@ -2909,17 +3100,17 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+131"/>
         <source>_Vertical deblocking</source>
         <translation>去除垂直方向块状色斑</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1239"/>
+        <location filename="../../common/gui_main.cpp" line="+1268"/>
         <source>Errors found in %u frames</source>
         <translation>在 %u 帧中发现错误</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-81"/>
         <source>_Local playback downmixing:</source>
         <translation>局部倒带降混合:</translation>
     </message>
@@ -2944,7 +3135,7 @@
         <translation>自由型 2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-671"/>
+        <location filename="../../common/gui_main.cpp" line="-674"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>剪切</translation>
@@ -2970,12 +3161,12 @@
         <translation>不到一分钟</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+52"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
         <source>Next Black Frame</source>
         <translation>转到下一帧黑框</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+163"/>
         <source>Display</source>
         <translation>显示</translation>
     </message>
@@ -2990,7 +3181,7 @@
         <translation>前往时间点</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-266"/>
         <source>Multi-threading</source>
         <translation>多线程</translation>
     </message>
@@ -3015,37 +3206,37 @@
         <translation>PAL 转成 Film</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-64"/>
         <source>Reset Markers</source>
         <translation>取消标记</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+40"/>
         <source>Default port to use</source>
         <translation>制作视频要使用默认埠(Avidemux)</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="+65"/>
         <source>_Message level:</source>
         <translation>信息等级:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+671"/>
+        <location filename="../../common/gui_main.cpp" line="+674"/>
         <source>You can&apos;t remove all frames</source>
         <translation>你不&apos;能移除所有的帧</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+37"/>
         <source>&amp;Advanced</source>
         <translation>高级(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-135"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+132"/>
         <source>Enable openGl support</source>
         <translation>启用openGl支援</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1010"/>
+        <location filename="../../common/gui_main.cpp" line="-1036"/>
         <source>tinyPy script is not enabled in this build</source>
         <translation>在生成中未启用 tinyPy 脚本</translation>
     </message>
@@ -3059,13 +3250,13 @@
         <translation>输出文件</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-25"/>
-        <location line="+73"/>
+        <location filename="../../common/gui_main.cpp" line="-29"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>选择视频檔...</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+3"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
         <source>Unknown codec</source>
         <translation>未知的编译码器</translation>
     </message>
@@ -3086,19 +3277,19 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-51"/>
         <source>Reset Edit</source>
         <translation>取消编辑(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1325"/>
+        <location filename="../../common/gui_main.cpp" line="+1371"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation>无法联机到 avs代理，
 要继续执行吗?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+17"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+19"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>将当前设置保存为默认值</translation>
@@ -3120,13 +3311,12 @@
         <translation>MP3 编译码器不允许禁用资源，安装了 lame插件程序</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-49"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-51"/>
         <source>Save as Image</source>
         <translation>另存图片(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+292"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
         <source>Preferences</source>
         <translation>首选项-偏好设定</translation>
     </message>
@@ -3151,7 +3341,7 @@
         <translation>交错扫描</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+79"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
         <source>Open Application &amp;Log</source>
         <translation>开启应用程序Log(&amp;L)</translation>
     </message>
@@ -3169,7 +3359,7 @@
         <translation>过滤器(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-255"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-334"/>
         <source>_lavc threads:</source>
         <translation>lavc 线程:</translation>
     </message>
@@ -3184,12 +3374,12 @@
         <translation>灰阶</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+205"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+240"/>
         <source>Refresh Rate Cap (ms)</source>
         <translation>重整速率上限 (ms)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-28"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
         <source>Set Marker A</source>
         <translation>设定标记 A</translation>
     </message>
@@ -3215,7 +3405,7 @@
         <translation>卡通模式</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
         <source>Previous Frame</source>
         <translation>转到上一帧</translation>
     </message>
@@ -3225,7 +3415,7 @@
         <translation>AvsProxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-186"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-220"/>
         <source>_Playback priority:</source>
         <translation>倒带优先次序:</translation>
     </message>
@@ -3236,7 +3426,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+110"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+188"/>
         <source>_Horizontal deblocking</source>
         <translation>去除水平方向块状色斑</translation>
     </message>
@@ -3256,7 +3446,7 @@
         <translation>Gettext</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-88"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
         <source>Save as JPEG</source>
         <translation>另存JPEG</translation>
     </message>
@@ -3266,7 +3456,7 @@
         <translation>2通</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-834"/>
+        <location filename="../../common/gui_main.cpp" line="-853"/>
         <source>Could not open the file</source>
         <translation>无法开启此文件</translation>
     </message>
@@ -3301,19 +3491,18 @@
         <translation>介...是减少(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+90"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
         <source>Previous Intra Frame</source>
         <translation>转到上一帧(关键帧或I帧)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+16"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-59"/>
         <source>System language</source>
         <translation>系统语言</translation>
     </message>
     <message>
-        <location line="-103"/>
         <source>XVideo (best)</source>
-        <translation>XVideo (最好)</translation>
+        <translation type="vanished">XVideo (最好)</translation>
     </message>
     <message>
         <location filename="../../common/gui_main.cpp" line="+279"/>
@@ -3328,7 +3517,7 @@
         <translation>音频编码器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+159"/>
+        <location filename="../../common/gui_main.cpp" line="+158"/>
         <source>Something bad happened (II)</source>
         <translation>不幸的事情发生 (II)</translation>
     </message>
@@ -3345,12 +3534,12 @@
         <translation>选择文件来保存音频</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+168"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
         <translation>未找到在清单中，即使它应该有的音频档，建立一个错误报告！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-36"/>
         <source>PostProcessing</source>
         <translation>后置处理(&amp;O)</translation>
     </message>
@@ -3385,7 +3574,7 @@
         <translation>内部开启错误中 0x%x</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-922"/>
+        <location filename="../../common/gui_main.cpp" line="-945"/>
         <source>Are you sure?</source>
         <translation>确定吗?</translation>
     </message>
@@ -3409,6 +3598,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+73"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3437,6 +3675,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3483,6 +3778,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3589,6 +4026,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3620,9 +4165,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3640,35 +4211,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3780,11 +4356,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown flag</source>
         <translation type="vanished">未知的标志</translation>
     </message>
@@ -3800,7 +4371,7 @@
 <context>
     <name>ass</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+224"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
@@ -3827,7 +4398,7 @@
         <translation>这是一个 SRT 档，将转换为 SSA？</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-19"/>
         <source>Botto_m margin:</source>
         <translation>底部边界:</translation>
     </message>
@@ -3842,33 +4413,33 @@
         <translation>你确认是ASS/SSA档吗?</translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+234"/>
         <source>SSA Error</source>
         <translation>SSA错误</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-194"/>
         <source>Select Subtitle File</source>
         <translation>选择字幕档</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+194"/>
         <source>ass_read_file() failed for %s</source>
         <translation>无法读取文件为 %s</translation>
     </message>
     <message>
-        <location line="-187"/>
+        <location line="-193"/>
         <source>_Line spacing:</source>
         <translation>行距:</translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+104"/>
         <source>Preparing the fonts can take a few minutes the first time.
 This message will not be displayed again.</source>
         <translation>准备的字体可以花几分钟第一次，不会再显示此消息。</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-102"/>
         <source>_Top margin:</source>
         <translation>顶部边界:</translation>
     </message>
@@ -3888,12 +4459,12 @@
         <translation>字幕檔(ASS/SSA):</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3903,12 +4474,12 @@
         <translation>不能转换SSA檔.</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-166"/>
         <source>Hardcode ASS/SSA/SRT subtitles using libass.</source>
         <translation>编码-扩展名兼容的.ass/.ssa/.srt字幕，请汇入文本檔。</translation>
     </message>
     <message>
-        <location line="+169"/>
+        <location line="+175"/>
         <source>Cannot save converted file.</source>
         <translation>不能保存转换档.</translation>
     </message>
@@ -3917,6 +4488,26 @@
     <name>avimuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>复合格式</translation>
     </message>
@@ -4090,7 +4681,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>1.3-加入内边框填黑-框厚度不限</translation>
     </message>
@@ -4146,19 +4737,18 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>黑帧</translation>
+        <translation type="vanished">黑帧</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>搜寻黑帧.</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>This function is unsupported at the moment</source>
-        <translation>此函数不受支持的那一刻</translation>
+        <translation type="vanished">此函数不受支持的那一刻</translation>
     </message>
 </context>
 <context>
@@ -4185,14 +4775,80 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+243"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+252"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location line="-200"/>
+        <location line="-209"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
@@ -4207,12 +4863,12 @@
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+211"/>
         <source>Invalid fps</source>
         <translation>无效FPS(帧数/秒)</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-212"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
@@ -4227,7 +4883,7 @@
         <translation>1.0-改变帧速度</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+170"/>
         <source>Change fps</source>
         <translation>改变FPS(帧数/秒)</translation>
     </message>
@@ -4242,22 +4898,22 @@
         <translation>目的地帧播放速率 :</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-197"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (Film)</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+191"/>
         <source>Source Fps:</source>
         <translation>源头 Fps :</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-155"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation>视频快慢改变fps(帧/秒)的速度，这过滤可以改变时间.</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+160"/>
         <source>Destination Fps:</source>
         <translation>目的地 Fps:</translation>
     </message>
@@ -4294,6 +4950,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4456,14 +5172,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>3.2-对比</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>亮度</translation>
     </message>
@@ -4482,12 +5198,11 @@
         <translation>对比</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Process</source>
-        <translation>序列</translation>
+        <translation type="vanished">序列</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+95"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4563,7 +5278,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>1.2-剪切视频边框尺寸</translation>
     </message>
@@ -4573,7 +5288,7 @@
         <translation>剪切过滤</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>复位的宽度！剪切太多宽度的警告！
@@ -4587,12 +5302,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4607,13 +5323,13 @@
     </message>
     <message>
         <location line="+45"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+112"/>
         <source>Top:</source>
         <translation>顶部:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-74"/>
         <source>Left:</source>
         <translation>左:</translation>
     </message>
@@ -4624,13 +5340,13 @@
     </message>
     <message>
         <location line="-50"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Right:</source>
         <translation>右:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Bottom:</source>
         <translation>底部:</translation>
     </message>
@@ -4640,17 +5356,17 @@
         <translation>自动剪裁</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+85"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+177"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4696,7 +5412,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4715,6 +5431,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+92"/>
@@ -4806,6 +5558,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4890,6 +5758,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4900,37 +5781,37 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+480"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+512"/>
         <location line="+31"/>
         <location line="+60"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-412"/>
+        <location line="-460"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+247"/>
+        <location line="+295"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
         <translation>0 MB</translation>
     </message>
     <message>
-        <location line="-288"/>
+        <location line="-336"/>
         <source>High</source>
         <translation>高</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-81"/>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <location line="+247"/>
+        <location line="+8"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>无</translation>
@@ -4941,12 +5822,12 @@
         <translation>音频编译码器:</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-241"/>
         <source>Priority:</source>
         <translation>优先权:</translation>
     </message>
     <message>
-        <location line="+292"/>
+        <location line="+340"/>
         <source>Video Size:</source>
         <translation>视频大小:</translation>
     </message>
@@ -4956,12 +5837,12 @@
         <translation>音频大小:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-296"/>
         <source>Above Normal</source>
         <translation>高于一般</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+253"/>
         <source>Video Codec:</source>
         <translation>视频编译码器:</translation>
     </message>
@@ -4971,12 +5852,12 @@
         <translation>已处理的帧:</translation>
     </message>
     <message>
-        <location line="-336"/>
+        <location line="-384"/>
         <source>Below Normal</source>
         <translation>低于一般</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+448"/>
         <source>Elapsed:</source>
         <translation>经过时间:</translation>
     </message>
@@ -4991,32 +5872,32 @@
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-511"/>
+        <location line="-512"/>
         <source>Time Remaining:</source>
         <translation>剩余时间:</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+52"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-76"/>
         <source>Phase:</source>
         <translation>阶段:</translation>
     </message>
     <message>
-        <location line="+416"/>
+        <location line="+472"/>
         <source>Quantiser:</source>
         <translation>量化器:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation>完成后关闭计算器</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+168"/>
         <source>Pause / Abort</source>
         <translation>暂停 / 停止</translation>
     </message>
@@ -5031,17 +5912,27 @@
         <translation>容器:</translation>
     </message>
     <message>
-        <location line="-316"/>
+        <location line="-348"/>
         <source>Encoding...</source>
         <translation>正在编码...</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+129"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>缩到工具栏上</translation>
     </message>
@@ -5056,8 +5947,8 @@
         <translation>帧/秒:</translation>
     </message>
     <message>
-        <location line="-504"/>
-        <location line="+254"/>
+        <location line="-536"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -5070,7 +5961,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>重新设定</translation>
     </message>
@@ -5088,7 +5979,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+246"/>
         <source>Red</source>
         <translation>红</translation>
     </message>
@@ -5113,18 +6004,18 @@
         <translation>加重</translation>
     </message>
     <message>
-        <location line="-177"/>
+        <location line="-170"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation>对比</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;珈码&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>饱和度</translation>
     </message>
@@ -5133,11 +6024,6 @@
         <source>Brightness</source>
         <translation>亮度</translation>
     </message>
-    <message>
-        <location line="+40"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5158,9 +6044,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>1.4-淡化效果</translation>
@@ -5406,7 +6781,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+271"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+284"/>
         <source>Three threads</source>
         <translation>三个线程</translation>
     </message>
@@ -5532,7 +6907,7 @@
     </message>
     <message>
         <location line="-58"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>两个线程</translation>
     </message>
     <message>
@@ -5609,7 +6984,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+210"/>
         <source>Three threads</source>
         <translation>三个线程</translation>
     </message>
@@ -5710,7 +7085,7 @@
     </message>
     <message>
         <location line="-21"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>两个线程</translation>
     </message>
     <message>
@@ -6117,12 +7492,12 @@
 <context>
     <name>ffpsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>自由</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>复合器格式</translation>
     </message>
@@ -6132,7 +7507,7 @@
         <translation>Mpeg PS 复合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+209"/>
         <source> video not compatible
 </source>
         <translation> 视频不相容
@@ -6182,12 +7557,12 @@
 </translation>
     </message>
     <message>
-        <location line="-200"/>
+        <location line="-201"/>
         <source>[Mismatch]</source>
         <translation>[Mismatch]</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+166"/>
         <source> Bad width/height for DVD
 </source>
         <translation> 不对的宽度/高度为 DVD
@@ -6241,15 +7616,78 @@
         <translation>VBR 复合</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>保存 mpeg TS (ff)</translation>
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6343,6 +7781,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6856,16 +8466,11 @@
         <source>Saturation</source>
         <translation>饱和度</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+114"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+112"/>
         <source>Type:</source>
         <translation>型:</translation>
     </message>
@@ -6875,7 +8480,7 @@
         <translation>HuffYUV配置</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-7"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6899,6 +8504,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+17"/>
@@ -6924,8 +8605,8 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+142"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+431"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+430"/>
         <source>Fast</source>
         <translation>快</translation>
     </message>
@@ -6936,8 +8617,8 @@
         <translation>全部</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-5"/>
+        <location line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-4"/>
         <source>_Noise:</source>
         <translation>噪声:</translation>
     </message>
@@ -6953,30 +8634,30 @@
         <translation>删除重复：</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+14"/>
+        <location line="+11"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+11"/>
         <source>DupeRemover</source>
         <translation>删除重复的帧</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-349"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-346"/>
         <source>Remove IVTC dupe.</source>
         <translation>2.6-删除重复的帧(IVTC)。</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-8"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+341"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-6"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+340"/>
         <source>VeryFast</source>
         <translation>非常快</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>帧率改变:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-345"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-342"/>
         <source>Remove the duplicate frames present after ivtc.</source>
         <translation>删除重复的帧(IVTC)和PAL智能型一样.</translation>
     </message>
@@ -7146,12 +8827,11 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+103"/>
         <source>_ColorSpace:</source>
-        <translation>色彩空间：</translation>
+        <translation type="vanished">色彩空间：</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+104"/>
         <source>Mjpeg Configuration</source>
         <translation>Mjpeg 配置</translation>
     </message>
@@ -7161,12 +8841,17 @@
         <translation>量化器:</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-3"/>
         <source>YUV420</source>
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7318,7 +9003,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>比特率:</translation>
     </message>
@@ -7492,6 +9177,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7507,7 +9248,7 @@
 <context>
     <name>mainFilterDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+135"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+144"/>
         <source>Noise</source>
         <translation>噪声-清除</translation>
     </message>
@@ -7522,12 +9263,17 @@
         <translation>关闭(&amp;C)</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-311"/>
         <source>Video Filter Manager</source>
         <translation>视频过滤管理器</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <source>Colors</source>
         <translation>色彩-特效</translation>
     </message>
@@ -7557,12 +9303,12 @@
         <translation>预览(&amp;P)</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-212"/>
         <source>Transform</source>
         <translation>变形(转型)</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>Sharpness</source>
         <translation>锐利-特效</translation>
     </message>
@@ -7585,12 +9331,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+591"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+634"/>
         <source>Matroska clusters</source>
         <translation>Matroska 集群</translation>
     </message>
     <message>
-        <location line="-544"/>
+        <location line="-586"/>
         <source>Matroska Images</source>
         <translation>Matroska 图像</translation>
     </message>
@@ -7696,7 +9442,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8068,12 +9814,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>读取 SVQ3 档头时发生问题</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8203,7 +9950,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+107"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+108"/>
         <source>Video track is incompatible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8233,7 +9980,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
+        <location line="+204"/>
         <source>Saving PSP</source>
         <translation>保存 PSP</translation>
     </message>
@@ -8243,7 +9990,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
         <source>Saving mp4</source>
         <translation>保存 mp4</translation>
     </message>
@@ -8253,7 +10005,7 @@
         <translation>复合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-191"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-198"/>
         <source>Unsupported</source>
         <translation>未支援的</translation>
     </message>
@@ -8261,7 +10013,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
@@ -8271,7 +10023,12 @@
         <translation>视频</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-121"/>
         <source>Audio format not supported, only AAC/MP3/AC3</source>
         <translation>音频格式不受支持，只有 AAC/MP3/AC3</translation>
     </message>
@@ -8377,7 +10134,7 @@
         <translation>预览</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>你可以重设大小使用支配的红色矩形 </translation>
     </message>
@@ -8398,12 +10155,12 @@
 <context>
     <name>msharpenDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+133"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+73"/>
         <source>Mask</source>
         <translation>掩码</translation>
     </message>
     <message>
-        <location line="-34"/>
+        <location line="-7"/>
         <source>Threshold</source>
         <translation>界限值</translation>
     </message>
@@ -8413,45 +10170,40 @@
         <translation>高质量</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-31"/>
         <source>MSharpen</source>
         <translation>5.2-运动锐化(Msharpen)</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+38"/>
         <source>Strength</source>
         <translation>强度</translation>
     </message>
-    <message>
-        <location line="+51"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+494"/>
+        <location filename="../../common/gui_navigate.cpp" line="+839"/>
         <source>Seek</source>
         <translation>寻求</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-486"/>
         <source>Cannot go to previous keyframe</source>
         <translation>转到上一帧(关键帧或I帧)</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-66"/>
         <source>Cannot go to next keyframe</source>
         <translation>转到下一帧(关键帧或I帧)</translation>
     </message>
@@ -8560,9 +10312,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>不正常的标头</translation>
     </message>
@@ -8575,7 +10327,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8638,7 +10390,7 @@
 <context>
     <name>propsDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+311"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+325"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
@@ -8648,28 +10400,26 @@
         <translation>音频</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-163"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+236"/>
         <source>Bitrate:</source>
         <translation>比特率:</translation>
     </message>
     <message>
-        <location line="-83"/>
         <source>Extra data :</source>
-        <translation>额外的数据:</translation>
+        <translation type="vanished">额外的数据:</translation>
     </message>
     <message>
-        <location line="-42"/>
         <source>Extra Video Properties</source>
-        <translation>额外的视频属性</translation>
+        <translation type="vanished">额外的视频属性</translation>
     </message>
     <message>
-        <location line="-52"/>
-        <location line="+135"/>
+        <location line="-184"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>总持续时间:</translation>
     </message>
@@ -8679,27 +10429,63 @@
         <translation>编译码器:</translation>
     </message>
     <message>
-        <location line="-125"/>
         <source>ExtraDataSize:</source>
-        <translation>额外的数据大小：</translation>
+        <translation type="vanished">额外的数据大小：</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="-270"/>
         <source>Properties</source>
         <translation>属性(&amp;I)</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+30"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-212"/>
         <source>Image Size:</source>
         <translation>图像大小(DAR):</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+21"/>
         <source>Frame Rate:</source>
         <translation>帧率:</translation>
     </message>
     <message>
-        <location line="+170"/>
+        <location line="+28"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Variable Bitrate:</source>
         <translation>可变比特率(VBR):</translation>
     </message>
@@ -8719,7 +10505,7 @@
         <translation>频率:</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-142"/>
         <source>Codec 4CC:</source>
         <translation>编译码器 4CC:</translation>
     </message>
@@ -8729,13 +10515,8 @@
         <translation>像素比例(PAR):</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>文本标签</translation>
+        <translation type="vanished">文本标签</translation>
     </message>
 </context>
 <context>
@@ -8760,38 +10541,38 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+517"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+522"/>
         <source>copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location line="-363"/>
+        <location line="-366"/>
         <location line="+161"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+136"/>
         <source>File </source>
         <translation>文件 </translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-136"/>
         <source>Some tracks are used multiple times</source>
         <translation>一些轨道使用多次</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>轨 </translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>.... Add audio track</source>
         <translation>....增加音频轨</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-354"/>
         <source>Select audio file</source>
         <translation>将选择音频文件</translation>
     </message>
@@ -8801,7 +10582,7 @@
         <translation>不能使用该档作为音频轨道</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+289"/>
         <source> from video</source>
         <translation> 来至视频</translation>
     </message>
@@ -8809,44 +10590,48 @@
 <context>
     <name>qencoding</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+406"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+469"/>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location line="-341"/>
+        <location line="-404"/>
         <location line="+20"/>
         <source>Privileges Required</source>
         <translation>需要特殊权限</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>Pass 1</source>
-        <translation>通过 1</translation>
+        <translation type="vanished">通过 1</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+384"/>
         <source>Resume</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location line="-341"/>
+        <location line="-404"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
         <translation>需要 Root 权限来实行这项操作。</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>快速第1通</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>编码中...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>编码已经暂停。您要继续或中止?</translation>
     </message>
@@ -8874,64 +10659,89 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2293"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2740"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-1142"/>
         <source>Set start marker</source>
         <translation>设定开始标记</translation>
     </message>
     <message>
-        <location line="-825"/>
+        <location line="-884"/>
         <source>Recent Projects</source>
         <translation>最近使用的 项目(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1558"/>
+        <location line="+1777"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>应用程序遇到了一个致命的问题
 当前编辑已保保存, 将在下一开始重载</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-901"/>
         <source>Go to previous keyframe</source>
         <translation>转到上一帧(关键帧或I帧)</translation>
     </message>
     <message>
-        <location line="-1068"/>
+        <location line="-1330"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>最近使用的 文件(&amp;F)</translation>
     </message>
     <message>
+        <location line="+33"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+256"/>
         <source>Go to next keyframe</source>
         <translation>转到下一帧(关键帧或I帧)</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Backward one minute</source>
         <translation>倒退一分钟</translation>
     </message>
     <message>
-        <location line="+1002"/>
+        <location line="+420"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+671"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+80"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8939,17 +10749,17 @@
         </translation>
     </message>
     <message>
-        <location line="-1337"/>
+        <location line="-1548"/>
         <source>Go to first frame</source>
         <translation>转到第一帧</translation>
     </message>
     <message>
-        <location line="-30"/>
+        <location line="-38"/>
         <source>Play/Stop</source>
         <translation>播放/停止</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+46"/>
         <source>Go to marker A</source>
         <translation>转到标记A(选择开始)</translation>
     </message>
@@ -8959,17 +10769,17 @@
         <translation>转到标记B(选择结束)</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="-26"/>
         <source>Set end marker</source>
         <translation>设定结束标记</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+48"/>
         <source>Forward one minute</source>
         <translation>前进一分钟</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-68"/>
         <source>Go to previous frame</source>
         <translation>转到上一帧</translation>
     </message>
@@ -8979,7 +10789,7 @@
         <translation>转到下一帧</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Go to last frame</source>
         <translation>转到最后一帧</translation>
     </message>
@@ -9017,12 +10827,12 @@
         <translation>参考脚本</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+180"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-236"/>
         <source>&amp;Run Project...</source>
         <translation>执行项目(&amp;R)...</translation>
     </message>
@@ -9132,22 +10942,33 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+690"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+844"/>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+240"/>
         <source>Save video filters..</source>
         <translation>保存视频过滤器..</translation>
     </message>
     <message>
-        <location line="-280"/>
+        <location line="-388"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>局部</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-490"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+402"/>
         <source>Move up</source>
         <translation>向上移动</translation>
     </message>
@@ -9157,33 +10978,64 @@
         <translation>配置</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+106"/>
+        <location line="+2"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-349"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>区段</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+0"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>向下移动</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>载入视频过滤器..</translation>
     </message>
     <message>
-        <location line="-414"/>
+        <location line="-569"/>
         <source>This filter cannot be made partial</source>
         <translation>无法将此过滤器局部播放</translation>
     </message>
@@ -9191,7 +11043,7 @@
 <context>
     <name>qprocessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+163"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+165"/>
         <source>_Resume</source>
         <translation>恢复</translation>
     </message>
@@ -9201,12 +11053,12 @@
         <translation>取消它吗?</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-98"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+97"/>
         <source>The processing is paused.</source>
         <translation>序列暂停.</translation>
     </message>
@@ -9223,8 +11075,23 @@
         <source>Yes</source>
         <translation>是</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9237,101 +11104,86 @@
         <translation>单音</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Audio</source>
-        <translation>音频</translation>
+        <translation type="vanished">音频</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>Video</source>
-        <translation>视频</translation>
+        <translation type="vanished">视频</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Image Size:	</source>
-        <translation>图片大小(DAR):	</translation>
+        <translation type="vanished">图片大小(DAR):	</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+155"/>
         <source>No Audio</source>
         <translation>没音频</translation>
     </message>
     <message>
-        <location line="-38"/>
         <source>Frame Rate:	</source>
-        <translation>帧率:	</translation>
+        <translation type="vanished">帧率:	</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Extra data:	</source>
-        <translation>额外数据：:	</translation>
+        <translation type="vanished">额外数据：:	</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>Aspect Ratio:	</source>
-        <translation>像素比例(PAR):	</translation>
+        <translation type="vanished">像素比例(PAR):	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra Video Properties</source>
-        <translation>额外视频属性</translation>
+        <translation type="vanished">额外视频属性</translation>
     </message>
     <message>
-        <location line="-132"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Channels:	</source>
-        <translation>频道:	</translation>
+        <translation type="vanished">频道:	</translation>
     </message>
     <message>
-        <location line="-33"/>
         <source>Codec 4CC:	</source>
-        <translation>编译码器 4CC:	</translation>
+        <translation type="vanished">编译码器 4CC:	</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-16"/>
         <source>Stereo</source>
         <translation>立体声</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Codec:		</source>
-        <translation>编译码器：		</translation>
+        <translation type="vanished">编译码器：		</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-104"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+163"/>
         <source>Bitrate:	</source>
-        <translation>比特率:	</translation>
+        <translation type="vanished">比特率:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>频率:	</translation>
+        <translation type="vanished">频率:	</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>ExtraDataSize:	</source>
-        <translation>额外的数据大小：	</translation>
+        <translation type="vanished">额外的数据大小：	</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>总持续时间：	</translation>
+        <translation type="vanished">总持续时间：	</translation>
     </message>
 </context>
 <context>
@@ -9407,6 +11259,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9427,7 +11336,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9488,7 +11397,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+47"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
@@ -9508,50 +11417,70 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>1.0-调整帧速度(重新取样)-用在数码转换DVD</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+366"/>
         <source>Resample fps</source>
         <translation>重新取样 fps</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location line="+322"/>
+        <location line="+399"/>
         <source>_Mode:</source>
         <translation>模式:</translation>
     </message>
     <message>
-        <location line="-320"/>
+        <location line="-397"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (电影)</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>结束时间仍然一样，例如15 fps电影从数码转换 DVD，一般PC上看不出来效果。</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>_New frame rate:</source>
         <translation>新帧率:</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+83"/>
         <source>swScale Resizer.</source>
         <translation>调整比例像素大小。</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>宽度和高度不能为奇数</translation>
     </message>
@@ -9590,12 +11519,12 @@
         <translation type="vanished">目的檔:</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation>双线性</translation>
     </message>
     <message>
-        <location line="-75"/>
+        <location line="-102"/>
         <source>Error X / Y:</source>
         <translation>错误 X / Y:</translation>
     </message>
@@ -9661,7 +11590,17 @@
         <translation>百分比</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+119"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <source>Lanczos-3</source>
         <translation>Lanczos-3三阶线性</translation>
     </message>
@@ -9671,7 +11610,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-15"/>
         <source>Bicubic</source>
         <translation>双立方</translation>
     </message>
@@ -9680,7 +11624,7 @@
         <translation type="vanished">来源:</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-310"/>
         <source>Round to the Nearest Multiple of 16</source>
         <translation>被最接近16倍整除的四舍五入整数</translation>
     </message>
@@ -9695,7 +11639,7 @@
         <translation>高度:</translation>
     </message>
     <message>
-        <location line="+315"/>
+        <location line="+342"/>
         <source>Resize Method:</source>
         <translation>重设大小方式:</translation>
     </message>
@@ -9703,38 +11647,40 @@
 <context>
     <name>rotate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+209"/>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+206"/>
         <source>None</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Angle:</source>
         <translation>角度:</translation>
     </message>
     <message>
-        <location line="-161"/>
-        <location line="+163"/>
+        <location line="-159"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>1.1-顺时针旋转</translation>
     </message>
     <message>
-        <location line="-5"/>
+        <location line="-6"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 度</translation>
     </message>
@@ -9744,12 +11690,17 @@
         <translation>270 度</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="-2"/>
         <source>90 degrees</source>
         <translation>90 度</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-154"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>旋转图片90/180/270度.</translation>
     </message>
@@ -9757,7 +11708,7 @@
 <context>
     <name>seekablePreviewDialog</name>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+93"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+129"/>
         <source>&gt;</source>
         <translation>&gt;</translation>
     </message>
@@ -9777,7 +11728,17 @@
         <translation>播放/停止</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="-19"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>后一分钟</translation>
     </message>
@@ -9848,17 +11809,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10037,7 +11998,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10055,7 +12016,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10074,7 +12035,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+278"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+348"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+349"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+105"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
@@ -10643,6 +12604,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Display width</source>
@@ -10697,17 +12740,17 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+656"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+745"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-478"/>
+        <location line="-495"/>
         <source>none</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+629"/>
+        <location line="+652"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -10726,12 +12769,12 @@
         <translation>保存配置文件</translation>
     </message>
     <message>
-        <location line="-167"/>
+        <location line="-173"/>
         <source>Target Video Size:</source>
         <translation>目标视频大小:</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+246"/>
         <source>Do you really want to delete the </source>
         <translation>你准备希望删除这 </translation>
     </message>
@@ -10746,22 +12789,22 @@
         <translation>删除</translation>
     </message>
     <message>
-        <location line="-668"/>
+        <location line="-686"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location line="+648"/>
+        <location line="+666"/>
         <source>Cannot save preset</source>
         <translation>无法保存默认定</translation>
     </message>
     <message>
-        <location line="-231"/>
+        <location line="-237"/>
         <source>Quantiser:</source>
         <translation>量化器:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>不编码</translation>
     </message>
@@ -10772,12 +12815,12 @@
         <translation>kbit/s</translation>
     </message>
     <message>
-        <location line="+207"/>
+        <location line="+213"/>
         <source>Replace the following preset ?:</source>
         <translation>替代以下的默认定吗?:</translation>
     </message>
     <message>
-        <location line="-227"/>
+        <location line="-233"/>
         <source>Target Bitrate:</source>
         <translation>目标比特速率：</translation>
     </message>
@@ -10799,7 +12842,7 @@
         <translation>品质:</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+247"/>
         <source>Cannot delete custom profile</source>
         <translation>不能删除自定义的配置文件</translation>
     </message>
@@ -10809,7 +12852,17 @@
         <translation>复写</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-714"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+578"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12037,17 +14090,17 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+714"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+732"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-442"/>
         <source>none</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+609"/>
+        <location line="+627"/>
         <location line="+67"/>
         <location line="+17"/>
         <source>Error</source>
@@ -12086,12 +14139,12 @@
         <translation>删除</translation>
     </message>
     <message>
-        <location line="-624"/>
+        <location line="-642"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location line="+601"/>
+        <location line="+619"/>
         <source>Cannot save preset</source>
         <translation>无法保存默认定</translation>
     </message>
@@ -12149,7 +14202,7 @@
         <translation>复写</translation>
     </message>
     <message>
-        <location line="-672"/>
+        <location line="-690"/>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12164,7 +14217,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+554"/>
+        <location line="+572"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -13072,7 +15125,7 @@
     </message>
     <message>
         <location line="-2966"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>x265 配置</translation>
     </message>
     <message>
@@ -13510,7 +15563,7 @@
     </message>
     <message>
         <location line="-36"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>两个线程</translation>
     </message>
     <message>
@@ -13632,4 +15685,167 @@
         <translation>底部首先扫描</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.8.0.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+77"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+78"/>
         <source>Checking if timestamps are valid..</source>
         <translation>檢查時間戳記是否有效..</translation>
     </message>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+34"/>
         <source>Decoding video...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+489"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+499"/>
         <source>width</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,12 +81,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-68"/>
         <source>Attempt to open %s failed!</source>
         <translation>嘗試開啟 %s 失敗!</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+115"/>
+        <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="+163"/>
         <source>Some timing information are incorrect.
 It happens with some capture software.
 If you re encode video we should drop these informations,
@@ -495,7 +495,7 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1401"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+1450"/>
         <source>?</source>
         <translation>?</translation>
     </message>
@@ -514,7 +514,7 @@
         <translation type="vanished">F7</translation>
     </message>
     <message>
-        <location line="-779"/>
+        <location line="-827"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -533,6 +533,8 @@
         <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
+        <location line="+25"/>
+        <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
@@ -542,12 +544,12 @@
         <translation>...</translation>
     </message>
     <message>
-        <location line="+317"/>
+        <location line="+331"/>
         <source>&amp;Top</source>
         <translation>上下並排(&amp;T)</translation>
     </message>
     <message>
-        <location line="-1478"/>
+        <location line="-1540"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>複製</translation>
@@ -569,17 +571,17 @@
         <translation>自動(&amp;U)</translation>
     </message>
     <message>
-        <location line="-21"/>
+        <location line="-22"/>
         <source>&amp;Edit</source>
         <translation>編輯(&amp;E)</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
-        <location line="-56"/>
+        <location line="-57"/>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
     </message>
@@ -589,17 +591,17 @@
         <translation>檢視(&amp;V)</translation>
     </message>
     <message>
-        <location line="+1641"/>
+        <location line="+1690"/>
         <source>Open Video</source>
         <translation>開啟影片</translation>
     </message>
     <message>
-        <location line="+199"/>
+        <location line="+213"/>
         <source>Si&amp;de</source>
         <translation>左右並排(&amp;D</translation>
     </message>
     <message>
-        <location line="-647"/>
+        <location line="-661"/>
         <source>Time:</source>
         <translation>時間:</translation>
     </message>
@@ -624,7 +626,7 @@
         <translation>轉到第一幀 [HOME]</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-166"/>
         <source>Go to next keyframe [UP]</source>
         <translation>轉到下一幀(關鍵幀或I幀) [UP]</translation>
     </message>
@@ -633,7 +635,7 @@
         <translation type="vanished">計算機(&amp;C)...</translation>
     </message>
     <message>
-        <location line="+458"/>
+        <location line="+506"/>
         <source>Go to marker A [PAGE UP]</source>
         <translation>轉到標記 A [PAGE UP]</translation>
     </message>
@@ -644,12 +646,12 @@
         <translation>儲存專案</translation>
     </message>
     <message>
-        <location line="-1671"/>
+        <location line="-1719"/>
         <source>&amp;Audio</source>
         <translation>音訊(&amp;A)</translation>
     </message>
     <message>
-        <location line="+1686"/>
+        <location line="+1734"/>
         <source>&amp;Input</source>
         <translation>輸入(&amp;I)</translation>
     </message>
@@ -659,33 +661,33 @@
         <translation>標誌區段(&amp;S)</translation>
     </message>
     <message>
-        <location line="-1742"/>
+        <location line="-1790"/>
         <source>&amp;Tools</source>
         <translation>工具(&amp;T)</translation>
     </message>
     <message>
-        <location line="+1295"/>
+        <location line="+1343"/>
         <source>Se&amp;lection</source>
         <translation>標誌區間段(&amp;L)</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-383"/>
         <source>Set end marker [CTRL+PAGEDOWN]</source>
         <translation>設定結束標記 [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
-        <location line="+415"/>
+        <location line="+463"/>
         <location line="+16"/>
         <source>000000</source>
         <translation>000000</translation>
     </message>
     <message>
-        <location line="+379"/>
+        <location line="+393"/>
         <source>&amp;Audio Metre</source>
         <translation>音訊畫面(&amp;A)</translation>
     </message>
     <message>
-        <location line="-1576"/>
+        <location line="-1638"/>
         <location line="+142"/>
         <location line="+169"/>
         <location line="+181"/>
@@ -693,27 +695,27 @@
         <translation>配置</translation>
     </message>
     <message>
-        <location line="-727"/>
+        <location line="-728"/>
         <source>Vi&amp;deo</source>
         <translation>影片(&amp;D)</translation>
     </message>
     <message>
-        <location line="+857"/>
+        <location line="+858"/>
         <source>Play [SPACE]</source>
         <translation>播放 [SPACE]</translation>
     </message>
     <message>
-        <location line="+744"/>
+        <location line="+792"/>
         <source>Audio &amp;Metre</source>
         <translation>音訊畫面(&amp;M)</translation>
     </message>
     <message>
-        <location line="-1587"/>
+        <location line="-1636"/>
         <source>&amp;Toolbars</source>
         <translation>工具列(&amp;T)</translation>
     </message>
     <message>
-        <location line="+1634"/>
+        <location line="+1683"/>
         <source>&amp;Open...</source>
         <translation>開啟檔案(&amp;O)...</translation>
     </message>
@@ -739,7 +741,7 @@
         <translation>搜尋上一幀黑框</translation>
     </message>
     <message>
-        <location line="-141"/>
+        <location line="-189"/>
         <source>Go to previous frame [LEFT]</source>
         <translation>轉到上一幀 [LEFT]</translation>
     </message>
@@ -749,7 +751,7 @@
         <translation>編解碼器選項(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1585"/>
+        <location line="+1633"/>
         <source>Play filtered</source>
         <translation>濾鏡播放(&amp;P)</translation>
     </message>
@@ -759,7 +761,7 @@
         <translation>轉到標記 B [PAGE DOWN]</translation>
     </message>
     <message>
-        <location line="-995"/>
+        <location line="-1043"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
         <translation>&lt;b&gt;輸出音訊編碼佳AC3/Mp3&lt;/b&gt;</translation>
     </message>
@@ -769,7 +771,7 @@
         <translation>&lt;b&gt;影片輸出格式(容器)佳Mp4/Mkv&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+1040"/>
+        <location line="+1088"/>
         <source>&amp;Load/Run Project...</source>
         <translation>載入/執行專案(&amp;L)...</translation>
     </message>
@@ -779,32 +781,32 @@
         <translation>G轉到最後一幀 [END]</translation>
     </message>
     <message>
-        <location line="-1065"/>
+        <location line="-1113"/>
         <source>&amp;Custom</source>
         <translation>自訂(&amp;C)</translation>
     </message>
     <message>
-        <location line="+1713"/>
+        <location line="+1761"/>
         <source>&amp;Output</source>
         <translation>輸出(&amp;O)</translation>
     </message>
     <message>
-        <location line="-1688"/>
+        <location line="-1736"/>
         <source>&amp;Recent</source>
         <translation>最近(&amp;R)</translation>
     </message>
     <message>
-        <location line="+1089"/>
+        <location line="+1137"/>
         <source>Forward one minute</source>
         <translation>前進一分鐘</translation>
     </message>
     <message>
-        <location line="-556"/>
+        <location line="-604"/>
         <source>&amp;Shift:</source>
         <translation>位移(±)(&amp;S):</translation>
     </message>
     <message>
-        <location line="+1208"/>
+        <location line="+1256"/>
         <source>&amp;Volume</source>
         <translation>音量(&amp;V)</translation>
     </message>
@@ -819,33 +821,33 @@
         <translation>前進一分鐘 [CTRL+UP]</translation>
     </message>
     <message>
-        <location line="+684"/>
+        <location line="+698"/>
         <source>&amp;Separate</source>
         <translation>分離視窗(&amp;S)</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-910"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
         <translation>設定開始標記 [CTRL+PAGEUP]</translation>
     </message>
     <message>
-        <location line="-1078"/>
+        <location line="-1079"/>
         <source>Avidemux</source>
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+493"/>
+        <location line="+494"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation>濾鏡器-特效</translation>
     </message>
     <message>
-        <location line="+926"/>
+        <location line="+974"/>
         <source>Vol&amp;ume</source>
         <translation>音量(&amp;U)</translation>
     </message>
     <message>
-        <location line="-1353"/>
+        <location line="-1401"/>
         <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation>&lt;b&gt;解碼器.顏色.不編碼直選COPY&lt;/b&gt;</translation>
     </message>
@@ -860,7 +862,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+778"/>
+        <location line="+583"/>
+        <source>Go to previous cut point [SHIFT+DOWN]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Go to next cut point [SHIFT+UP]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+220"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -885,12 +897,12 @@
         <translation>屬性(&amp;I)...</translation>
     </message>
     <message>
-        <location line="-751"/>
+        <location line="-799"/>
         <source>Go to next frame [RIGHT]</source>
         <translation>轉到下一幀</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+258"/>
         <source>Backward one minute [CTRL+DOWN]</source>
         <translation>倒退一分鐘 [CTRL+DOWN]</translation>
     </message>
@@ -900,12 +912,22 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+53"/>
+        <source>&amp;Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>Ctrl+Alt+M</source>
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-56"/>
         <source>Ctrl+Alt+N</source>
         <translation>Ctrl+Alt+N</translation>
     </message>
@@ -920,13 +942,13 @@
         <translation>Ctrl+Alt+V</translation>
     </message>
     <message>
-        <location line="-868"/>
+        <location line="-916"/>
         <source>Go to previous keyframe [DOWN]</source>
         <translation>轉到上一幀(關鍵幀或I幀) [DOWN]</translation>
     </message>
     <message>
         <location line="-150"/>
-        <location line="+987"/>
+        <location line="+1035"/>
         <source>&amp;Navigation</source>
         <translation>影片導航欄(&amp;N)</translation>
     </message>
@@ -1157,7 +1179,7 @@
         <translation>4MV</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+231"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+232"/>
         <source>AAC</source>
         <translation>AAC</translation>
     </message>
@@ -1168,7 +1190,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="+97"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+525"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+633"/>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
@@ -1178,7 +1200,7 @@
         <translation>DRC</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-7"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-8"/>
         <source>DTS</source>
         <translation>DTS</translation>
     </message>
@@ -1208,7 +1230,12 @@
         <translation>MP3</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+2"/>
+        <source>WMA Lossless</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Float PCM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1218,14 +1245,19 @@
         <translation>MP4</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-222"/>
+        <location line="+9"/>
+        <source>TrueHD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-297"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-19"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+85"/>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-12"/>
+        <location line="+101"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-22"/>
         <source>PCM</source>
         <translation>PCM</translation>
     </message>
@@ -1236,11 +1268,12 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-13"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-41"/>
         <source>SDL</source>
         <translation>SDL</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+5"/>
         <source>WMA</source>
         <translation>WMA</translation>
     </message>
@@ -1276,12 +1309,12 @@
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+7"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+8"/>
         <source>Gain</source>
         <translation>增音</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-89"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
         <location filename="../ADM_userInterfaces/ADM_dialog/DIA_xvid4.cpp" line="-45"/>
         <source>High</source>
         <translation>高</translation>
@@ -1307,7 +1340,7 @@
         <translation>OPUS</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-20"/>
         <source>Mono</source>
         <translation>單音</translation>
     </message>
@@ -1329,7 +1362,7 @@
         <translation>QDM2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1933"/>
+        <location filename="../../common/gui_main.cpp" line="+1985"/>
         <source>Oops</source>
         <translation>Oops</translation>
     </message>
@@ -1339,7 +1372,7 @@
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-42"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
         <source>SIMD</source>
         <translation>SIMD</translation>
     </message>
@@ -1369,7 +1402,7 @@
         <translation>復原</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+5"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+6"/>
         <source>_Gain mode:</source>
         <translation>增音益模式:</translation>
     </message>
@@ -1380,7 +1413,7 @@
         <translation>沒有音軌</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-19"/>
         <source>Stereo+surround</source>
         <translation>立體+環繞</translation>
     </message>
@@ -1406,7 +1439,7 @@
         <translation>檔案 %s 儲存不正確。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
         <source>About</source>
         <translation>關於(&amp;U)</translation>
     </message>
@@ -1417,7 +1450,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_plugins.cpp" line="-86"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+222"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+249"/>
         <location line="+3"/>
         <location line="+5"/>
         <location filename="../../common/gui_save.cpp" line="-606"/>
@@ -1426,17 +1459,17 @@
         <location line="+15"/>
         <location line="+19"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+432"/>
+        <location filename="../../common/gui_savenew.cpp" line="+436"/>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-81"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+177"/>
+        <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+187"/>
         <location line="+31"/>
         <location filename="../../../avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp" line="+40"/>
         <location line="+46"/>
@@ -1444,18 +1477,18 @@
         <translation>編解碼器</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-107"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-96"/>
         <source>Display only error alerts</source>
         <translation>只顯示錯誤警告</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+678"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="+812"/>
+        <location line="+50"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp" line="+80"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp" line="+144"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_vdpau_utils.cpp" line="+51"/>
         <location filename="../../common/ADM_videoCodec/src/ADM_ffmpeg_xvba.cpp" line="+134"/>
-        <location filename="../../common/gui_main.cpp" line="-362"/>
+        <location filename="../../common/gui_main.cpp" line="-364"/>
         <location line="+27"/>
         <location line="+24"/>
         <location line="+8"/>
@@ -1474,14 +1507,14 @@
         <translation>HQ AC</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+34"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+35"/>
         <source>Mixer</source>
         <translation>混音訊</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-229"/>
-        <location line="+290"/>
-        <location line="+26"/>
+        <location filename="../../common/gui_savenew.cpp" line="-231"/>
+        <location line="+292"/>
+        <location line="+25"/>
         <source>Muxer</source>
         <translation>複合器</translation>
     </message>
@@ -1502,6 +1535,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-2"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-45"/>
         <source>VDPAU</source>
         <translation>VDPAU</translation>
     </message>
@@ -1511,20 +1545,20 @@
         <translation>改進最大溢出(%)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-326"/>
-        <location line="+170"/>
+        <location filename="../../common/gui_savenew.cpp" line="-327"/>
+        <location line="+172"/>
         <location line="+12"/>
         <location line="+16"/>
         <source>Video</source>
         <translation>影片</translation>
     </message>
     <message>
-        <location line="-198"/>
+        <location line="-200"/>
         <source>Cannot set up encoder for the first pass. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+200"/>
         <source>Cannot set up encoder. The configuration supplied to the encoder may be incompatible or the encoder may depend on features unavailable on this system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1563,12 +1597,14 @@
         <translation>核心已編譯，沒有 VDPAUA 的支援，但它已編譯應用程式，安裝不匹配</translation>
     </message>
     <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="+23"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+158"/>
         <location filename="../ADM_UIs/src/T_threadCount.cpp" line="+45"/>
         <source>Disabled</source>
         <translation>停用</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-95"/>
         <source>Pro Logic II</source>
         <translation>第二代定向邏輯</translation>
     </message>
@@ -1578,17 +1614,17 @@
         <translation>不能安裝影片鏈</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+58"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+60"/>
         <source>Decoder Option</source>
         <translation>解碼器選項(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-135"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-173"/>
         <source>Enable 3DNOWEXT</source>
         <translation>啟用 3DNOWEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+38"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+41"/>
         <source>Previous Black Frame</source>
         <translation>轉到上一幀黑框</translation>
     </message>
@@ -1612,12 +1648,12 @@
         <translation>位移音量 (ms):</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-770"/>
+        <location filename="../../common/gui_main.cpp" line="-793"/>
         <source>Error while cutting out.</source>
         <translation>剪下時發生錯誤.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-55"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-56"/>
         <source>R_esampling (Hz):</source>
         <translation>重新取樣 (Hz):</translation>
     </message>
@@ -1627,12 +1663,12 @@
         <translation>不能增加工作 %s</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+134"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+172"/>
         <source>Pro Logic</source>
         <translation>定向邏輯</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+691"/>
+        <location filename="../../../avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp" line="+693"/>
         <source>The saved video is incomplete. The error occured at %s (%d%). This may happen as result of invalid time stamps in the video.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1642,7 +1678,7 @@
         <translation>太短</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+666"/>
+        <location filename="../../common/gui_main.cpp" line="+669"/>
         <source>Marker A &gt; B</source>
         <translation>標記 A &gt; B</translation>
     </message>
@@ -1653,23 +1689,23 @@
         <translation>請釋放一些空間，然後按重試再試一次。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
         <source>Connect to avsproxy</source>
         <translation>連線至 avsproxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+97"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+126"/>
         <source>GUI Rendering Options</source>
         <translation>GUI 渲染選項</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-160"/>
-        <location line="+290"/>
+        <location filename="../../common/gui_savenew.cpp" line="-162"/>
+        <location line="+292"/>
         <source>Cannot instantiate muxer</source>
         <translation>不能安裝複合器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+522"/>
+        <location filename="../../common/gui_main.cpp" line="+544"/>
         <source>This function is disabled or no longer valid</source>
         <translation>此功能被停用或不再有效</translation>
     </message>
@@ -1689,7 +1725,7 @@
         <translation>立體+中央+環繞</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+65"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+68"/>
         <source>Build Option</source>
         <translation>建立選項(&amp;B)</translation>
     </message>
@@ -1720,22 +1756,32 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1753"/>
+        <location filename="../../common/gui_main.cpp" line="-1804"/>
         <source>Select script to run</source>
         <translation>選擇腳本去執行</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-99"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-128"/>
         <source>No downmixing</source>
         <translation>沒降混合</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-168"/>
         <source>Enable SSE2</source>
         <translation>啟用 SSE2</translation>
     </message>
     <message>
-        <location line="-30"/>
+        <location line="+281"/>
+        <source>Post-Processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>OpenGL video display and filters require OpenGL to be enabled and working at application startup to be available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Ignore driver blacklist (Intel)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1755,7 +1801,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-346"/>
         <source>_Swap markers if marker A is set past marker B or marker B before A in video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1775,7 +1821,7 @@
         <translation>外掛-音訊裝置(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1244"/>
+        <location filename="../../common/gui_main.cpp" line="+1273"/>
         <source>Something bad happened</source>
         <translation>有些事發生問題</translation>
     </message>
@@ -1790,12 +1836,12 @@
         <translation>無法刪除此選取範圍。</translation>
     </message>
     <message>
-        <location line="-406"/>
+        <location line="-405"/>
         <source>Multiple Audio Tracks</source>
         <translation>多音軌</translation>
     </message>
     <message>
-        <location line="-417"/>
+        <location line="-428"/>
         <source>The cut points of the pasted video are not on keyframes.
 Video saved in copy mode will be corrupted at these points.
 Proceed anyway?</source>
@@ -1821,7 +1867,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+127"/>
         <source>It is impossible to cut out the entire video. Please recheck the position of markers A and B.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1881,7 +1927,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
+        <location line="+323"/>
         <source>Something failed when appending</source>
         <translation>當增加時某些事情失敗</translation>
     </message>
@@ -1896,9 +1942,8 @@
         <translation>反轉向上和向下方向鍵進行導航</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>SDL (good)</source>
-        <translation>SDL (好)</translation>
+        <translation type="vanished">SDL (好)</translation>
     </message>
     <message>
         <location filename="../../../avidemux_core/ADM_coreUtils/src/ADM_quota.cpp" line="-95"/>
@@ -1907,12 +1952,12 @@
         <translation>超出額配</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+119"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+238"/>
         <source>User Interface</source>
         <translation>使用者介面</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+26"/>
+        <location filename="../../common/gui_savenew.cpp" line="+25"/>
         <source>Cannot open </source>
         <translation>不能開啟 </translation>
     </message>
@@ -1922,7 +1967,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>G_ain value:</source>
         <translation>增音值:</translation>
     </message>
@@ -1942,7 +1987,7 @@
         <translation>最大Gop(圖像群組)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="-338"/>
+        <location filename="../../common/gui_savenew.cpp" line="-339"/>
         <source>Reuse previous first pass data ?
 Warning, the settings must be close.</source>
         <translation>重用以前首先傳遞資料？警告，設定必須關閉.</translation>
@@ -1958,12 +2003,12 @@
         <translation>開啟應用程式資料夾目錄(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-168"/>
         <source>Above normal</source>
         <translation>高於一般</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-923"/>
+        <location filename="../../common/gui_main.cpp" line="-953"/>
         <source>Select script to save</source>
         <translation>選擇腳本去儲存</translation>
     </message>
@@ -1980,12 +2025,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+269"/>
+        <location filename="../../common/gui_main.cpp" line="+272"/>
         <source>Select Video File to Append...</source>
         <translation>選擇影片去附加合併(二影片寬高比要一致)...</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-33"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-55"/>
         <source>Enable SSSE3</source>
         <translation>啟用 SSSE3</translation>
     </message>
@@ -2000,7 +2045,7 @@
         <translation>外掛-影片解碼器(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1166"/>
+        <location filename="../../common/gui_main.cpp" line="+1212"/>
         <source>Unable to set the audio language: No video loaded yet!</source>
         <translation>無法設置音訊語言：仍然未載入影片！</translation>
     </message>
@@ -2010,7 +2055,7 @@
         <translation>選擇音訊音軌(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+35"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
         <source>Below normal</source>
         <translation>低於一般</translation>
     </message>
@@ -2020,17 +2065,17 @@
         <translation>自動偵測</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+4"/>
         <source>_Encoding priority:</source>
         <translation>編碼優先次序:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-33"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-34"/>
         <source>Dolby Pro Logic</source>
         <translation>杜比定向邏輯</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-66"/>
         <source>Enable 3DNOW</source>
         <translation>啟用 3DNOW</translation>
     </message>
@@ -2071,7 +2116,7 @@
         <translation>最小Gop(圖像群組)大小</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-677"/>
+        <location filename="../../common/gui_main.cpp" line="-696"/>
         <source>Try &apos;File&apos; -&gt; &apos;Load/Run Project...&apos;</source>
         <translation>嘗試 &apos;檔案&apos; -&gt; &apos;載入/執行 專案...&apos;</translation>
     </message>
@@ -2081,17 +2126,17 @@
         <translation>發現沒有 AAC 音訊編碼器外掛程式。</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+876"/>
+        <location filename="../../common/gui_main.cpp" line="+895"/>
         <source>Frame Hex Dump</source>
         <translation>幀十六進位轉儲</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+22"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="+23"/>
         <source>_Mixer:</source>
         <translation>混合器:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Audio Filters</source>
         <translation>音訊濾鏡</translation>
     </message>
@@ -2106,7 +2151,7 @@
         <translation>AMR-NB</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-917"/>
+        <location filename="../../common/gui_main.cpp" line="-936"/>
         <source>Permission error</source>
         <translation>權限許可錯誤</translation>
     </message>
@@ -2122,14 +2167,13 @@
         <translation>核心已編譯，沒有 LIBVA 的支援，但它已編譯應用程式，安裝不匹配</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+726"/>
+        <location filename="../../common/gui_main.cpp" line="+745"/>
         <source>Setting the language for the given track index is not possible: Video has no audio file!</source>
         <translation>設定語言提供跟蹤索引是不可能的：影片有沒有音訊檔！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+77"/>
         <source>OpenGL (best)</source>
-        <translation>OpenGL (最好)</translation>
+        <translation type="vanished">OpenGL (最好)</translation>
     </message>
     <message>
         <location filename="../../common/gui_save.cpp" line="+21"/>
@@ -2137,7 +2181,7 @@
         <translation>選擇 JPEG 順序進行儲存</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-69"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-72"/>
         <source>Append</source>
         <translation>同寬高影片合併</translation>
     </message>
@@ -2160,7 +2204,7 @@
         <translation>自訂</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1261"/>
+        <location filename="../../common/gui_main.cpp" line="-1311"/>
         <source>Not coded in this version</source>
         <translation>沒有編進這個版本</translation>
     </message>
@@ -2185,12 +2229,12 @@
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1021"/>
+        <location filename="../../common/gui_main.cpp" line="+1051"/>
         <source>No error found</source>
         <translation>沒有找到錯誤</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+60"/>
         <source>Next Intra Frame</source>
         <translation>轉到下一幀(關鍵幀或I幀)</translation>
     </message>
@@ -2211,7 +2255,7 @@
         <translation>發現編解碼器內部錯誤</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+50"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+165"/>
         <source>Master</source>
         <translation>主要</translation>
     </message>
@@ -2241,18 +2285,18 @@
         <translation>已儲存 %d 個圖像。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-88"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-104"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-75"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-78"/>
         <location line="+2"/>
         <source>Clear recent items</source>
         <translation>清除最近使用的 檔案 及 專案</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-67"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+264"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>解碼影片使用 DXVA2 (windows)</translation>
     </message>
@@ -2262,7 +2306,7 @@
         <translation>運動搜索精度</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-87"/>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
@@ -2272,25 +2316,25 @@
         <translation>不能建立流</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-214"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-241"/>
         <source>Enable all SIMD</source>
         <translation>啟用所有 SIMD</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-11"/>
-        <source>Remix:</source>
-        <translation>重新混合:</translation>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-12"/>
+        <source>Remix</source>
+        <translation>重新混合</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-49"/>
-        <location line="+49"/>
+        <location filename="../../common/ADM_editor/src/ADM_segment.cpp" line="-50"/>
+        <location line="+50"/>
         <source>You cannot remove *all* the video
 </source>
         <translation>你不能刪除*所有*的影片
 </translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+155"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+193"/>
         <source>_AudioDevice</source>
         <translation>音訊裝置</translation>
     </message>
@@ -2300,13 +2344,13 @@
         <translation>儲存中</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-32"/>
+        <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-33"/>
         <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
         <source>Stereo</source>
         <translation>立體聲</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-13"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="-14"/>
         <source>WMAPRO</source>
         <translation>WMAPRO</translation>
     </message>
@@ -2316,7 +2360,7 @@
         <translation>廣泛搜尋</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1207"/>
+        <location filename="../../common/gui_main.cpp" line="-1236"/>
         <source>Select script to debug</source>
         <translation>選擇腳本去除錯</translation>
     </message>
@@ -2326,7 +2370,7 @@
         <translation>更多搜尋</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+8"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+9"/>
         <source>Ogg Vorbis</source>
         <translation>Ogg Vorbis</translation>
     </message>
@@ -2337,6 +2381,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_builtin.cpp" line="-1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-64"/>
         <source>XVideo</source>
         <translation>XVideo</translation>
     </message>
@@ -2346,12 +2391,12 @@
         <translation>PAL 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+76"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+81"/>
         <source>First Frame</source>
         <translation>轉到第一幀(開始)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+721"/>
+        <location filename="../../common/gui_main.cpp" line="+751"/>
         <source>Cannot open &quot;%s&quot;.</source>
         <translation>無法開啟 &quot;%s&quot;。</translation>
     </message>
@@ -2371,7 +2416,7 @@
         <translation>轉到最後一幀(結束)</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-8"/>
         <source>Next Frame</source>
         <translation>轉到下一幀</translation>
     </message>
@@ -2381,7 +2426,7 @@
         <translation>不能到達資料庫，你有工作控制執行嗎？</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+20"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+31"/>
         <source>Zoom 1:1</source>
         <translation>縮放 1:1</translation>
     </message>
@@ -2391,7 +2436,7 @@
         <translation>縮放 1:2</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-123"/>
         <source>Save as PNG</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2401,12 +2446,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+38"/>
+        <source>Reset Marker A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reset Marker B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>HDR tone mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Play filtered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+35"/>
+        <source>Previous Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Next Cut Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Backward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 1 second</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward 4 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Backward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Forward one minute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Zoom 1:4</source>
         <translation>縮放 1:4</translation>
     </message>
@@ -2426,12 +2536,11 @@
         <translation>外掛-音訊編碼器(ADM)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-60"/>
         <source>DXVA2 (best)</source>
-        <translation>DXVA2 (最好)</translation>
+        <translation type="vanished">DXVA2 (最好)</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+47"/>
         <source>No alerts</source>
         <translation>不顯示任何警告</translation>
     </message>
@@ -2460,7 +2569,7 @@
         <translation>沒有改變</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-650"/>
+        <location filename="../../common/gui_main.cpp" line="-680"/>
         <source>You are about to clear the list of recent files and projects. This can&apos;t be undone. Proceed?</source>
         <translation>你是要清除最近使用的檔和專案的清單，這不&apos;能撤銷，是否繼續？</translation>
     </message>
@@ -2471,17 +2580,17 @@
         <translation>Sdl 驅動程式r</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+151"/>
+        <location filename="../../common/gui_main.cpp" line="+154"/>
         <source>No engine</source>
         <translation>沒有引擎</translation>
     </message>
     <message>
-        <location line="+503"/>
+        <location line="+530"/>
         <source>&quot;%s&quot; does not exist.</source>
         <translation>&quot;%s&quot; 不存在。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-114"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-128"/>
         <source>Save as BMP</source>
         <translation>另存 BMP</translation>
     </message>
@@ -2491,7 +2600,7 @@
         <translation>建立時間軸</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-133"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+182"/>
         <source>Decode video using VDPAU (NVIDIA)</source>
         <translation>解碼影片使用 VDPAU (NVIDIA)</translation>
     </message>
@@ -2502,12 +2611,12 @@
         <translation>你沒&apos;有FAAC!，它是建立 PSP 相容影片所需。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+52"/>
         <source>Load saved settings</source>
         <translation>載入儲存設定</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+911"/>
+        <location filename="../../common/gui_main.cpp" line="+930"/>
         <source>Frame size:</source>
         <translation>幀大小:</translation>
     </message>
@@ -2517,14 +2626,13 @@
         <translation>幀類型:</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+24"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+25"/>
         <source>Plugins</source>
         <translation>外掛程式(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+93"/>
         <source>VDPAU (best)</source>
-        <translation>VDPAU (最好)</translation>
+        <translation type="vanished">VDPAU (最好)</translation>
     </message>
     <message>
         <location filename="../../common/gui_autodrive.cpp" line="-129"/>
@@ -2538,7 +2646,7 @@
         <translation>NTSC 16:9</translation>
     </message>
     <message>
-        <location filename="../../common/gui_savenew.cpp" line="+279"/>
+        <location filename="../../common/gui_savenew.cpp" line="+281"/>
         <source>The video is in copy mode but the cut points are not on keyframes.
 The video will be saved but there will be corruption at cut point(s).
 Do you want to continue anyway ?</source>
@@ -2547,7 +2655,7 @@
 您要繼續嗎 ?</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-910"/>
+        <location filename="../../common/gui_main.cpp" line="-929"/>
         <source>File error</source>
         <translation>檔案錯誤</translation>
     </message>
@@ -2562,12 +2670,12 @@
         <translation>%d 分(s)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+57"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
         <source>_Volume control:</source>
         <translation>音量控制:</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+95"/>
         <source>Default Postprocessing</source>
         <translation>預設的後置處理</translation>
     </message>
@@ -2587,7 +2695,7 @@
         <translation>x86-64</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+466"/>
+        <location filename="../../common/gui_main.cpp" line="+465"/>
         <source>Checking video</source>
         <translation>正在檢查影片</translation>
     </message>
@@ -2597,24 +2705,23 @@
         <translation>另存 %s 為 BMP 檔失敗。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-170"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-272"/>
         <source>_Enable alternative keyboard shortcuts</source>
         <translation>啟用備用的鍵盤快速鍵</translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="+343"/>
         <source>Decode video using LIBVA (INTEL)</source>
         <translation>解碼影片使用 LIBVA (INTEL)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-430"/>
+        <location filename="../../common/gui_main.cpp" line="-429"/>
         <source>Cannot open project using the video loader.</source>
         <translation>使用影片載入器時無法開啟專案。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+101"/>
         <source>LIBVA (best)</source>
-        <translation>LIBVA (最好)</translation>
+        <translation type="vanished">LIBVA (最好)</translation>
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_audioFilter.cpp" line="-26"/>
@@ -2627,7 +2734,7 @@
         <translation>選擇檔案進行儲存</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+150"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-45"/>
         <source>_Limit Refresh Rate</source>
         <translation>限制重整速率</translation>
     </message>
@@ -2647,17 +2754,17 @@
         <translation>重新取樣頻率 (Hz)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+690"/>
+        <location filename="../../common/gui_main.cpp" line="+709"/>
         <source>Setting the language for the given track index is not possible: Invalid track index!</source>
         <translation>設定的語言無法提供跟蹤索引：無效跟蹤指標！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-178"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-212"/>
         <source>_Default to the directory of the last read file for saving</source>
         <translation>預設為儲存最後讀取檔案的目錄</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+147"/>
         <source>_Language</source>
         <translation>語言</translation>
     </message>
@@ -2667,7 +2774,7 @@
         <translation>沒有檔案載入</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-630"/>
+        <location filename="../../common/gui_main.cpp" line="-649"/>
         <source>The file you just loaded contains several audio tracks.
 Go to Audio-&gt;MainTrack to select the active one.</source>
         <translation>這檔案剛剛載入包含一些音訊軌道。
@@ -2679,12 +2786,12 @@
         <translation>影片編碼器</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+142"/>
         <source>Threading</source>
         <translation>線程</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-105"/>
         <source>_Strength:</source>
         <translation>強度:</translation>
     </message>
@@ -2699,22 +2806,47 @@
         <translation>儲存工作</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-166"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-267"/>
         <source>_Check for new release</source>
         <translation>檢查有新版本</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+14"/>
+        <source>Enable SSE4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable SSE4.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable AVX2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
         <source>Multi-threading is disabled internally if HW accelerated decoding is enabled, restart application to apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>_Indexing/unpacking priority:</source>
         <translation>索引/拆開打包的優先次序:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
+        <source>De_lete first pass log files by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Auto-Append Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2729,7 +2861,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
+        <source>Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Load sequentially named pictures in reverse order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Avisynth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <source>HDR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Default _tone mapping method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Target peak luminance (nits):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-178"/>
         <source>Caching of decoded pictures</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2739,11 +2901,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+1"/>
+        <source>Use _shared cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This renderer provides no hardware acceleration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>DXVA2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+178"/>
+        <source>OpenGL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <source>LibVA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+138"/>
         <source>De_ringing</source>
         <translation>去除環狀色斑</translation>
     </message>
     <message>
+        <location line="-24"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
         <source>_Deringing</source>
         <translation>去除環狀色斑</translation>
@@ -2764,7 +2957,7 @@
         <translation>關鍵幀提高(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-159"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-236"/>
         <source>Enable MMX</source>
         <translation>啟用 MMX</translation>
     </message>
@@ -2774,7 +2967,7 @@
         <translation>啟用 SSE</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+333"/>
         <source>If you use Hw decoding, it is better to use the matching display driver</source>
         <translation>如果你使用硬體解碼，最好使用匹配的顯示驅動程式</translation>
     </message>
@@ -2785,14 +2978,12 @@
         <translation>檔系統已滿</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+270"/>
-        <location line="+3"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+20"/>
         <source>HW Accel</source>
         <translation>HW 硬體加速器</translation>
     </message>
     <message>
-        <location line="-271"/>
+        <location line="-368"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>同意在 DVD 使用非標準的音訊頻率</translation>
     </message>
@@ -2807,7 +2998,7 @@
         <translation>啟用 MMXEXT</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-83"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-86"/>
         <source>Information</source>
         <translation>屬性(&amp;I)</translation>
     </message>
@@ -2827,12 +3018,12 @@
         <translation>音訊軌道有必要建立這樣的檔</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+566"/>
+        <location filename="../../common/gui_main.cpp" line="+585"/>
         <source>Cannot use that file as audio track</source>
         <translation>不能使用該檔作為音訊軌道</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+48"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+71"/>
         <source>Prioritisation</source>
         <translation>優化</translation>
     </message>
@@ -2852,17 +3043,17 @@
         <translation>非常高</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1415"/>
+        <location filename="../../common/gui_main.cpp" line="-1464"/>
         <source>Select script/project to run</source>
         <translation>選擇要執行的腳本/專案</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+223"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+23"/>
         <source>_Always ask which port to use</source>
         <translation>製作影片始終詢問要使用哪個埠(Avidemux+Avisynth)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+98"/>
         <source>Go To Marker A</source>
         <translation>將標記A(選擇開始)</translation>
     </message>
@@ -2877,7 +3068,7 @@
         <translation>前段立體+後段立體</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-57"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-60"/>
         <source>Pr&amp;eferences</source>
         <translation>首選項-偏好設定(&amp;E)</translation>
     </message>
@@ -2887,7 +3078,7 @@
         <translation>低位元率的場景（%）</translation>
     </message>
     <message>
-        <location filename="../../common/gui_play.cpp" line="+446"/>
+        <location filename="../../common/gui_play.cpp" line="+460"/>
         <source>Trouble initializing audio device</source>
         <translation>音訊裝置初始化時發生問題</translation>
     </message>
@@ -2898,7 +3089,7 @@
         <translation>核心已編譯，沒有 XVBA 的支援，但它已編譯應用程式，安裝不匹配</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-182"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+33"/>
         <source>Video _display:</source>
         <translation>影片 顯示:</translation>
     </message>
@@ -2909,17 +3100,17 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+68"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+131"/>
         <source>_Vertical deblocking</source>
         <translation>去除垂直方向塊狀色斑</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1239"/>
+        <location filename="../../common/gui_main.cpp" line="+1268"/>
         <source>Errors found in %u frames</source>
         <translation>在 %u 幀中發現錯誤</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-18"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-81"/>
         <source>_Local playback downmixing:</source>
         <translation>局部倒帶降混合:</translation>
     </message>
@@ -2944,7 +3135,7 @@
         <translation>自由型 2</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-671"/>
+        <location filename="../../common/gui_main.cpp" line="-674"/>
         <location line="+21"/>
         <source>Cutting</source>
         <translation>剪下</translation>
@@ -2970,12 +3161,12 @@
         <translation>不到一分鐘</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+52"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+55"/>
         <source>Next Black Frame</source>
         <translation>轉到下一幀黑框</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+129"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+163"/>
         <source>Display</source>
         <translation>顯示</translation>
     </message>
@@ -2990,7 +3181,7 @@
         <translation>前往時間點</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-216"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-266"/>
         <source>Multi-threading</source>
         <translation>多線程</translation>
     </message>
@@ -3015,37 +3206,37 @@
         <translation>PAL 轉成 Film</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-61"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-64"/>
         <source>Reset Markers</source>
         <translation>取消標記</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+239"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+40"/>
         <source>Default port to use</source>
         <translation>製作影片要使用預設埠(Avidemux)</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="+65"/>
         <source>_Message level:</source>
         <translation>訊息等級:</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+671"/>
+        <location filename="../../common/gui_main.cpp" line="+674"/>
         <source>You can&apos;t remove all frames</source>
         <translation>你不&apos;能移除所有的幀</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+36"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+37"/>
         <source>&amp;Advanced</source>
         <translation>進階(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-135"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+132"/>
         <source>Enable openGl support</source>
         <translation>啟用openGl支援</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-1010"/>
+        <location filename="../../common/gui_main.cpp" line="-1036"/>
         <source>tinyPy script is not enabled in this build</source>
         <translation>在生成中未啟用 tinyPy 腳本</translation>
     </message>
@@ -3059,13 +3250,13 @@
         <translation>輸出檔案</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-25"/>
-        <location line="+73"/>
+        <location filename="../../common/gui_main.cpp" line="-29"/>
+        <location line="+77"/>
         <source>Select Video File...</source>
         <translation>選擇影片檔...</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+3"/>
+        <location filename="../../../avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp" line="+4"/>
         <source>Unknown codec</source>
         <translation>未知的編解碼器</translation>
     </message>
@@ -3086,19 +3277,19 @@
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-48"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-51"/>
         <source>Reset Edit</source>
         <translation>取消編輯(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+1325"/>
+        <location filename="../../common/gui_main.cpp" line="+1371"/>
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation>無法連線到 avs代理，
 要繼續執行嗎?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+17"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+19"/>
         <location line="+2"/>
         <source>Save current settings as default</source>
         <translation>將當前設置儲存為預設值</translation>
@@ -3120,13 +3311,12 @@
         <translation>MP3 編解碼器不允許停用資源，安裝了 lame外掛程式</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-49"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-51"/>
         <source>Save as Image</source>
         <translation>另存圖片(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+292"/>
-        <location line="+3"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+91"/>
         <source>Preferences</source>
         <translation>首選項-偏好設定</translation>
     </message>
@@ -3151,7 +3341,7 @@
         <translation>交錯掃描</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+79"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+82"/>
         <source>Open Application &amp;Log</source>
         <translation>開啟應用程式Log(&amp;L)</translation>
     </message>
@@ -3169,7 +3359,7 @@
         <translation>濾鏡器(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-255"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-334"/>
         <source>_lavc threads:</source>
         <translation>lavc 線程:</translation>
     </message>
@@ -3184,12 +3374,12 @@
         <translation>灰階</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+205"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+240"/>
         <source>Refresh Rate Cap (ms)</source>
         <translation>重整速率上限 (ms)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-28"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-31"/>
         <source>Set Marker A</source>
         <translation>設定標記 A</translation>
     </message>
@@ -3215,7 +3405,7 @@
         <translation>卡通模式</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+50"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+53"/>
         <source>Previous Frame</source>
         <translation>轉到上一幀</translation>
     </message>
@@ -3225,7 +3415,7 @@
         <translation>AvsProxy</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-186"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-220"/>
         <source>_Playback priority:</source>
         <translation>倒帶優先次序:</translation>
     </message>
@@ -3236,7 +3426,7 @@
     </message>
     <message>
         <location filename="../../common/ADM_commonUI/DIA_postproc.cpp" line="-1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+110"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+188"/>
         <source>_Horizontal deblocking</source>
         <translation>去除水平方向塊狀色斑</translation>
     </message>
@@ -3256,7 +3446,7 @@
         <translation>Gettext</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-88"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-91"/>
         <source>Save as JPEG</source>
         <translation>另存JPEG</translation>
     </message>
@@ -3266,7 +3456,7 @@
         <translation>2通</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-834"/>
+        <location filename="../../common/gui_main.cpp" line="-853"/>
         <source>Could not open the file</source>
         <translation>無法開啟此檔案</translation>
     </message>
@@ -3301,19 +3491,18 @@
         <translation>介...是減少(%)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+90"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="+93"/>
         <source>Previous Intra Frame</source>
         <translation>轉到上一幀(關鍵幀或I幀)</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+16"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-59"/>
         <source>System language</source>
         <translation>系統語言</translation>
     </message>
     <message>
-        <location line="-103"/>
         <source>XVideo (best)</source>
-        <translation>XVideo (最好)</translation>
+        <translation type="vanished">XVideo (最好)</translation>
     </message>
     <message>
         <location filename="../../common/gui_main.cpp" line="+279"/>
@@ -3328,7 +3517,7 @@
         <translation>音訊編碼器</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+159"/>
+        <location filename="../../common/gui_main.cpp" line="+158"/>
         <source>Something bad happened (II)</source>
         <translation>不幸的事情發生 (II)</translation>
     </message>
@@ -3345,12 +3534,12 @@
         <translation>選擇檔案來儲存音訊</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="+168"/>
+        <location filename="../../common/gui_main.cpp" line="+188"/>
         <source>Audio file not found in list, even though it should be there. Create a bug report!</source>
         <translation>未找到在清單中，即使它應該有的音訊檔，建立一個錯誤報告！</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-35"/>
+        <location filename="../../common/ADM_commonUI/myOwnMenu.h" line="-36"/>
         <source>PostProcessing</source>
         <translation>後置處理(&amp;O)</translation>
     </message>
@@ -3385,7 +3574,7 @@
         <translation>內部開啟錯誤中 0x%x</translation>
     </message>
     <message>
-        <location filename="../../common/gui_main.cpp" line="-922"/>
+        <location filename="../../common/gui_main.cpp" line="-945"/>
         <source>Are you sure?</source>
         <translation>確定嗎?</translation>
     </message>
@@ -3409,6 +3598,55 @@
         <source>Script &quot;%s&quot; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../common/ADM_commonUI/DIA_HDRConfig.cpp" line="-5"/>
+        <source>Changing the options above will results the editor jumping to the nearest prior key frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+73"/>
+        <source>Fast YUV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB clipping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Reinhard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+1"/>
+        <source>RGB Hable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>_Tone mapping:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Saturation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Boost (level multiplier):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ADM_UIs/src/T_floatResettable.cpp" line="+128"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>admIvtc</name>
@@ -3437,6 +3675,63 @@
     </message>
 </context>
 <context>
+    <name>analyzer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp" line="+32"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Null filter. Vectorscope, Waveform scopes and Histograms in Preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>analyzerDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui" line="+14"/>
+        <source>Analyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoon</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp" line="+44"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artCartoonDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui" line="+14"/>
+        <source>Cartoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Scatter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Color level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artCharcoal</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artCharcoal/ADM_vidArtCharcoal.cpp" line="+41"/>
@@ -3483,6 +3778,148 @@
     </message>
 </context>
 <context>
+    <name>artChromaHold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp" line="+41"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Monochrome effect with kept color(s).</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaHoldDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui" line="+14"/>
+        <source>Chroma Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+108"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKey</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp" line="+42"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Replace &quot;green screen&quot; with an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp" line="+287"/>
+        <source>Select Background Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artChromaKeyDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui" line="+14"/>
+        <source>Chroma Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Primary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Tertiary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Secondary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Cutoff slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Pick Chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Select image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Show calibration background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>No spill control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Weighted alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>AVG alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>RMS alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>MIN alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artColorEffect</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp" line="+33"/>
@@ -3589,6 +4026,114 @@
     </message>
 </context>
 <context>
+    <name>artDynThreshold</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp" line="+41"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adaptive luma thresholding </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artDynThresholdDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui" line="+14"/>
+        <source>Dynamic Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGrid</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp" line="+35"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Video wall effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artGridDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui" line="+14"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Grid size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Roll previous frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirror</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp" line="+41"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Mirror horizontally or vertically.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artMirrorDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui" line="+14"/>
+        <source>Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Displacement</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Horizontal - keep left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal - keep right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical - keep bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artPixelize</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPixelize/ADM_vidArtPixelize.cpp" line="+59"/>
@@ -3620,9 +4165,35 @@
     </message>
 </context>
 <context>
+    <name>artPosterize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp" line="+44"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ported from frei0r.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>artPosterizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui" line="+14"/>
+        <source>Posterize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>artVHS</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp" line="+39"/>
         <source>VHS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3640,35 +4211,40 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+132"/>
         <source>Luma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="-90"/>
         <source>Chroma bandwidth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+83"/>
         <source>Sync error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="-76"/>
         <source>Use zero delay filter for chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-14"/>
         <source>Use zero delay filter for luma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+70"/>
         <source>Sync error filter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>artVignette</name>
@@ -3780,11 +4356,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown flag</source>
         <translation type="vanished">未知的標誌</translation>
     </message>
@@ -3800,7 +4371,7 @@
 <context>
     <name>ass</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+218"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp" line="+224"/>
         <source>ASS</source>
         <translation>ASS</translation>
     </message>
@@ -3827,7 +4398,7 @@
         <translation>這是一個 SRT 檔，將轉換為 SSA？</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-19"/>
         <source>Botto_m margin:</source>
         <translation>底部邊界:</translation>
     </message>
@@ -3842,33 +4413,33 @@
         <translation>你確認是ASS/SSA檔嗎?</translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+234"/>
         <source>SSA Error</source>
         <translation>SSA錯誤</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-194"/>
         <source>Select Subtitle File</source>
         <translation>選擇字幕檔</translation>
     </message>
     <message>
-        <location line="+188"/>
+        <location line="+194"/>
         <source>ass_read_file() failed for %s</source>
         <translation>無法讀取檔案為 %s</translation>
     </message>
     <message>
-        <location line="-187"/>
+        <location line="-193"/>
         <source>_Line spacing:</source>
         <translation>行距:</translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+104"/>
         <source>Preparing the fonts can take a few minutes the first time.
 This message will not be displayed again.</source>
         <translation>準備的字體可以花幾分鐘第一次，不會再顯示此消息。</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-102"/>
         <source>_Top margin:</source>
         <translation>頂部邊界:</translation>
     </message>
@@ -3888,12 +4459,12 @@
         <translation>字幕檔(ASS/SSA):</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Do not adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>Adjust for display aspect ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3903,12 +4474,12 @@
         <translation>不能轉換SSA檔.</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-166"/>
         <source>Hardcode ASS/SSA/SRT subtitles using libass.</source>
         <translation>編碼-副檔名相容的.ass/.ssa/.srt字幕，請匯入文字檔。</translation>
     </message>
     <message>
-        <location line="+169"/>
+        <location line="+175"/>
         <source>Cannot save converted file.</source>
         <translation>不能儲存轉換檔.</translation>
     </message>
@@ -3917,6 +4488,26 @@
     <name>avimuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp" line="+25"/>
+        <source>AVI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Start as legacy AVI and switch to OpenDML mode when approaching the 4 GiB file size limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>OpenDML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Muxing Format</source>
         <translation>複合格式</translation>
     </message>
@@ -4090,7 +4681,7 @@
 <context>
     <name>blacken</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+41"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h" line="+43"/>
         <source>Blacken Borders</source>
         <translation>1.3-加入內邊框填黑-框厚度不限</translation>
     </message>
@@ -4146,19 +4737,18 @@
 <context>
     <name>blackframes</name>
     <message>
-        <location filename="../../common/gui_blackframes.cpp" line="+105"/>
         <source>BlackFrame</source>
-        <translation>黑幀</translation>
+        <translation type="vanished">黑幀</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location filename="../../common/gui_blackframes.cpp" line="+113"/>
+        <location line="+155"/>
         <source>Searching black frame..</source>
         <translation>搜尋黑幀.</translation>
     </message>
     <message>
-        <location line="-22"/>
         <source>This function is unsupported at the moment</source>
-        <translation>此函數不受支援的那一刻</translation>
+        <translation type="vanished">此函數不受支援的那一刻</translation>
     </message>
 </context>
 <context>
@@ -4185,14 +4775,80 @@
     </message>
 </context>
 <context>
+    <name>blur</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp" line="+44"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blur selected area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>blurDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui" line="+14"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Box blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Near Gaussian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Gaussian 2 pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>changeFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+243"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp" line="+252"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location line="-200"/>
+        <location line="-209"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
@@ -4207,12 +4863,12 @@
         <translation>25  (PAL)</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+211"/>
         <source>Invalid fps</source>
         <translation>無效FPS(幀數/秒)</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-212"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
@@ -4227,7 +4883,7 @@
         <translation>1.0-改變幀速度</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+170"/>
         <source>Change fps</source>
         <translation>改變FPS(幀數/秒)</translation>
     </message>
@@ -4242,22 +4898,22 @@
         <translation>目的地幀播放速率 :</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-197"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (Film)</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+191"/>
         <source>Source Fps:</source>
         <translation>源頭 Fps :</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-155"/>
         <source>Speed up/slow down the video as if altering fps. This filter changes duration.</source>
         <translation>影片快慢改變fps(幀/秒)的速度，這濾鏡可以改變時間.</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+160"/>
         <source>Destination Fps:</source>
         <translation>目的地 Fps:</translation>
     </message>
@@ -4294,6 +4950,66 @@
     </message>
 </context>
 <context>
+    <name>colorBalance</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp" line="+42"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Adjust shadow, midtone and highlight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp" line="+52"/>
+        <source>Peek Ranges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show shadow, midtone and highlight areas in black,gray and white colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>colorBalanceDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui" line="+20"/>
+        <source>Color balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <location line="+132"/>
+        <location line="+106"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-199"/>
+        <location line="+106"/>
+        <location line="+106"/>
+        <source>Chroma shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Midtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>colorTemp</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/colorTemp/ADM_vidColorTemp.cpp" line="+41"/>
@@ -4456,14 +5172,14 @@
     </message>
     <message>
         <location line="-1"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+66"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="+62"/>
+        <location line="+76"/>
         <source>Contrast</source>
         <translation>3.2-對比</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-86"/>
-        <location line="+87"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp" line="-75"/>
+        <location line="+76"/>
         <source>Brightness</source>
         <translation>亮度</translation>
     </message>
@@ -4482,12 +5198,11 @@
         <translation>對比</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Process</source>
-        <translation>程序</translation>
+        <translation type="vanished">程序</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+95"/>
         <source>MPEG2-&gt;PC</source>
         <translation>MPEG2-&gt;PC</translation>
     </message>
@@ -4565,7 +5280,7 @@
 <context>
     <name>crop</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+58"/>
         <source>Crop</source>
         <translation>1.2-裁剪影片邊框尺寸</translation>
     </message>
@@ -4575,7 +5290,7 @@
         <translation>裁剪濾鏡</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+19"/>
         <source>Warning Cropping too much width ! Width reseted !
 </source>
         <translation>重定的寬度！裁剪太多寬度的警告！
@@ -4589,12 +5304,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+538"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp" line="+564"/>
+        <location line="+358"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
+        <location line="-236"/>
         <source>Auto Crop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4609,13 +5325,13 @@
     </message>
     <message>
         <location line="+45"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+66"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+112"/>
         <source>Top:</source>
         <translation>頂部:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-74"/>
         <source>Left:</source>
         <translation>左:</translation>
     </message>
@@ -4626,13 +5342,13 @@
     </message>
     <message>
         <location line="-50"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="-7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Right:</source>
         <translation>右:</translation>
     </message>
     <message>
         <location line="+71"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+35"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+7"/>
         <source>Bottom:</source>
         <translation>底部:</translation>
     </message>
@@ -4642,17 +5358,17 @@
         <translation>自動剪裁</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+85"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui" line="+177"/>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-107"/>
         <source>&amp;Hide Rubber Band</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+46"/>
         <location line="+4"/>
         <source>Do not lock</source>
         <translation type="unfinished"></translation>
@@ -4698,7 +5414,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-130"/>
         <source>Lock Aspect Ratio:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4717,6 +5433,42 @@
     </message>
 </context>
 <context>
+    <name>deband</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp" line="+32"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce banding artifacts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>debandDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui" line="+14"/>
+        <source>Deband</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Chroma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Luma threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>decimate</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.cpp" line="+92"/>
@@ -4808,6 +5560,122 @@
     </message>
 </context>
 <context>
+    <name>delogoHQ</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp" line="+44"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Clean up arbitrary shaped logo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp" line="+41"/>
+        <source>The selected image has different width/height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Save failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp" line="+105"/>
+        <source>Find a frame in the preview with the logo clearly visible and not blending into the background.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save this frame as a PNG image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>This black and white image will serve as a mask where white pixels correspond to the logo to be removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load the mask image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>How to use DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Save selected frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Load failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>delogoHQDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui" line="+14"/>
+        <source>DelogoHQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save current frame...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Load mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Post-processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Gradient</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dgbob</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp" line="+68"/>
@@ -4892,6 +5760,19 @@
     </message>
 </context>
 <context>
+    <name>dummyMuxer</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp" line="+28"/>
+        <source>Simulated muxing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>(None)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>dv</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp" line="+79"/>
@@ -4902,37 +5783,37 @@
 <context>
     <name>encodingDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+480"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/encoding.ui" line="+512"/>
         <location line="+31"/>
         <location line="+60"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-412"/>
+        <location line="-460"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location line="+247"/>
+        <location line="+295"/>
         <location line="+7"/>
         <location line="+14"/>
         <source>0 MB</source>
         <translation>0 MB</translation>
     </message>
     <message>
-        <location line="-288"/>
+        <location line="-336"/>
         <source>High</source>
         <translation>高</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-81"/>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
-        <location line="+25"/>
-        <location line="+247"/>
+        <location line="+8"/>
+        <location line="+296"/>
         <location line="+21"/>
         <source>None</source>
         <translation>無</translation>
@@ -4943,12 +5824,12 @@
         <translation>音訊編解碼器:</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-241"/>
         <source>Priority:</source>
         <translation>優先權:</translation>
     </message>
     <message>
-        <location line="+292"/>
+        <location line="+340"/>
         <source>Video Size:</source>
         <translation>影片大小:</translation>
     </message>
@@ -4958,12 +5839,12 @@
         <translation>音訊大小:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-296"/>
         <source>Above Normal</source>
         <translation>高於一般</translation>
     </message>
     <message>
-        <location line="+205"/>
+        <location line="+253"/>
         <source>Video Codec:</source>
         <translation>影片編解碼器:</translation>
     </message>
@@ -4973,12 +5854,12 @@
         <translation>已處理的幀:</translation>
     </message>
     <message>
-        <location line="-336"/>
+        <location line="-384"/>
         <source>Below Normal</source>
         <translation>低於一般</translation>
     </message>
     <message>
-        <location line="+400"/>
+        <location line="+448"/>
         <source>Elapsed:</source>
         <translation>經過時間:</translation>
     </message>
@@ -4993,32 +5874,32 @@
         <translation>00:00:00</translation>
     </message>
     <message>
-        <location line="-511"/>
+        <location line="-512"/>
         <source>Time Remaining:</source>
         <translation>剩餘時間:</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+52"/>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-76"/>
         <source>Phase:</source>
         <translation>階段:</translation>
     </message>
     <message>
-        <location line="+416"/>
+        <location line="+472"/>
         <source>Quantiser:</source>
         <translation>量化器:</translation>
     </message>
     <message>
-        <location line="-389"/>
+        <location line="-437"/>
         <source>Shut down computer when finished</source>
         <translation>完成後關閉電腦</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+168"/>
         <source>Pause / Abort</source>
         <translation>暫停 / 停止</translation>
     </message>
@@ -5033,17 +5914,27 @@
         <translation>容器:</translation>
     </message>
     <message>
-        <location line="-316"/>
+        <location line="-348"/>
         <source>Encoding...</source>
         <translation>正在編碼...</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+129"/>
         <source>Keep dialog open when finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+24"/>
+        <source>Delete first pass log files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Output File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Minimize to Tray</source>
         <translation>縮到工具列上</translation>
     </message>
@@ -5058,8 +5949,8 @@
         <translation>幀/秒:</translation>
     </message>
     <message>
-        <location line="-504"/>
-        <location line="+254"/>
+        <location line="-536"/>
+        <location line="+286"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -5072,7 +5963,7 @@
 <context>
     <name>eq2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+62"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp" line="+60"/>
         <source>Reset</source>
         <translation>重新設定</translation>
     </message>
@@ -5090,7 +5981,7 @@
 <context>
     <name>eq2Dialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+253"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui" line="+246"/>
         <source>Red</source>
         <translation>紅</translation>
     </message>
@@ -5115,18 +6006,18 @@
         <translation>加重</translation>
     </message>
     <message>
-        <location line="-177"/>
+        <location line="-170"/>
         <location line="+31"/>
         <source>Contrast</source>
         <translation>對比</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+77"/>
         <source>&lt;b&gt;Gamma&lt;/b&gt;</source>
         <translation>&lt;b&gt;珈碼&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-44"/>
+        <location line="-37"/>
         <source>Saturation</source>
         <translation>飽和度</translation>
     </message>
@@ -5135,11 +6026,6 @@
         <source>Brightness</source>
         <translation>亮度</translation>
     </message>
-    <message>
-        <location line="+40"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>faac</name>
@@ -5160,9 +6046,498 @@
     </message>
 </context>
 <context>
+    <name>fadeFromImage</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp" line="+38"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use image at start time for fading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp" line="+82"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <location line="+19"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <location line="+22"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeFromImageDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui" line="+14"/>
+        <source>Fade from first image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Effect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Linear blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Slide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Wipe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Push</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Inverse luma dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Static random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Dynamic random dissolve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Start preview play before time scope, if you see green.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOut</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp" line="+24"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to color.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp" line="+42"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+99"/>
+        <location line="+29"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+32"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeInOutDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui" line="+14"/>
+        <source>Fade in/out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Pick color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThrough</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp" line="+32"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade through combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+162"/>
+        <source>_Start time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_End time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>Not possible!
+Start and/or end time would be out of range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+170"/>
+        <location line="+186"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-183"/>
+        <location line="+196"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="-518"/>
+        <source>Fade in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade in from combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp" line="+32"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp" line="+2"/>
+        <source>Fade out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Fade out to combination of multiple effects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fadeThroughDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui" line="+20"/>
+        <source>Fade through</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Time scope: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Center: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Duration: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Manual time entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set from A-B markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Set center as A marker, duration is 2×|A-B|</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+19"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-11"/>
+        <location line="+128"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-790"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Transient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-896"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Raised cosine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Ramp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+131"/>
+        <location line="+126"/>
+        <location line="+200"/>
+        <source>Inverse quadratic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-905"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+257"/>
+        <location line="+200"/>
+        <source>Exponential</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-902"/>
+        <location line="+128"/>
+        <location line="+200"/>
+        <location line="+125"/>
+        <location line="+126"/>
+        <location line="+131"/>
+        <location line="+200"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-880"/>
+        <location line="+19"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+109"/>
+        <source>Color blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+582"/>
+        <source>Pick color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-516"/>
+        <source>Peak amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Blur radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+106"/>
+        <source>Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+107"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Peak zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Vignette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Peak opening</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>fadeTo</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+55"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp" line="+59"/>
         <location line="+23"/>
         <source>Fade</source>
         <translation>1.4-淡化效果</translation>
@@ -5408,7 +6783,7 @@
 <context>
     <name>ffmpeg2</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+271"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp" line="+284"/>
         <source>Three threads</source>
         <translation>三個線程</translation>
     </message>
@@ -5534,7 +6909,7 @@
     </message>
     <message>
         <location line="-58"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>兩個線程</translation>
     </message>
     <message>
@@ -5611,7 +6986,7 @@
 <context>
     <name>ffmpeg4</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp" line="+210"/>
         <source>Three threads</source>
         <translation>三個線程</translation>
     </message>
@@ -5712,7 +7087,7 @@
     </message>
     <message>
         <location line="-21"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>兩個線程</translation>
     </message>
     <message>
@@ -6119,12 +7494,12 @@
 <context>
     <name>ffpsmuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+51"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp" line="+54"/>
         <source>Free</source>
         <translation>自由</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Muxing Format</source>
         <translation>複合器格式</translation>
     </message>
@@ -6134,7 +7509,7 @@
         <translation>Mpeg PS 複合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+208"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp" line="+209"/>
         <source> video not compatible
 </source>
         <translation> 影片不相容
@@ -6184,12 +7559,12 @@
 </translation>
     </message>
     <message>
-        <location line="-200"/>
+        <location line="-201"/>
         <source>[Mismatch]</source>
         <translation>[Mismatch]</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+166"/>
         <source> Bad width/height for DVD
 </source>
         <translation> 不對的寬度/高度為 DVD
@@ -6243,15 +7618,78 @@
         <translation>VBR 複合</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+161"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp" line="+162"/>
         <source>Saving mpeg TS (ff)</source>
         <translation>儲存 mpeg TS (ff)</translation>
     </message>
 </context>
 <context>
+    <name>ffv1</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp" line="+139"/>
+        <source>Golomb-Rice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Range Coder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Coder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Context:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Threads:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Error correction/detection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>FFV1 Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ffvtenc</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+159"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp" line="+157"/>
         <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6345,6 +7783,178 @@
     </message>
 </context>
 <context>
+    <name>fitToSize</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp" line="+58"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Resize and pad to the specified size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp" line="+186"/>
+        <source>Width and height cannot be odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fitToSizeDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui" line="+14"/>
+        <source>Fit to size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Output settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>No rounding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Round to the Nearest Multiple of 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Aspect ratio tolerance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>0%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>100%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Padding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Current input dimensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Resized to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Required padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flip</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp" line="+36"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertically/Horizontally flip the image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>flipDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui" line="+14"/>
+        <source>Flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>flux</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFlux.cpp" line="+38"/>
@@ -6858,16 +8468,11 @@
         <source>Saturation</source>
         <translation>飽和度</translation>
     </message>
-    <message>
-        <location line="+54"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>huff</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+114"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp" line="+112"/>
         <source>Type:</source>
         <translation>型:</translation>
     </message>
@@ -6877,7 +8482,7 @@
         <translation>HuffYUV配置</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-7"/>
         <source>HUFFYUV</source>
         <translation>HUFFYUV</translation>
     </message>
@@ -6901,6 +8506,82 @@
     </message>
 </context>
 <context>
+    <name>imageStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp" line="+41"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce camera shakiness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui" line="+14"/>
+        <source>Image stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Motion estimation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>accurate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>fast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Auto Gravity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>indexing</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/T_index_pg.cpp" line="+17"/>
@@ -6926,8 +8607,8 @@
 <context>
     <name>ivtcRemover</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+142"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+431"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="+141"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+430"/>
         <source>Fast</source>
         <translation>快</translation>
     </message>
@@ -6938,8 +8619,8 @@
         <translation>全部</translation>
     </message>
     <message>
-        <location line="-6"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-5"/>
+        <location line="-5"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-4"/>
         <source>_Noise:</source>
         <translation>雜訊:</translation>
     </message>
@@ -6955,30 +8636,30 @@
         <translation>刪除重複：</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+14"/>
+        <location line="+11"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+11"/>
         <source>DupeRemover</source>
         <translation>刪除重複的幀</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-349"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-346"/>
         <source>Remove IVTC dupe.</source>
         <translation>2.6-刪除重複的幀(IVTC)。</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-8"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+341"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp" line="-6"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+340"/>
         <source>VeryFast</source>
         <translation>非常快</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+5"/>
+        <location line="+3"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="+3"/>
         <source>_Frame rate change:</source>
         <translation>幀率改變:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-345"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp" line="-342"/>
         <source>Remove the duplicate frames present after ivtc.</source>
         <translation>刪除重複的幀(IVTC)和PAL智慧型一樣.</translation>
     </message>
@@ -7148,12 +8829,11 @@
 <context>
     <name>jpeg</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+103"/>
         <source>_ColorSpace:</source>
-        <translation>色彩空間：</translation>
+        <translation type="vanished">色彩空間：</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp" line="+104"/>
         <source>Mjpeg Configuration</source>
         <translation>Mjpeg 配置</translation>
     </message>
@@ -7163,12 +8843,17 @@
         <translation>量化器:</translation>
     </message>
     <message>
-        <location line="-11"/>
+        <location line="-3"/>
         <source>YUV420</source>
         <translation>YUV420</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="+4"/>
+        <source>_Pixel format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-5"/>
         <source>YUV422</source>
         <translation>YUV422</translation>
     </message>
@@ -7320,7 +9005,7 @@
 <context>
     <name>lavcodec</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+517"/>
+        <location filename="../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp" line="+470"/>
         <source>_Bitrate:</source>
         <translation>位元率:</translation>
     </message>
@@ -7494,6 +9179,62 @@
     </message>
 </context>
 <context>
+    <name>lumaStab</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp" line="+41"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Reduce flickering.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>lumaStabDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui" line="+14"/>
+        <source>Luma stabilizer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Filter length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Scene threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Adjust chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Adjust target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Prefer contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Prefer brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>lumaonly</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/lumaOnly/lumaOnly.cpp" line="+44"/>
@@ -7509,7 +9250,7 @@
 <context>
     <name>mainFilterDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+135"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/mainfilter.ui" line="+144"/>
         <source>Noise</source>
         <translation>雜訊-清除</translation>
     </message>
@@ -7524,12 +9265,17 @@
         <translation>關閉(&amp;C)</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-311"/>
         <source>Video Filter Manager</source>
         <translation>影片濾鏡管理器</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <source>Colors</source>
         <translation>色彩-特效</translation>
     </message>
@@ -7559,12 +9305,12 @@
         <translation>預覽(&amp;P)</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-212"/>
         <source>Transform</source>
         <translation>變形(轉型)</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+45"/>
         <source>Sharpness</source>
         <translation>銳利-特效</translation>
     </message>
@@ -7587,12 +9333,12 @@
 <context>
     <name>matroskademuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+591"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp" line="+634"/>
         <source>Matroska clusters</source>
         <translation>Matroska 集群</translation>
     </message>
     <message>
-        <location line="-544"/>
+        <location line="-586"/>
         <source>Matroska Images</source>
         <translation>Matroska 圖像</translation>
     </message>
@@ -7698,7 +9444,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+139"/>
         <source>Saving WebM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8070,12 +9816,13 @@
 <context>
     <name>mp4demuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+885"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp" line="+1076"/>
         <source>Problem reading SVQ3 headers</source>
         <translation>讀取 SVQ3 檔頭時發生問題</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+499"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp" line="+509"/>
+        <location line="+111"/>
         <source>Decoding frame type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8205,7 +9952,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+107"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="+108"/>
         <source>Video track is incompatible</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8235,7 +9982,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
+        <location line="+204"/>
         <source>Saving PSP</source>
         <translation>儲存 PSP</translation>
     </message>
@@ -8245,7 +9992,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+13"/>
+        <source>Optimizing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-16"/>
         <source>Saving mp4</source>
         <translation>儲存 mp4</translation>
     </message>
@@ -8255,7 +10007,7 @@
         <translation>複合器</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-191"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp" line="-198"/>
         <source>Unsupported</source>
         <translation>未支援的</translation>
     </message>
@@ -8263,7 +10015,7 @@
 <context>
     <name>mp4v2muxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+180"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp" line="+181"/>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
@@ -8273,7 +10025,12 @@
         <translation>影片</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="+61"/>
+        <source>Optimizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-121"/>
         <source>Audio format not supported, only AAC/MP3/AC3</source>
         <translation>音訊格式不受支援，只有 AAC/MP3/AC3</translation>
     </message>
@@ -8379,7 +10136,7 @@
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+454"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp" line="+472"/>
         <source>You can resize the red rectangle using the grips </source>
         <translation>你可以調整大小使用支配的紅色矩形 </translation>
     </message>
@@ -8400,12 +10157,12 @@
 <context>
     <name>msharpenDialog</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+133"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui" line="+73"/>
         <source>Mask</source>
         <translation>遮罩</translation>
     </message>
     <message>
-        <location line="-34"/>
+        <location line="-7"/>
         <source>Threshold</source>
         <translation>界限值</translation>
     </message>
@@ -8415,45 +10172,40 @@
         <translation>高品質</translation>
     </message>
     <message>
-        <location line="-24"/>
+        <location line="-14"/>
         <source>Process chroma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-54"/>
+        <location line="-31"/>
         <source>MSharpen</source>
         <translation>5.2-運動銳化(Msharpen)</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+38"/>
         <source>Strength</source>
         <translation>強度</translation>
     </message>
-    <message>
-        <location line="+51"/>
-        <source>Show full preview</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>navigate</name>
     <message>
-        <location filename="../../common/gui_navigate.cpp" line="+494"/>
+        <location filename="../../common/gui_navigate.cpp" line="+839"/>
         <source>Seek</source>
         <translation>尋求</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+87"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-486"/>
         <source>Cannot go to previous keyframe</source>
         <translation>轉到上一幀(關鍵幀或I幀)</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-66"/>
         <source>Cannot go to next keyframe</source>
         <translation>轉到下一幀(關鍵幀或I幀)</translation>
     </message>
@@ -8562,9 +10314,9 @@
 <context>
     <name>opendmldemuxer</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+321"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp" line="+342"/>
         <location line="+76"/>
-        <location line="+268"/>
+        <location line="+269"/>
         <source>Malformed header</source>
         <translation>不正常的標頭</translation>
     </message>
@@ -8577,7 +10329,7 @@
 <context>
     <name>partial</name>
     <message>
-        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+375"/>
+        <location filename="../../common/ADM_videoFilter2/src/ADM_vidPartial.cpp" line="+388"/>
         <source>Partialize &quot;%s&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8640,7 +10392,7 @@
 <context>
     <name>propsDialog</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+311"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/props.ui" line="+325"/>
         <source>OK</source>
         <translation>確定</translation>
     </message>
@@ -8650,28 +10402,26 @@
         <translation>音訊</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-163"/>
         <source>Video</source>
         <translation>影片</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+236"/>
         <source>Bitrate:</source>
         <translation>位元率:</translation>
     </message>
     <message>
-        <location line="-83"/>
         <source>Extra data :</source>
-        <translation>額外的資料:</translation>
+        <translation type="vanished">額外的資料:</translation>
     </message>
     <message>
-        <location line="-42"/>
         <source>Extra Video Properties</source>
-        <translation>額外的影片屬性</translation>
+        <translation type="vanished">額外的影片屬性</translation>
     </message>
     <message>
-        <location line="-52"/>
-        <location line="+135"/>
+        <location line="-184"/>
+        <location line="+142"/>
         <source>Total Duration:</source>
         <translation>總持續時間:</translation>
     </message>
@@ -8681,27 +10431,63 @@
         <translation>編解碼器:</translation>
     </message>
     <message>
-        <location line="-125"/>
         <source>ExtraDataSize:</source>
-        <translation>額外的資料大小：</translation>
+        <translation type="vanished">額外的資料大小：</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="-270"/>
         <source>Properties</source>
         <translation>屬性(&amp;I)</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+30"/>
+        <location line="+14"/>
+        <location line="+35"/>
+        <location line="+7"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+31"/>
+        <location line="+55"/>
+        <location line="+21"/>
+        <location line="+14"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+14"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-212"/>
         <source>Image Size:</source>
         <translation>圖像大小(SAR):</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+21"/>
         <source>Frame Rate:</source>
         <translation>幀率:</translation>
     </message>
     <message>
-        <location line="+170"/>
+        <location line="+28"/>
+        <source>Average Bitrate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Video Codec Extradata</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Extradata:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Variable Bitrate:</source>
         <translation>可變位元率(VBR):</translation>
     </message>
@@ -8721,7 +10507,7 @@
         <translation>頻率:</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-142"/>
         <source>Codec 4CC:</source>
         <translation>編解碼器 4CC:</translation>
     </message>
@@ -8731,13 +10517,8 @@
         <translation>像素比例(PAR):</translation>
     </message>
     <message>
-        <location line="-35"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <location line="+14"/>
         <source>TextLabel</source>
-        <translation>文字標籤</translation>
+        <translation type="vanished">文字標籤</translation>
     </message>
 </context>
 <context>
@@ -8762,38 +10543,38 @@
 <context>
     <name>qaudiotracks</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+517"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_audioTracks.cpp" line="+522"/>
         <source>copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location line="-363"/>
+        <location line="-366"/>
         <location line="+161"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+136"/>
         <source>File </source>
         <translation>檔案 </translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-136"/>
         <source>Some tracks are used multiple times</source>
         <translation>一些軌道使用多次</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+128"/>
         <source>Track </source>
         <translation>軌 </translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>.... Add audio track</source>
         <translation>....增加音訊軌</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-354"/>
         <source>Select audio file</source>
         <translation>將選擇音訊檔案</translation>
     </message>
@@ -8803,7 +10584,7 @@
         <translation>不能使用該檔作為音訊軌道</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+289"/>
         <source> from video</source>
         <translation> 來至影片</translation>
     </message>
@@ -8811,44 +10592,48 @@
 <context>
     <name>qencoding</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+406"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_encoding.cpp" line="+469"/>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location line="-341"/>
+        <location line="-404"/>
         <location line="+20"/>
         <source>Privileges Required</source>
         <translation>需要特殊權限</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>Pass 1</source>
-        <translation>通過 1</translation>
+        <translation type="vanished">通過 1</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+384"/>
         <source>Resume</source>
         <translation>繼續</translation>
     </message>
     <message>
-        <location line="-341"/>
+        <location line="-404"/>
         <location line="+20"/>
         <source>Root privileges are required to perform this operation.</source>
         <translation>需要 Root 權限來實行這項操作。</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+143"/>
         <source>First Pass</source>
         <translation>快速第1通</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
+        <source>Second Pass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Encoding...</source>
         <translation>編碼中...</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+232"/>
         <source>The encoding is paused. Do you want to resume or abort?</source>
         <translation>編碼已經暫停。您要繼續或中止?</translation>
     </message>
@@ -8876,64 +10661,89 @@
 <context>
     <name>qgui2</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2293"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/Q_gui2.cpp" line="+2740"/>
         <source>%c-%s (%02d)</source>
         <translation>%c-%s (%02d)</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-1142"/>
         <source>Set start marker</source>
         <translation>設定開始標記</translation>
     </message>
     <message>
-        <location line="-825"/>
+        <location line="-884"/>
         <source>Recent Projects</source>
         <translation>最近使用的 專案(&amp;P)</translation>
     </message>
     <message>
-        <location line="+1558"/>
+        <location line="+1777"/>
         <source>The application has encountered a fatal problem
 The current editing has been saved and will be reloaded at next start</source>
         <translation>應用程式遇到了一個致命的問題
 當前編輯已保儲存, 將在下一開始重新載入</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-901"/>
         <source>Go to previous keyframe</source>
         <translation>轉到上一幀(關鍵幀或I幀)</translation>
     </message>
     <message>
-        <location line="-1068"/>
+        <location line="-1330"/>
         <source>&lt;b&gt;New version available&lt;/b&gt;&lt;br&gt; Version %1&lt;br&gt;Released on %2.&lt;br&gt;You can download it here&lt;br&gt; &lt;a href=&apos;%3&apos;&gt;%3&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;small&gt; You can disable autoupdate in preferences.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+250"/>
+        <location line="+453"/>
         <source>Recent Files</source>
         <translation>最近使用的 檔案(&amp;F)</translation>
     </message>
     <message>
+        <location line="+33"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+592"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+256"/>
         <source>Go to next keyframe</source>
         <translation>轉到下一幀(關鍵幀或I幀)</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+12"/>
+        <source>Go to previous cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Go to next cut point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
         <source>Backward one minute</source>
         <translation>倒退一分鐘</translation>
     </message>
     <message>
-        <location line="+1002"/>
+        <location line="+420"/>
+        <source>Zoom: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+671"/>
+        <source>%c-%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+80"/>
         <source>Selection: </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+302"/>
+        <location line="+344"/>
         <location line="+2"/>
         <source> (%n track(s))</source>
         <translation type="unfinished">
@@ -8941,17 +10751,17 @@
         </translation>
     </message>
     <message>
-        <location line="-1337"/>
+        <location line="-1548"/>
         <source>Go to first frame</source>
         <translation>轉到第一幀</translation>
     </message>
     <message>
-        <location line="-30"/>
+        <location line="-38"/>
         <source>Play/Stop</source>
         <translation>播放/停止</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+46"/>
         <source>Go to marker A</source>
         <translation>轉到標記A(選擇開始)</translation>
     </message>
@@ -8961,17 +10771,17 @@
         <translation>轉到標記B(選擇結束)</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="-26"/>
         <source>Set end marker</source>
         <translation>設定結束標記</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+48"/>
         <source>Forward one minute</source>
         <translation>前進一分鐘</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-68"/>
         <source>Go to previous frame</source>
         <translation>轉到上一幀</translation>
     </message>
@@ -8981,7 +10791,7 @@
         <translation>轉到下一幀</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Go to last frame</source>
         <translation>轉到最後一幀</translation>
     </message>
@@ -9019,12 +10829,12 @@
         <translation>參考腳本</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+180"/>
         <source>Restore previous session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-236"/>
         <source>&amp;Run Project...</source>
         <translation>執行專案(&amp;R)...</translation>
     </message>
@@ -9134,22 +10944,33 @@
 <context>
     <name>qmainfilter</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+690"/>
+        <location filename="../ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp" line="+844"/>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+240"/>
         <source>Save video filters..</source>
         <translation>儲存影片濾鏡器..</translation>
     </message>
     <message>
-        <location line="-280"/>
+        <location line="-388"/>
+        <location line="+80"/>
         <source>Make partial</source>
         <translation>局部</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-490"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>DISABLED </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+402"/>
         <source>Move up</source>
         <translation>向上移動</translation>
     </message>
@@ -9159,33 +10980,64 @@
         <translation>配置</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+106"/>
+        <location line="+2"/>
+        <location line="+154"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-349"/>
+        <location line="+28"/>
         <source>Partial</source>
         <translation>區段</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+0"/>
+        <source>This filter is not partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+164"/>
         <source>Move down</source>
         <translation>向下移動</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Enable/Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+74"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Make global</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+146"/>
         <source>Press %s to accept the dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+148"/>
         <source>Load video filters..</source>
         <translation>載入影片濾鏡器..</translation>
     </message>
     <message>
-        <location line="-414"/>
+        <location line="-569"/>
         <source>This filter cannot be made partial</source>
         <translation>無法將此濾鏡器局部播放</translation>
     </message>
@@ -9193,7 +11045,7 @@
 <context>
     <name>qprocessing</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+163"/>
+        <location filename="../ADM_userInterfaces/ADM_dialog/Q_processing.cpp" line="+165"/>
         <source>_Resume</source>
         <translation>恢復</translation>
     </message>
@@ -9203,12 +11055,12 @@
         <translation>取消它嗎?</translation>
     </message>
     <message>
-        <location line="-96"/>
+        <location line="-98"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+97"/>
         <source>The processing is paused.</source>
         <translation>程序暫停.</translation>
     </message>
@@ -9225,8 +11077,23 @@
         <source>Yes</source>
         <translation>是</translation>
     </message>
+    <message>
+        <location line="+40"/>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%d kbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>(+%d bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
-        <location line="+72"/>
+        <location line="+24"/>
         <location line="+2"/>
         <source>Audio (%n active track(s))</source>
         <translation type="unfinished">
@@ -9239,101 +11106,86 @@
         <translation>單音</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Audio</source>
-        <translation>音訊</translation>
+        <translation type="vanished">音訊</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>Video</source>
-        <translation>影片</translation>
+        <translation type="vanished">影片</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Image Size:	</source>
-        <translation>圖片大小(SAR):	</translation>
+        <translation type="vanished">圖片大小(SAR):	</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+155"/>
         <source>No Audio</source>
         <translation>沒音訊</translation>
     </message>
     <message>
-        <location line="-38"/>
         <source>Frame Rate:	</source>
-        <translation>幀率:	</translation>
+        <translation type="vanished">幀率:	</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-254"/>
         <source>%2.3f fps</source>
         <translation>%2.3f fps</translation>
     </message>
     <message>
-        <location line="+144"/>
         <source>Extra data:	</source>
-        <translation>額外資料：:	</translation>
+        <translation type="vanished">額外資料：:	</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>Aspect Ratio:	</source>
-        <translation>縱橫比例(PAR):	</translation>
+        <translation type="vanished">縱橫比例(PAR):	</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Extra Video Properties</source>
-        <translation>額外影片屬性</translation>
+        <translation type="vanished">額外影片屬性</translation>
     </message>
     <message>
-        <location line="-132"/>
-        <location line="+90"/>
+        <location line="+13"/>
+        <location line="+105"/>
         <source>%02d:%02d:%02d.%03d</source>
         <translation>%02d:%02d:%02d.%03d</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Channels:	</source>
-        <translation>頻道:	</translation>
+        <translation type="vanished">頻道:	</translation>
     </message>
     <message>
-        <location line="-33"/>
         <source>Codec 4CC:	</source>
-        <translation>編解碼器 4CC:	</translation>
+        <translation type="vanished">編解碼器 4CC:	</translation>
     </message>
     <message>
-        <location line="-48"/>
+        <location line="-16"/>
         <source>Stereo</source>
         <translation>立體聲</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Codec:		</source>
-        <translation>編解碼器：		</translation>
+        <translation type="vanished">編解碼器：		</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-104"/>
         <source>%s (%u:%u)</source>
         <translation>%s (%u:%u)</translation>
     </message>
     <message>
-        <location line="+163"/>
         <source>Bitrate:	</source>
-        <translation>位元率:	</translation>
+        <translation type="vanished">位元率:	</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Frequency:	</source>
-        <translation>頻率:	</translation>
+        <translation type="vanished">頻率:	</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>ExtraDataSize:	</source>
-        <translation>額外的資料大小：	</translation>
+        <translation type="vanished">額外的資料大小：	</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+33"/>
         <source>Total Duration:	</source>
-        <translation>總持續時間：	</translation>
+        <translation type="vanished">總持續時間：	</translation>
     </message>
 </context>
 <context>
@@ -9409,6 +11261,63 @@
     </message>
 </context>
 <context>
+    <name>quadTrans</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp" line="+42"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Four point transform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>quadTransDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui" line="+14"/>
+        <source>Quadrilateral transformation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+27"/>
+        <location line="+74"/>
+        <location line="+34"/>
+        <source>Δy:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-115"/>
+        <location line="+14"/>
+        <location line="+50"/>
+        <location line="+34"/>
+        <source>Δx:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>qvobsub</name>
     <message>
         <location filename="../ADM_userInterfaces/ADM_dialog/Q_vobsub.cpp" line="+88"/>
@@ -9429,7 +11338,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp" line="+83"/>
         <source>Saving raw video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9490,7 +11399,7 @@
 <context>
     <name>resampleFps</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+46"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp" line="+47"/>
         <source>29.97 (NTSC)</source>
         <translation>29.97 (NTSC)</translation>
     </message>
@@ -9510,50 +11419,70 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+36"/>
         <source>Resample FPS</source>
         <translation>1.0-調整幀速度(重新取樣)-用在數碼轉換DVD</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+366"/>
         <source>Resample fps</source>
         <translation>重新取樣 fps</translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-407"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
-        <location line="+322"/>
+        <location line="+399"/>
         <source>_Mode:</source>
         <translation>模式:</translation>
     </message>
     <message>
-        <location line="-320"/>
+        <location line="-397"/>
         <source>23.976 (Film)</source>
         <translation>23.976 (電影)</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Change and enforce FPS. Keep duration and sync.</source>
         <translation>結束時間仍然一樣，例如15 fps電影從數碼轉換 DVD，一般PC上看不出來效果。</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+349"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Blend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Motion compensation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>_New frame rate:</source>
         <translation>新幀率:</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>_Interpolation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>resize</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+82"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp" line="+83"/>
         <source>swScale Resizer.</source>
         <translation>調整比例像素大小。</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+336"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp" line="+434"/>
         <source>Width and height cannot be odd</source>
         <translation>寬度和高度不能為奇數</translation>
     </message>
@@ -9592,12 +11521,12 @@
         <translation type="vanished">目的檔:</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+161"/>
         <source>Bilinear</source>
         <translation>雙線性</translation>
     </message>
     <message>
-        <location line="-75"/>
+        <location line="-102"/>
         <source>Error X / Y:</source>
         <translation>錯誤 X / Y:</translation>
     </message>
@@ -9663,7 +11592,17 @@
         <translation>百分比</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+119"/>
+        <source>0.0000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>(00:00)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <source>Lanczos-3</source>
         <translation>Lanczos-3三階線性</translation>
     </message>
@@ -9673,7 +11612,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
+        <location line="+5"/>
+        <source>Nearest neighbor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-15"/>
         <source>Bicubic</source>
         <translation>雙立方</translation>
     </message>
@@ -9682,7 +11626,7 @@
         <translation type="vanished">來源:</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-310"/>
         <source>Round to the Nearest Multiple of 16</source>
         <translation>被最接近16倍整除的四捨五入整數</translation>
     </message>
@@ -9697,7 +11641,7 @@
         <translation>高度:</translation>
     </message>
     <message>
-        <location line="+315"/>
+        <location line="+342"/>
         <source>Resize Method:</source>
         <translation>調整大小方式:</translation>
     </message>
@@ -9705,38 +11649,40 @@
 <context>
     <name>rotate</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+209"/>
         <source>90°</source>
-        <translation>90°</translation>
+        <translation type="vanished">90°</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp" line="+206"/>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>180°</source>
-        <translation>180°</translation>
+        <translation type="vanished">180°</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>270°</source>
-        <translation>270°</translation>
+        <translation type="vanished">270°</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>_Angle:</source>
         <translation>角度:</translation>
     </message>
     <message>
-        <location line="-161"/>
-        <location line="+163"/>
+        <location line="-159"/>
+        <location line="+161"/>
         <source>Rotate</source>
         <translation>1.1-順時針旋轉</translation>
     </message>
     <message>
-        <location line="-5"/>
+        <location line="-6"/>
+        <source>90° clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>180 degrees</source>
         <translation>180 度</translation>
     </message>
@@ -9746,12 +11692,17 @@
         <translation>270 度</translation>
     </message>
     <message>
+        <location line="+0"/>
+        <source>90° contraclockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="-2"/>
         <source>90 degrees</source>
         <translation>90 度</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-154"/>
         <source>Rotate the image by 90/180/270 degrees.</source>
         <translation>旋轉圖片90/180/270度.</translation>
     </message>
@@ -9759,7 +11710,7 @@
 <context>
     <name>seekablePreviewDialog</name>
     <message>
-        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+93"/>
+        <location filename="../ADM_UIs/src/DIA_flyDialog.cpp" line="+129"/>
         <source>&gt;</source>
         <translation>&gt;</translation>
     </message>
@@ -9779,7 +11730,17 @@
         <translation>播放/停止</translation>
     </message>
     <message>
-        <location line="-2"/>
+        <location line="-19"/>
+        <source>Peek Original</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Show unprocessed input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
         <source>Back one minute</source>
         <translation>後一分鐘</translation>
     </message>
@@ -9850,17 +11811,17 @@
     <name>stillimage</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp" line="+63"/>
-        <location line="+186"/>
+        <location line="+191"/>
         <source>Still Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-185"/>
+        <location line="-190"/>
         <source>Duplicate frames for a given duration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+186"/>
         <source>_Start time:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10039,7 +12000,7 @@
 <context>
     <name>timestamp</name>
     <message>
-        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+187"/>
+        <location filename="../ADM_UIs/src/T_timeStamp.cpp" line="+198"/>
         <source> h</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,7 +12018,7 @@
 <context>
     <name>tinypy</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+351"/>
+        <location filename="../../../avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp" line="+426"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10076,7 +12037,7 @@
     <name>tsdemuxer</name>
     <message>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp" line="+278"/>
-        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+348"/>
+        <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp" line="+349"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp" line="+105"/>
         <location filename="../../../avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp" line="+74"/>
         <source>Indexing</source>
@@ -10653,6 +12614,88 @@
     </message>
 </context>
 <context>
+    <name>waveletDenoise</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp" line="+42"/>
+        <source>Wavelet denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s denoiser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletDenoiseDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui" line="+14"/>
+        <source>Wavelet Denoiser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Threshold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Softness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Denoise chroma</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharp</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp" line="+42"/>
+        <source>Wavelet sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Based on Marco Rossini&apos;s sharpener.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>waveletSharpDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui" line="+14"/>
+        <source>Wavelet Sharpener</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+124"/>
+        <source>Strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Noise cutoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>High quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>webmmuxer</name>
     <message>
         <source>Display width</source>
@@ -10707,17 +12750,17 @@
 <context>
     <name>x264</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+656"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp" line="+745"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-478"/>
+        <location line="-495"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location line="+629"/>
+        <location line="+652"/>
         <location line="+70"/>
         <location line="+14"/>
         <source>Error</source>
@@ -10736,12 +12779,12 @@
         <translation>儲存設定檔</translation>
     </message>
     <message>
-        <location line="-167"/>
+        <location line="-173"/>
         <source>Target Video Size:</source>
         <translation>目標影片大小:</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+246"/>
         <source>Do you really want to delete the </source>
         <translation>你準備希望刪除這 </translation>
     </message>
@@ -10756,22 +12799,22 @@
         <translation>刪除</translation>
     </message>
     <message>
-        <location line="-668"/>
+        <location line="-686"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
-        <location line="+648"/>
+        <location line="+666"/>
         <source>Cannot save preset</source>
         <translation>無法儲存預設定</translation>
     </message>
     <message>
-        <location line="-231"/>
+        <location line="-237"/>
         <source>Quantiser:</source>
         <translation>量化器:</translation>
     </message>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+199"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp" line="+206"/>
         <source>Not coded</source>
         <translation>不編碼</translation>
     </message>
@@ -10782,12 +12825,12 @@
         <translation>kbit/s</translation>
     </message>
     <message>
-        <location line="+207"/>
+        <location line="+213"/>
         <source>Replace the following preset ?:</source>
         <translation>替代以下的預設定嗎?:</translation>
     </message>
     <message>
-        <location line="-227"/>
+        <location line="-233"/>
         <source>Target Bitrate:</source>
         <translation>目標位元速率：</translation>
     </message>
@@ -10809,7 +12852,7 @@
         <translation>品質:</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+247"/>
         <source>Cannot delete custom profile</source>
         <translation>不能刪除自訂的設定檔</translation>
     </message>
@@ -10819,7 +12862,17 @@
         <translation>複寫</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-714"/>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+578"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -12047,17 +14100,17 @@
 <context>
     <name>x265</name>
     <message>
-        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+714"/>
+        <location filename="../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp" line="+732"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-442"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location line="+609"/>
+        <location line="+627"/>
         <location line="+67"/>
         <location line="+17"/>
         <source>Error</source>
@@ -12096,12 +14149,12 @@
         <translation>刪除</translation>
     </message>
     <message>
-        <location line="-624"/>
+        <location line="-642"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
-        <location line="+601"/>
+        <location line="+619"/>
         <source>Cannot save preset</source>
         <translation>無法儲存預設定</translation>
     </message>
@@ -12159,7 +14212,7 @@
         <translation>複寫</translation>
     </message>
     <message>
-        <location line="-672"/>
+        <location line="-690"/>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12174,7 +14227,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+554"/>
+        <location line="+572"/>
         <source>Macroblock-Tree optimisation requires Variance Adaptive Quantisation to be enabled.  Variance Adaptive Quantisation will automatically be enabled.
 
 Do you wish to continue?</source>
@@ -13082,7 +15135,7 @@
     </message>
     <message>
         <location line="-2966"/>
-        <source>x265 Configuraton</source>
+        <source>x265 Configuration</source>
         <translation>x265 配置</translation>
     </message>
     <message>
@@ -13520,7 +15573,7 @@
     </message>
     <message>
         <location line="-36"/>
-        <source>Two threads)</source>
+        <source>Two threads</source>
         <translation>兩個線程</translation>
     </message>
     <message>
@@ -13642,4 +15695,167 @@
         <translation>底部首先掃描</translation>
     </message>
 </context>
+<context>
+    <name>zoom</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp" line="+68"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Partializable crop filter.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp" line="+485"/>
+        <location line="+316"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>zoomDialog</name>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui" line="+14"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+14"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+105"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+42"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-28"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="+45"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui" line="-124"/>
+        <source>Resize Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bilinear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bicubic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Lanczos-3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Spline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Lock Aspect Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>&amp;Hide Rubber Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Selection: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+4"/>
+        <source>Do not lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>21:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>18:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>16:9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>4:3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>1:1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>9:16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Padding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>black bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>none (stretch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

avidemux_2.7.8.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml.in -> avidemux_2.8.0.tar.gz/avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml.in Changed

avidemux_2.7.8.tar.gz/avidemux/winInstaller/ChangeLog.release -> avidemux_2.8.0.tar.gz/avidemux/winInstaller/ChangeLog.release Changed

@@ -8,94 +8,122 @@
 <body>
   <div id="inner">
 
-    <h1>Changes in Avidemux v2.7.6 – v2.7.8</h1>
+    <h1>Changes in Avidemux v2.7.8 – v2.8.0</h1>
+
+    <h2>Behavior</h2>
+
+    <ul>
+      <li>The part of video preceding the presentation time of the first frame
+          is now excluded from created segment, making all videos appear as if
+          they &quot;start at zero&quot;.</li>
+      <li>When saving video, the frame matching the B marker is now excluded
+          from the exported range. Therefore, if the B marker is set to the last
+          frame of the video, it needs to be reset to the full duration for the
+          last frame to be included into the output.</li>
+      <li>Loading Matroska files with HEVC video tracks takes longer as slice
+          headers are decoded to detect the frame type.</li>
+    </ul>
+
+    <h2>New Video Filters</h2>
+
+    <ul>
+      <li>Analyzer</li>
+      <li>Blur (on selected area)</li>
+      <li>Cartoon</li>
+      <li>Color balance (adjust shadow, midtone and highlight)</li>
+      <li>Chroma hold (monochrome effect with kept colors)</li>
+      <li>Chroma key (replace &quot;green screen&quot; with an image)</li>
+      <li>Deband (reduce banding artifacts)</li>
+      <li>DelogoHQ (clean up arbitrary shaped logo)</li>
+      <li>Dynamic threshold</li>
+      <li>Fade from first image</li>
+      <li>Fade in (combination of multiple effects)</li>
+      <li>Fade out (combination of multiple effects)</li>
+      <li>Fade through (combination of multiple effects)</li>
+      <li>Fit to size (resize and pad to the specified size)</li>
+      <li>Flip (vertically/horizontally flip the image)</li>
+      <li>Grid (video wall effect)</li>
+      <li>Image stabilizer (reduce camera shakiness)</li>
+      <li>Luma stabilizer (reduce flickering)</li>
+      <li>Mirror</li>
+      <li>Posterize</li>
+      <li>Quadrilateral transformation (four point transform)</li>
+      <li>Wavelet denoiser</li>
+      <li>Wavelet sharpener</li>
+      <li>Zoom (partializable crop filter)</li>
+    </ul>
 
     <h2>New Features</h2>
 
     <ul>
-      <li>Many new video filters added by courtesy of
-          <a href="https://github.com/szlldm">szlldm</a>.</li>
-      <li>A dedicated MOV muxer is now available, replacing silent fallback to
-          MOV muxing mode within the MP4 muxer.</li>
-      <li>A subset of color info relevant for HDR support is retained in copy
-          mode when both input and output video are stored in Matroska / WebM
-          containers. Settings to add or override color info have been added to
-          MKV and WebM muxers.</li>
-      <li>The indexer in the MPEG-TS demuxer now detects resolution changes in
-          MPEG-2 and H.264 streams which are entirely unsupported and suggests
-          aborting indexing. If the user chooses to continue, it records file
-          offsets of all resolution changes to the log. This allows advanced
-          users to split the file at these offsets using other tools like
-          <em>head</em> and <em>tail</em> into chunks which can be processed
-          with Avidemux.</li>
-      <li>YUV varieties of the lossless Ut Video codec are supported now for
-          decoding and encoding via bundled FFmpeg libraries.</li>
-      <li>Uncompressed 24-bit audio is now supported for a subset of file formats.</li>
-      <li>Limited support for 7.1 channel layout.</li>
-      <li>Decode and stream copy support for XLL substream in DTS audio tracks.</li>
-      <li>Audio properties are now updated on resuming playback. This allows to
-          start saving after an audio format change. When audio format changes
-          during playback, the FFmpeg-based audio decoder will output silence
-          and keep format rather than producing garbage.</li>
-      <li>An option to keep the identity of markers A and B instead of swapping
-          them automatically has been added to Preferences.</li>
-      <li>The keyboard shortcut for "Delete" action has been made customizable
-          with alternative keyboard shortcuts enabled.</li>
+      <li>HDR video can be converted to SDR with tone mapping using a variety of
+          methods.</li>
+      <li>FFV1 encoder is back (it was available in Avidemux 2.5.x).</li>
+      <li>TrueHD audio tracks can be decoded and are supported for Matroska
+          containers.</li>
+      <li>Decoding support for WMA9 Lossless codec.</li>
+      <li>Filter previews have got a unified method to quickly compare filtered
+          and unfiltered inputs via the &quot;Peek Original&quot; button.</li>
+      <li>Blend and motion interpolation options added to &quot;Resample
+          FPS&quot; filter.</li>
+      <li>Mark cut points (segment boundaries) on the navigation slider. New
+          buttons and shortcuts are provided to jump to these cut points.</li>
+      <li>In the Video Filter Manager, active filters can be temporarily disabled.</li>
+      <li>Preference added to load sequentially named pictures in reverse order,
+          allowing to reverse video by exporting selection as JPEG images and
+          loading the first one.</li>
+      <li>During playback navigation is possible via keys or by dragging
+          the navigation slider.</li>
     </ul>
 
     <h2>Other Enhancements</h2>
 
     <ul>
-      <li>Multi-threaded video decoding is now available for the bundled FFmpeg.
-          On powerful multi-core CPUs, this can drastically improve decoding
-          performance. A maximum of 8 threads can be created, but a conservative
-          custom upper limit of 4 is recommended. Values above 8 cause decoding
-          failures. Multi-threaded decoding and HW accelerated decoding are
-          mutually exclusive, changes require application restart to have
-          effect.</li>
-      <li>The maximum supported resolution has been increased to 8192x8192</li>
-      <li>The bundled FFmpeg has been updated to the 4.2.4 release.</li>
-      <li>Non-standard display aspect ratios can be configured in MP4 muxer by
-          specifying display width.</li>
-      <li>MP4 muxer accepts now MPEG-1 and MPEG-2.</li>
-      <li>The configuration dialog of the x265 video encoder plugin enjoyed
-          massive cleanup and refactoring by
-          <a href="https://github.com/xyzzy42">Trent Piepho</a>, more Adaptive
-          Quatization Variance methods have been added.</li>
-      <li>Python interface has been substantially extended, includes now methods
-          to query segment properties, the number and filenames of loaded
-          videos, PTS of keyframes, methods to seek to time with preview
-          updated, to open file dialogs filtered by extension and a built-in
-          method to split filename extension from a given path.</li>
-      <li>Scripting shell now supports unicode characters.</li>
-      <li>On macOS, files can be loaded via Finder context menu or by dropping
-          them onto Avidemux icon in the dock.</li>
-      <li>On Linux, Jobs GUI and the CLI executable can be launched from
-          AppImage by creating a symlink with _jobs or _cli in filename
-          respectively and running the AppImage via this symlink.</li>
+      <li>&quot;Resample FPS&quot; and &quot;Change FPS&quot; filters can handle
+          up to 1000 fps.</li>
+      <li>&quot;Crop&quot; filter's preview has got a translucent green
+          masking.</li>
+      <li>&quot;Crop&quot; filter's Auto Crop function can achieve perfect crops
+          (if the selected frame is not too dark).</li>
+      <li>The maximum output resolution of the &quot;Resize&quot; filter has
+          been increased to 8192x8192</li>
+      <li>The &quot;Resize&quot; filter has got a nearest neighbour scaling
+          option.</li>
+      <li>Improved HiDPI scaling in previews.</li>
+      <li>x264 video encoder plugin now allows to specify color properties.</li>
+      <li>Maximized window state, widget visibility and toolbar position are
+          preserved after application restart.</li>
+      <li>Timestamps in format 00:00:00.000 like copied to clipboard by pressing
+          CTRL+SHIFT+C can be pasted into the "Go to Time" dialog using
+          CTRL+V.</li>
+      <li>PulseAudioSimple audio device has been replaced with full PulseAudio,
+          making an in-application volume control available (Linux only).</li>
+      <li>ALSA audio device plugin has been modified to use soft volume,
+          providing application-specific volume control which works with every
+          ALSA device.</li>
+      <li>In the Video Filter Manager, navigation by keyboard has been enhanced.</li>
+      <li>The VU meter (&quot;Audio Metre&quot;) has been redesigned.</li>
     </ul>
 
     <h2>Bugfixes</h2>
 
     <ul>
-      <li>Rate control was broken in some video encoders, especially in VP9 and
-          in NVENC-based encoders, fixed now.</li>
-      <li>Multiple issues in cut point checks for H.264 and HEVC streams in copy
-          mode, leading to incorrect check results, were identified and
-          resolved.</li>
-      <li>The first two frames of external AC3 or EAC3 audio tracks are not
-          dropped anymore. This regression from enhanced protection against
-          false positives, added 3 years ago, has been finally identified and
-          fixed.</li>
-      <li>Indexing of MPEG-TS files with HEVC video was broken when video stream
-          lacked access unit delimiters. The issue was identified and fixed
-          right after 2.7.7 had been tagged as released and is the reason why
-          version 2.7.7 was superseded by 2.7.8.</li>
-      <li>VU meter was grossly ahead of audio output on Windows, now it is just
-          a tiny little bit ahead.</li>
-      <li>Numerous other fixes and overall polish.</li>
+      <li>Occasional UI unrepsonsiveness during playback should be fixed.</li>
+      <li>Prevent navigation key events piling up.</li>
+      <li>Thumb slider, displaced by mouse wheel, is now automatically reset if
+          the end of video is reached, stopping Avidemux log file from filling
+          disk space.</li>
+      <li>Purple tint in old &quot;Fade to&quot; and &quot;Fade to black&quot;
+          filters on macOS fixed.</li>
+      <li>Green tint in &quot;MPlayer eq2&quot; filter is fixed.</li>
+    </ul>
+
+    <h2>Miscellaneous</h2>
+
+    <ul>
+      <li>Bundled FFmpeg libraries have been updated to 4.4.1 release.</li>
     </ul>
 
-    </div>
+  </div>
 </body>
 </html>

avidemux_2.7.8.tar.gz/avidemux/winInstaller/avidemux_crossQt5Tail.nsi -> avidemux_2.8.0.tar.gz/avidemux/winInstaller/avidemux_crossQt5Tail.nsi Changed

@@ -13,7 +13,7 @@
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     SetOutPath $INSTDIR
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\${SHORTCUT_NAME}.lnk" $INSTDIR\avidemux.exe
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Avidemux job control (${BUILD_BITS} Bits).lnk" $INSTDIR\avidemux_jobs.exe
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Avidemux job control ${CORE_VERSION} (${BUILD_BITS} Bits).lnk" $INSTDIR\avidemux_jobs.exe
     !insertmacro MUI_STARTMENU_WRITE_END
 ${MementoSectionEnd}
 
@@ -66,7 +66,7 @@
     Delete /REBOOTOK "$QUICKLAUNCH\${SHORTCUT_NAME}.lnk"
     Delete /REBOOTOK "$DESKTOP\${SHORTCUT_NAME}.lnk"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\${SHORTCUT_NAME}.lnk"
-    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Avidemux job control (${BUILD_BITS} Bits).lnk"
+    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Avidemux job control ${CORE_VERSION} (${BUILD_BITS} Bits).lnk"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Change Log ${CORE_VERSION}.lnk"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\AVS Proxy GUI ${CORE_VERSION}.lnk"
     RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup

avidemux_2.7.8.tar.gz/avidemux/winInstaller/createCrossNsisQt5.sh -> avidemux_2.8.0.tar.gz/avidemux/winInstaller/createCrossNsisQt5.sh Changed

avidemux_2.7.8.tar.gz/avidemux/winInstaller/createNativeNsisQt564Vc.sh -> avidemux_2.8.0.tar.gz/avidemux/winInstaller/createNativeNsisQt564Vc.sh Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_core/include/ADM_cpuCap.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_core/include/ADM_cpuCap.h Changed

@@ -39,6 +39,10 @@
         ADM_CPUCAP_SSE3   =1<<7,
         ADM_CPUCAP_SSSE3  =1<<8,
         ADM_CPUCAP_ALTIVEC=1<<9,
+        ADM_CPUCAP_SSE4   =1<<10,
+        ADM_CPUCAP_SSE42  =1<<11,
+        ADM_CPUCAP_AVX    =1<<12,
+        ADM_CPUCAP_AVX2    =1<<13,
         
         ADM_CPUCAP_ALL=0x0fffffff
 } ADM_CPUCAP;
@@ -55,6 +59,7 @@
 	static void 	init( void);
         static bool     setMask(uint32_t mask);
         static uint32_t getMask();
+        static uint32_t getCaps(void);
 	static uint8_t 	hasMMX (void) {CHECK_Z(MMX)};
 	static uint8_t 	hasMMXEXT (void){CHECK_Z(MMXEXT)};
 	static uint8_t 	has3DNOW (void) {CHECK_Z(3DNOW)};
@@ -63,6 +68,10 @@
 	static uint8_t 	hasSSE3 (void){CHECK_Z(SSE3)};
 	static uint8_t 	hasSSSE3 (void){CHECK_Z(SSSE3)};
 	static uint8_t 	has3DNOWEXT(void){CHECK_Z(3DNOWEXT)};
+	static uint8_t 	hasSSE4 (void){CHECK_Z(SSE4)};
+	static uint8_t 	hasSSE42 (void){CHECK_Z(SSE42)};
+	static uint8_t 	hasAVX (void){CHECK_Z(AVX)};
+	static uint8_t 	hasAVX2 (void){CHECK_Z(AVX2)};
 
 
 };

avidemux_2.7.8.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_core/include/ADM_inttype.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_core/src/ADM_cpuCap.cpp Changed

@@ -83,6 +83,19 @@
       	 myCpuCaps |= ADM_CPUCAP_SSE3;
        if (ecx & 0x00000200 )
       	 myCpuCaps |= ADM_CPUCAP_SSSE3;
+       if (ecx & (1<<19) )
+      	 myCpuCaps |= ADM_CPUCAP_SSE4;
+       if (ecx & (1<<20) )
+      	 myCpuCaps |= ADM_CPUCAP_SSE42;
+       if (ecx & (1<<28) )
+      	 myCpuCaps |= ADM_CPUCAP_AVX;
+   }
+   if(max_std_level >= 7)
+   {
+       ecx=0;
+       adm_cpu_cpuid(7, &eax, &ebx, &ecx, &edx);
+       if (ebx & (1<<5) )
+      	 myCpuCaps |= ADM_CPUCAP_AVX2;
    }
 
    adm_cpu_cpuid(0x80000000,& max_ext_level,& ebx, &ecx,& edx);
@@ -104,14 +117,18 @@
   #define CHECK(x) if (myCpuCaps & ADM_CPUCAP_##x) { printf("\t\t"#x" detected"); \
                        if (!(myCpuMask & ADM_CPUCAP_##x)) printf(", but disabled"); \
                        printf("\n"); }
-      CHECK(MMX);
-      CHECK(3DNOW);
-      CHECK(3DNOWEXT);
-      CHECK(MMXEXT);
-      CHECK(SSE);
-      CHECK(SSE2);
-      CHECK(SSE3);
-      CHECK(SSSE3);
+    CHECK(MMX)
+    CHECK(3DNOW)
+    CHECK(3DNOWEXT)
+    CHECK(MMXEXT)
+    CHECK(SSE)
+    CHECK(SSE2)
+    CHECK(SSE3)
+    CHECK(SSSE3)
+    CHECK(SSE4)
+    CHECK(SSE42)
+    CHECK(AVX)
+    CHECK(AVX2)
 #endif // X86
     ADM_info("[CpuCaps] End of CPU capabilities check (cpuCaps: 0x%08x, cpuMask: 0x%08x)\n",myCpuCaps,myCpuMask);
     return ;
@@ -173,6 +190,10 @@
     	LAV_CPU_CAPS(SSE2);
     	LAV_CPU_CAPS(SSE3);
     	LAV_CPU_CAPS(SSSE3);
+    	LAV_CPU_CAPS(SSE4);
+    	LAV_CPU_CAPS(SSE42);
+    	LAV_CPU_CAPS(AVX);
+    	LAV_CPU_CAPS(AVX2);
         return out;
 }
 
@@ -187,7 +208,10 @@
     myCpuMask=mask;
 
     int lavCpuMask=Cpu2Lav(myCpuMask);
-    av_set_cpu_flags_mask(lavCpuMask);
+    //av_set_cpu_flags_mask(lavCpuMask); deprecated!
+    lavCpuMask &= av_get_cpu_flags();
+    ADM_info("[CpuCaps] Forcing lav cpu flags 0x%08x\n",lavCpuMask);
+    av_force_cpu_flags(lavCpuMask);
 
     return true;
 }
@@ -200,6 +224,13 @@
 {
     return myCpuMask;
 }
+/**
+ * \fn getCaps
+ */
+uint32_t CpuCaps::getCaps(void)
+{
+    return myCpuCaps;
+}
 extern "C"
 {
 extern void adm2_emms_yasm(void);

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioAccessFile.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFile.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioAccessFile.cpp Changed

@@ -34,7 +34,8 @@
 */
 bool      ADM_audioAccessFile::setPos(uint64_t pos)
 {
-    fseeko(_fd,_offset+pos,SEEK_SET);
+    if(fseeko(_fd,_offset+pos,SEEK_SET))
+        return false;
     return true;
 }
 /**
@@ -62,5 +63,77 @@
         return false;
 }
 
+/* ################################################################## */
+
+/**
+    \fn ctor
+*/
+ADM_audioAccessFilePCM::ADM_audioAccessFilePCM(const char *fileName, int offset, WAVHeader *info)
+    : ADM_audioAccessFile(fileName,offset)
+{
+    ADM_assert(info);
+    ADM_assert(info->channels && info->channels <= MAX_CHANNELS);
+    ADM_assert(info->frequency >= MIN_SAMPLING_RATE && info->frequency <= MAX_SAMPLING_RATE);
+    switch(info->bitspersample)
+    {
+        case 8: case 16: case 24:
+            break;
+        default:
+            ADM_error("Unsupported bit depth %u\n",info->bitspersample);
+            ADM_assert(0);
+            break;
+    }
+    uint16_t alignment = (info->bitspersample >> 3) * info->channels;
+    if(info->blockalign != alignment)
+    {
+        ADM_warning("Block alignment mismatch: %u vs %u, using the latter.\n",info->blockalign,alignment);
+        info->blockalign = alignment;
+    }
+    memcpy(&_hdr,info,sizeof(WAVHeader));
+    double d = (double)fileLength / _hdr.blockalign;
+    d *= 1000.;
+    d /= _hdr.frequency;
+    d *= 1000.;
+    _duration = d;
+}
+/**
+    \fn goToTime
+*/
+bool ADM_audioAccessFilePCM::goToTime(uint64_t usecs)
+{
+    double d = usecs;
+    d /= 1000. * 1000.;
+    d *= _hdr.frequency;
+    uint64_t pos = d;
+    pos *= _hdr.blockalign;
+    return setPos(pos);
+}
+/**
+    \fn getPacket
+*/
+bool ADM_audioAccessFilePCM::getPacket(uint8_t *buffer, uint32_t *size, uint32_t maxSize, uint64_t *dts)
+{
+    uint32_t maxSamplesPerPacket = _hdr.frequency / 100;
+    uint64_t pos = getPos();
+    if(pos % _hdr.blockalign)
+    {
+        ADM_warning("Unaligned access by %u bytes.\n",pos % _hdr.blockalign);
+        pos /= _hdr.blockalign;
+        pos++;
+        pos *= _hdr.blockalign;
+        if(!setPos(pos))
+            return false;
+    }
+    double d = pos;
+    d /= _hdr.blockalign;
+    d *= 1000. * 1000.;
+    d /= _hdr.frequency;
+    *dts = d;
+    if(maxSize / _hdr.blockalign < maxSamplesPerPacket)
+        maxSamplesPerPacket = maxSize / _hdr.blockalign;
+    uint32_t blocks = fread(buffer, _hdr.blockalign, maxSamplesPerPacket, _fd);
+    *size = blocks * _hdr.blockalign;
+    return !!blocks;
+}
 // EOF

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteWav.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioWriteWav.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_ad_plugin.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioCodec/include/ADM_audiocodec.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h Changed

@@ -41,7 +41,7 @@
                         virtual uint8_t  init(uint32_t channel, uint32_t fq ,CHANNEL_TYPE *channelMapping) =0;
                         virtual uint8_t  stop(void)=0;
                         virtual uint8_t  play(uint32_t len, float *data) =0;
-                        virtual uint8_t  setVolume(int volume) {return 1;}
+                        virtual uint8_t  setVolume(int volume) { UNUSED_ARG(volume); return 1; }
                         virtual bool     hasVolumeControl(void) {return true;}
                         virtual uint32_t getLatencyMs(void) {return 0;}
 }   ;
@@ -84,7 +84,7 @@
     virtual     uint8_t     stop(void);
 
     virtual     uint8_t     play(uint32_t len, float *data);
-    virtual     bool        getVolumeStats(uint32_t *vol); // Vol is 6 channels between 0 and 255
+    virtual     bool        getVolumeStats(int32_t *vol); // Return stats about volume for each channel [8] as integer dBFS (valid range -100 to +3), mark inactive channel with +255
 };
 
 /**
@@ -99,7 +99,7 @@
                     virtual     bool     localStop(void);
                     virtual     void     sendData(void);
                     virtual     bool     hasVolumeControl(void) { return false; }
-                    virtual const CHANNEL_TYPE *getWantedChannelMapping(uint32_t channels){return myChannelType;}
+                    virtual const CHANNEL_TYPE *getWantedChannelMapping(uint32_t channels) { UNUSED_ARG(channels); return myChannelType; }
 }   ;
 
 #endif

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioDevice/include/audio_out.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioDevice/include/audio_out.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audioDeviceThreaded.cpp Changed

@@ -77,6 +77,21 @@
 */
 uint8_t audioDeviceThreaded::init(uint32_t channel, uint32_t fq ,CHANNEL_TYPE *channelMapping)
 {
+    if(!channel || channel > MAX_CHANNELS)
+    {
+        ADM_error("Invalid number of channels %u, not trying to init audio device.\n",channel);
+        return 0;
+    }
+    if(fq < MIN_SAMPLING_RATE || fq > MAX_SAMPLING_RATE)
+    {
+        ADM_error("Sampling frequency %u out of range %u - %u, not trying to init audio device.\n",fq,MIN_SAMPLING_RATE,MAX_SAMPLING_RATE);
+        return 0;
+    }
+    if(!channelMapping)
+    {
+        ADM_error("Channel mapping is NULL, not trying to init audio device.\n");
+        return 0;
+    }
     ADM_info("Initializing audioDeviceThreaded with channels=%d, fq=%d\n",(int)channel,(int)fq);
     // Allocate buffer
     memcpy(incomingMapping,channelMapping,sizeof(CHANNEL_TYPE)*MAX_CHANNELS);
@@ -228,13 +243,14 @@
 }
 /**
     \fn getVolumeStats
-    \brief Return stats about volume for each channel [8] between 0 & 255
+    \brief Return stats about volume for each channel [8] as integer dBFS (valid range -100 to +3), mark inactive channel with +255 (> 3)
 */
-bool        audioDeviceThreaded::getVolumeStats(uint32_t *vol)
+bool        audioDeviceThreaded::getVolumeStats(int32_t *vol)
 {
-    float f[MAX_CHANNELS];
+    float f[MAX_CHANNELS],fsamp;
     uint32_t raw[MAX_CHANNELS];
-    memset(vol,0,sizeof(uint32_t)*8);
+    for(int i=0;i<8;i++)
+        vol[i] = 255;
     // 5 ms should be enough, i.e. fq/200
     uint32_t samples=_frequency/200;
     mutex.lock();
@@ -246,30 +262,29 @@
         mutex.unlock();
         return true;
     }
-#define USE_MEAN_SQUARE
     uint8_t *base8=audioBuffer.at(rdIndex);
     int16_t *base=(int16_t *)(base8);
     for(int i=0;i<samples;i++)
         for(int chan=0;chan<_channels;chan++)
         {
-#ifdef USE_MEAN_SQUARE
-                f[chan]+=base[0]*base[0];
-#else
-                f[chan]+=abs(*base);
-#endif
-                base++;
+            fsamp = base[0];	// multiply as float, to prevent theoretical overflow
+            f[chan]+=fsamp*fsamp;
+            base++;
         }
     mutex.unlock();
     // Normalize
     for(int i=0;i<MAX_CHANNELS;i++)
     {
         float d=f[i];
-        d/=samples; // d is now between 0 and 32768
-#ifdef USE_MEAN_SQUARE
-        d=sqrt(d);
-#endif
-        d/=128;     // D is now between 0 and 255
-        if(d>255) d=255;
+        d/=samples; // d is now between 0 and 32767^2
+        d=sqrt(d);  // d is now the RMS between 0 and 32767
+        if (d == 0.0)  // log(0) is invalid
+            d = -100.0;
+        else
+            d = 20.0*log10(d/32767.0) + 3.0;	// dBFS = 20*log10(rms(signal)) + 3 dB
+        if (d < -100.0)
+            d = -100.0;
+        d += 0.49;	// rounding
         raw[i]=(uint32_t)d;
     }
     // Assign mono to front center
@@ -278,10 +293,10 @@
         vol[1]=raw[0];
         return true;
     }
-    // Move channels around so that they fit Left / Center / Right / LFE / Rear Left / Rear Right / Side Left / Side Right
+    // Move channels around so that they fit Rear Left / Side Left / Front Left / Center / LFE / Front Right / Side Right / Rear Right
     const CHANNEL_TYPE *chans=this->getWantedChannelMapping(_channels);
-    static const CHANNEL_TYPE output[8]={ADM_CH_FRONT_LEFT,ADM_CH_FRONT_CENTER,ADM_CH_FRONT_RIGHT,ADM_CH_LFE,
-                                         ADM_CH_REAR_LEFT,ADM_CH_REAR_RIGHT,ADM_CH_SIDE_LEFT,ADM_CH_SIDE_RIGHT};
+    static const CHANNEL_TYPE output[8]={ADM_CH_REAR_LEFT,ADM_CH_SIDE_LEFT,ADM_CH_FRONT_LEFT,ADM_CH_FRONT_CENTER,
+                                         ADM_CH_LFE,ADM_CH_FRONT_RIGHT,ADM_CH_SIDE_RIGHT,ADM_CH_REAR_RIGHT};
     for(int i=0;i<8;i++)
     {
         CHANNEL_TYPE wanted=output[i];

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioFilter/include/audiofilter_mixer.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioFilter/include/audiofilter_mixer.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_aacLatm.cpp Changed

@@ -27,8 +27,11 @@
 
 #if 0
 #define xdebug ADM_info
+#include "ADM_coreUtils.h"
+#define xhdump mixDump
 #else
 #define xdebug(...) {}
+#define xhdump(...) {}
 #endif
 
 static const int aacChannels[16]=
@@ -184,8 +187,7 @@
 #endif
     
     xdebug("Got %d extraData \n",extraLen);
-    for(int i=0;i<extraLen;i++)
-        xdebug(" %02x",extraData[i]);
+    xhdump(extraData,extraLen);
     xdebug(" \nFrequency %d, channels %d\n",fq,channels);
     conf.gotConfig=true;
     return true;
@@ -284,9 +286,9 @@
 
         xdebug("NumSubFrame=%d, numSubProgram=%d\n",numSubFrames,numbSubProgram);
 
-        if(numSubFrames!=1 || numbSubProgram!=1  )
+        if(numbSubProgram!=1)
         {
-            ADM_warning("LATM: only supports subframe=1, subprogram=1\n");
+            ADM_warning("LATM: only numProgram = 1 supported, got %d\n",numbSubProgram);
             return false;
         }
 
@@ -388,6 +390,8 @@
        }
     } // streamMuxConfig
 //    if(!numSubFrames) return false;
+    if(!conf.gotConfig)
+        return false;
     if(conf.audioMuxVersionA==0)
     {
        // only 1 subFrames ATM... for(int i=0;i<numSubFrames;i++)
@@ -488,7 +492,7 @@
     xdebug("Found LATM : size %d\n",len);
     // Demux one LATM frame
     bool r = demuxLatm(dts,start,len);
-    tail+=len;
+    tail+=len+3;
     ADM_assert(head>=tail);
     xdebug("-- end of this LATM frame --\n");
     return r? LATM_OK : LATM_ERROR;
@@ -503,7 +507,6 @@
                 channels=0;
                 extraLen=0;
                 memset(&conf,0,sizeof(conf));
-                conf.gotConfig=false;
                 for(int i=0;i<LATM_NB_BUFFERS;i++)
                     listOfFreeBuffers.pushBack(&(buffers[i]));
                 depot.setSize(INCOMING_BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h Changed

@@ -30,12 +30,13 @@
 #include "avifmt2.h"
 #include "ADM_compressedImage.h"
 #include "ADM_audioStream.h"
-#include "ADM_colorspace.h"
+#include "ADM_image.h"
 
 #define ADM_COL_FLAG_RANGE_SET         1
 #define ADM_COL_FLAG_PRIMARIES_SET    (1<<1)
 #define ADM_COL_FLAG_TRANSFER_SET     (1<<2)
 #define ADM_COL_FLAG_MATRIX_COEFF_SET (1<<3)
+#define ADM_COL_FLAG_HDR_INFO_SET     (1<<4)
 
 typedef struct 
 {
@@ -55,13 +56,17 @@
     uint32_t   nb_frames;
     uint32_t   fcc;    
     uint32_t   bpp;
+    int32_t    bitrate;
+} aviInfo;
+
+typedef struct
+{
     uint32_t   colflags; // color info flags (0 = no info present)
     uint32_t   range;    // color range
     uint32_t   prim;     // color primaries
     uint32_t   coltc;    // transfer characteristic
     uint32_t   mcoeff;   // matrix coefficients
-} aviInfo;
-
+} aviColorInfo;
 
 /**
     \class vidHeader
@@ -86,6 +91,7 @@
           uint32_t            _videoColPrimaries;
           uint32_t            _videoColTransferCharacteristic;
           uint32_t            _videoColMatrixCoefficients;
+          ADM_HDR_Info        _videoColHDRInfo;
 public:
                            vidHeader();
 virtual                    ~vidHeader() ;
@@ -108,6 +114,8 @@
   //                 Info
   //__________________________
             uint8_t                 getVideoInfo(aviInfo *info);
+            uint8_t                 getColorInfo(aviColorInfo *cfo);
+            uint8_t                 getHDRInfo(ADM_HDR_Info *hfo);
             uint32_t                getWidth( void ) { return _mainaviheader.dwWidth;};
             uint32_t                getHeight( void ) { return _mainaviheader.dwHeight;};
             uint8_t                 setMyName( const char *name);
@@ -136,6 +144,7 @@
                                      /// Returns PTS of frame...
 virtual   uint64_t                   getTime(uint32_t frameNum)=0;
 virtual   uint64_t                   getVideoDuration(void)=0;
+virtual   uint64_t                   getVideoTrackSize(void) {return 0;};
 
 // Return false if the container doesn't provide pts information
 virtual   bool                       providePts(void) {return true;};

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreDemuxer/include/ADM_coreDemuxerMpegTemplate.cpp.h Changed

@@ -17,12 +17,15 @@
     #error  MY_CLASS not defined
 #endif
 #include "ADM_vidMisc.h"
+
 /**
         \fn getVideoDuration
         \brief Returns duration of video in us
 */
 uint64_t MY_CLASS::getVideoDuration(void)
 {
+    if(videoDuration != ADM_NO_PTS)
+        return videoDuration;
     int lastFrame=ListOfFrames.size();
     if(!lastFrame) return 0;
     lastFrame--;
@@ -46,7 +49,10 @@
                 maxPtsIndex=i;
             }
     }
+//#define VERBOSE_DURATION
+#ifdef VERBOSE_DURATION
     ADM_info("Found maxPts =%s, %d frames from the end\n",ADM_us2plain(maxPts),lastFrame-maxPtsIndex);
+#endif
     for(int i=lastFrame;i>=start;i--)
     {
             uint64_t p=ListOfFrames[i]->dts;
@@ -56,7 +62,9 @@
             maxDts=p;
             break;
     }
+#ifdef VERBOSE_DURATION
     ADM_info("Found maxDts =%s, %d frames from the end\n",ADM_us2plain(maxDts),lastFrame-maxDtsIndex);
+#endif
     // Case 1: No Pts
     bool usePts=true;
     if(maxPtsIndex==-1)
@@ -66,13 +74,17 @@
     uint64_t refTime;
     double refDistance;
     if(usePts==true)
-    { 
+    {
+#ifdef VERBOSE_DURATION
         ADM_info("Using PTS..\n");
+#endif
         refTime=maxPts;
         refDistance=lastFrame-maxPtsIndex;
     }else   
     {
+#ifdef VERBOSE_DURATION
         ADM_info("Using DTS..\n");
+#endif
         refTime=maxDts;
         refDistance=lastFrame-maxDtsIndex;    
     }
@@ -82,9 +94,12 @@
     g=refTime;
     f=f*refDistance;
     g+=f;
-    uint64_t duration=(uint64_t)g;
+    videoDuration = (uint64_t)g;
+    videoDuration += frameToUs(1);
+#ifdef VERBOSE_DURATION
     ADM_info("Using duration of %s\n",ADM_us2plain(duration));
-    return duration+frameToUs(1);
+#endif
+    return videoDuration;
 }
 
 /**
@@ -216,6 +231,7 @@
 bool    MY_CLASS::setPtsDts(uint32_t frame,uint64_t pts,uint64_t dts)
 {
     if(frame>=ListOfFrames.size()) return false;
+    videoDuration = ADM_NO_PTS; // invalidate
     dmxFrame *pk=ListOfFrames[frame];
 
     pk->dts=dts;

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreDemuxer/src/ADM_demuxer.cpp Changed

@@ -73,14 +73,16 @@
   info->nb_frames = _mainaviheader.dwTotalFrames;
   info->fcc = _videostream.fccHandler;
   info->bpp = _video_bih.biBitCount;
-
-  info->colflags = _videoColFlags;
-  if(_videoColFlags)
+  
+  info->bitrate = -1;
+  if ((getVideoDuration() > 0) && (getVideoTrackSize() > 0))
   {
-    info->range = _videoColRange;
-    info->prim = _videoColPrimaries;
-    info->coltc = _videoColTransferCharacteristic;
-    info->mcoeff = _videoColMatrixCoefficients;
+      double sec = getVideoDuration() / 1000000.0;
+      double bytes = getVideoTrackSize();
+      double br = bytes/sec;
+      br *= 8.0;
+      br /= 1000.0;
+      info->bitrate = (br+0.49);
   }
 
   info->timebase_den = _videostream.dwRate;
@@ -105,6 +107,33 @@
   return 1;
 }
 
+uint8_t vidHeader::getColorInfo(aviColorInfo *info)
+{
+    if(!info)
+        return 1;
+    info->colflags = _videoColFlags;
+    if(_videoColFlags)
+    {
+        info->range = _videoColRange;
+        info->prim = _videoColPrimaries;
+        info->coltc = _videoColTransferCharacteristic;
+        info->mcoeff = _videoColMatrixCoefficients;
+    }
+    return 1;
+}
+
+uint8_t vidHeader::getHDRInfo(ADM_HDR_Info *hfo)
+{
+    if(!hfo)
+        return 1;
+    if(_videoColFlags & ADM_COL_FLAG_HDR_INFO_SET)
+    {
+        *hfo = _videoColHDRInfo;
+        return 1;
+    }
+    return 0;
+}
+
 uint8_t vidHeader::setMyName (const char *name)
 {
   _name = new char[strlen (name) + 1];

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreDemuxerMpeg/src/dmxPSPacket.cpp Changed

@@ -147,7 +147,11 @@
         {
                 goto _again2;
         }
-        
+        if(!len)
+        {
+                printf("[psPacket::getPacket] Zero-length packet: corrupted data?\n");
+                goto _again2;
+        }
         //printf("Main Stream :%x substream :%x\n",stream,substream);
         switch(stream)
         {
@@ -178,229 +182,233 @@
 
 uint8_t psPacket::getPacketInfo(uint8_t stream,uint8_t *substream,uint32_t *olen,uint64_t *opts,uint64_t *odts)
 {
-
-//uint32_t un ,deux;
-uint64_t size=0;
-uint8_t c,d;
-uint8_t align=0;
-                        
-                *substream=0xff;
-                *opts=ADM_NO_PTS;
-                *odts=ADM_NO_PTS;
-                
-                                        
-                size=_file->read16i();
-                if((stream==PADDING_CODE) || 
-                	 (stream==PRIVATE_STREAM_2)
-                        ||(stream==SYSTEM_START_CODE) //?
-                        ) // special case, no header
-                        {
-                                
-                                *olen=size;      
-                                if(PRIVATE_STREAM_2==stream)
-                                {
-                                    *substream=_file->read8i()+0x60;
-                                    (*olen)--;
-                                }
-                                return 1;
-                        }
-                                
-                        //      remove padding if any                                           
-        
-                while((c=_file->read8i()) == 0xff) 
-                {
-                        size--;
-                }
+    uint32_t size=0;
+    uint8_t c,align=0;
+    *substream = 0xff;
+    *opts = ADM_NO_PTS;
+    *odts = ADM_NO_PTS;
+
+    size =_file->read16i();
+    if(!size) return 0;
+
+    if(stream == PADDING_CODE ||
+       stream == PRIVATE_STREAM_2 ||
+       stream == SYSTEM_START_CODE //?
+    ) // special case, no header
+    {
+        if(PRIVATE_STREAM_2 == stream)
+        {
+            *substream = _file->read8i() + 0x60;
+            size--;
+            if(!size) return 0;
+        }
+        *olen=size;
+        return 1;
+    }
+    // remove padding if any
+    while((c = _file->read8i()) == 0xff)
+    {
+        size--;
+        if(!size) return 0;
+    }
 //----------------------------------------------------------------------------
 //-------------------------------MPEG-2 PES packet style----------------------
 //----------------------------------------------------------------------------
-                if(((c&0xC0)==0x80))
+    if((c&0xC0) == 0x80)
+    {
+        if(size <= 3) return 0;
+
+        uint32_t ptsdts,len;
+        //printf("\n mpeg2 type \n");
+        // c= copyright and stuff
+        //printf(" %x align\n",c);
+        if(c & 4) align=1;
+        c = _file->read8i(); // PTS/DTS
+        //printf("%x ptsdts\n",c
+        ptsdts = c >> 6;
+        // header len
+        len = _file->read8i();
+        size -= 3;
+
+        switch(ptsdts)
+        {
+            case 2: // PTS=1 DTS=0
+                if(len>=5)
                 {
-                        uint32_t ptsdts,len;
-                        //printf("\n mpeg2 type \n");
-                        //_muxTypeMpeg2=1;
-                        // c= copyright and stuff       
-                        //printf(" %x align\n",c);      
-                        if(c & 4) align=1;      
-                        c=_file->read8i();     // PTS/DTS
-                        //printf("%x ptsdts\n",c
-                        ptsdts=c>>6;
-                        // header len
-                        len=_file->read8i();
-                        size-=3;  
-
-                        switch(ptsdts)
-                        {
-                                case 2: // PTS=1 DTS=0
-                                        if(len>=5)
-                                        {
-                                                uint64_t pts1,pts2,pts0;
-                                                //      printf("\n PTS10\n");
-                                                        pts0=_file->read8i();  
-                                                        pts1=_file->read16i(); 
-                                                        pts2=_file->read16i();                 
-                                                        len-=5;
-                                                        size-=5;
-                                                        *opts=(pts1>>1)<<15;
-                                                        *opts+=pts2>>1;
-                                                        *opts+=(((pts0&6)>>1)<<30);
-                                        }
-                                        break;
-                                case 3: // PTS=1 DTS=1
-                                                #define PTS11_ADV 10 // nut monkey
-                                                if(len>=PTS11_ADV)
-                                                {
-                                                        uint32_t skip=PTS11_ADV;
-                                                        uint64_t pts1,pts2,dts,pts0;
-                                                                //      printf("\n PTS10\n");
-                                                                pts0=_file->read8i();  
-                                                                pts1=_file->read16i(); 
-                                                                pts2=_file->read16i(); 
-                                                                                        
-                                                                *opts=(pts1>>1)<<15;
-                                                                *opts+=pts2>>1;
-                                                                *opts+=(((pts0&6)>>1)<<30);
-                                                                pts0=_file->read8i();  
-                                                                pts1=_file->read16i(); 
-                                                                pts2=_file->read16i();                 
-                                                                dts=(pts1>>1)<<15;
-                                                                dts+=pts2>>1;
-                                                                dts+=(((pts0&6)>>1)<<30);
-                                                                len-=skip;
-                                                                size-=skip;
-                                                                *odts=dts;
-                                                                        //printf("DTS: %lx\n",dts);                
-                                                   }
-                                                   break;               
-                                case 1:
-                                                return 0;//ADM_assert(0); // forbidden !
-                                                break;
-                                case 0: 
-                                                // printf("\n PTS00\n");
-                                                break; // no pts nor dts
-                                                                                
-                                                            
-                        }  
-// Extension bit        
-// >stealthdave<                                
-
-                        // Skip remaining headers if any
-                        if(len) 
-                        {
-                                _file->forward(len);
-                                size=size-len;
-                        }
-                                
-                if(stream==PRIVATE_STREAM_1)
+                    if(size <= 5) return 0;
+
+                    uint64_t pts1,pts2,pts0;
+                    // printf("\n PTS10\n");
+                    pts0=_file->read8i();
+                    pts1=_file->read16i();
+                    pts2=_file->read16i();
+
+                    len-=5;
+                    size-=5;
+
+                    *opts=(pts1>>1)<<15;
+                    *opts+=pts2>>1;
+                    *opts+=(((pts0&6)>>1)<<30);
+                }
+                break;
+            case 3: // PTS=1 DTS=1
+#define PTS11_ADV 10 // nut monkey
+                if(len >= PTS11_ADV)
                 {
-                        if(size>5)
-                        {
-                        // read sub id
-                               *substream=_file->read8i();
-  //                    printf("\n Subid : %x",*subid);
-                                switch(*substream)
-                                {
-                                // DTS
-                                        case 0x88:case 0x89:case 0x8A:case 0x8B:
-                                        
-                                                *substream=*substream-0x48;
-                                                break;
-
-                                //AC3
-                                        case 0x80:case 0x81:case 0x82:case 0x83:
-                                        case 0x84:case 0x85:case 0x86:case 0x87:
-                                                *substream=*substream-0x80;
-                                                break;
-                                // PCM
-                                        case 0xA0:case 0xA1:case 0xa2:case 0xa3:
-                                        case 0xA4:case 0xA5:case 0xa6:case 0xa7:
-                                                // we have an additionnal header
-                                                // of 3 bytes
-                                                _file->forward(3);
-                                                size-=3;
-                                                break;
-                                // Subs
-                                case 0x20:case 0x21:case 0x22:case 0x23:
-                                case 0x24:case 0x25:case 0x26:case 0x27:
-                                                break;
-                             
-                                default:
-                                                doNoComplainAnyMore++;
-                                                if(doNoComplainAnyMore<10)
-                                                    printf("[DmxPS]Unkown substream %x\n",*substream);
-                                                *substream=0xff;
-                                }
-                                // skip audio header (if not sub)
-                                if(*substream>0x26 || *substream<0x20)
-                                {
-                                        if((*substream < 0xA0 || *substream > 0xA7) || !keepPcmHeader)
-                                        {
-                                                _file->forward(3);
-                                                 size-=3;
-                                        }
-                                }
-                                size--;
-                        }
+                    uint32_t skip=PTS11_ADV;
+                    if(size <= skip) return 0;
+                    uint64_t pts1,pts2,dts,pts0;
+                    // printf("\n PTS10\n");
+                    pts0=_file->read8i();
+                    pts1=_file->read16i();
+                    pts2=_file->read16i();
+
+                    *opts=(pts1>>1)<<15;
+                    *opts+=pts2>>1;
+                    *opts+=(((pts0&6)>>1)<<30);
+
+                    pts0=_file->read8i();
+                    pts1=_file->read16i();
+                    pts2=_file->read16i();
+
+                    dts=(pts1>>1)<<15;
+                    dts+=pts2>>1;
+                    dts+=(((pts0&6)>>1)<<30);
+
+                    len-=skip;
+                    size-=skip;
+                    *odts=dts;
+                    //printf("DTS: %lx\n",dts);
                 }
-               //    printf(" pid %x size : %x len %x\n",sid,size,len);
-                *olen=size;
-                return 1;
+                break;
+            case 0:
+                // printf("\n PTS00\n");
+                break; // no pts nor dts
+            case 1:
+            default:
+                return 0;//ADM_assert(0); // forbidden !
         }
-//----------------------------------------------------------------------------------------------                
-//-------------------------------MPEG-1 PES packet style----------------------                                  
-//----------------------------------------------------------------------------------------------                                        
-           if(0) //_muxTypeMpeg2)
+// Extension bit
+// >stealthdave<
+
+        // Skip remaining headers if any
+        if(len)
+        {
+            if(size <= len) return 0;
+            _file->forward(len);
+            size-=len;
+        }
+        if(stream == PRIVATE_STREAM_1)
+        {
+            if(size>5)
+            { // read sub id
+                *substream=_file->read8i();
+                size--;
+  //            printf("\n Subid : %x",*subid);
+                switch(*substream)
                 {
-                        printf("[DmxPS]*** packet type 1 inside type 2 ?????*****\n");
-                        return 0; // mmmm                       
+                    // DTS
+                    case 0x88:case 0x89:case 0x8A:case 0x8B:
+                        *substream -= 0x48;
+                        break;
+
+                    //AC3
+                    case 0x80:case 0x81:case 0x82:case 0x83:
+                    case 0x84:case 0x85:case 0x86:case 0x87:
+                        *substream -= 0x80;
+                        break;
+                    // PCM
+                    case 0xA0:case 0xA1:case 0xa2:case 0xa3:
+                    case 0xA4:case 0xA5:case 0xa6:case 0xa7:
+                        // we have an additionnal header of 3 bytes
+                        _file->forward(3);
+                        size-=3;
+                        break;
+                    // Subs
+                    case 0x20:case 0x21:case 0x22:case 0x23:
+                    case 0x24:case 0x25:case 0x26:case 0x27:
+                        break;
+                    default:
+                        doNoComplainAnyMore++;
+                        if(doNoComplainAnyMore<10)
+                            printf("[DmxPS]Unkown substream %x\n",*substream);
+                        *substream=0xff;
                 }
-          // now look at  STD buffer size if present
-          // 01xxxxxxxxx
-          if ((c>>6) == 1) 
-          {       // 01
-                        size-=2;
-                        _file->read8i();                       // skip one byte
-                        c=_file->read8i();   // then another
-           }                       
-           // PTS/DTS
-           switch(c>>4)
-           {
-                case 2:
+                // skip audio header (if not sub)
+                if(*substream>0x26 || *substream<0x20)
                 {
-                        // 0010 xxxx PTS only
-                        uint64_t pts1,pts2,pts0;
-                                        size -= 4;
-                                        pts0=(c>>1) &7;
-                                        pts1=_file->read16i()>>1;
-                                        pts2=_file->read16i()>>1;
-                                        *opts=pts2+(pts1<<15)+(pts0<<30);
-                                        break;
-                  }
-                  case 3:
-                  {               // 0011 xxxx
-                        uint64_t pts1,pts2,pts0;
-                                        size -= 9;
-                                                                        
-                                        pts0=(c>>1) &7;
-                                        pts1=_file->read16i()>>1;
-                                        pts2=_file->read16i()>>1;
-                                        *opts=pts2+(pts1<<15)+(pts0<<30);
-                                        _file->forward(5);
-                   }                                                               
-                   break;
-                   
-                case 1:
-                        // 0001 xxx             
-                        // PTSDTS=01 not allowed                        
-                                return 0;
-                                break; 
+                    if((*substream < 0xA0 || *substream > 0xA7) || !keepPcmHeader)
+                    {
+                        if(size <= 3) return 0;
+                        _file->forward(3);
+                        size-=3;
+                    }
                 }
-                                                                
+            }
+        }
+
+        if(!size) return 0;
 
-                if(!align)      
-                        size--;         
         *olen=size;
         return 1;
+    }
+//----------------------------------------------------------------------------------------------
+//-------------------------------MPEG-1 PES packet style----------------------
+//----------------------------------------------------------------------------------------------
+    if(0) //_muxTypeMpeg2)
+    {
+        printf("[DmxPS]*** packet type 1 inside type 2 ?????*****\n");
+        return 0; // mmmm
+    }
+    // now look at  STD buffer size if present
+    // 01xxxxxxxxx
+    if ((c>>6) == 1)
+    { // 01
+        if(size <= 2) return 0;
+        size-=2;
+        _file->read8i(); // skip one byte
+        c=_file->read8i(); // then another
+    }
+    // PTS/DTS
+    switch(c>>4)
+    {
+        case 2:
+        {
+            if(size <= 4) return 0;
+            // 0010 xxxx PTS only
+            uint64_t pts1,pts2,pts0;
+            size -= 4;
+            pts0=(c>>1) &7;
+            pts1=_file->read16i()>>1;
+            pts2=_file->read16i()>>1;
+            *opts=pts2+(pts1<<15)+(pts0<<30);
+            break;
+        }
+        case 3:
+        { // 0011 xxxx
+            if(size <= 9) return 0;
+            uint64_t pts1,pts2,pts0;
+            size -= 9;
+            pts0=(c>>1) &7;
+            pts1=_file->read16i()>>1;
+            pts2=_file->read16i()>>1;
+            *opts=pts2+(pts1<<15)+(pts0<<30);
+            _file->forward(5);
+            break;
+        }
+        case 1:
+        default:
+            // 0001 xxx
+            // PTSDTS=01 not allowed
+            return 0;
+    }
+    if(!align)
+    {
+        if(!size) return 0;
+        size--;
+    }
+    *olen=size;
+    return 1;
 }
 //************************************************************************************

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/include/ADM_colorspace.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_colorspace.h Changed

@@ -2,6 +2,7 @@
                        
     copyright            : (C) 2007 by mean
     email                : fixounet@free.fr
+    copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
  ***************************************************************************/
 
 /***************************************************************************
@@ -17,6 +18,7 @@
 
 #include "ADM_coreImage6_export.h"
 #include "ADM_rgb.h" // To have colors
+#include "ADM_toneMapper.h"
 
 class ADMImage;
 typedef enum 
@@ -28,15 +30,10 @@
     ADM_CS_GAUSS,
     ADM_CS_SINC,
     ADM_CS_SPLINE,
-    ADM_CS_FAST_BILINEAR
+    ADM_CS_FAST_BILINEAR,
+    ADM_CS_POINT
 }ADMColorScaler_algo;
 
-typedef enum
-{
-    ADM_COL_RANGE_MPEG,
-    ADM_COL_RANGE_JPEG
-}ADM_colorRange;
-
 /**
     \class ADMColorScaler
 */
@@ -46,14 +43,16 @@
     void            *context;
     uint32_t        srcWidth,srcHeight;
     uint32_t        dstWidth,dstHeight;
-    ADM_colorspace  fromColor,toColor;
+    ADM_pixelFormat  fromPixFrmt,toPixFrmt;
     ADMColorScaler_algo algo;
-    uint8_t         getStrideAndPointers(bool dst,uint8_t  *from,ADM_colorspace fromColor,
+    uint8_t         getStrideAndPointers(bool dst,uint8_t  *from,ADM_pixelFormat fromPixFrmt,
                                             uint8_t **srcData,int *srcStride);
+    bool            possibleHdrContent;
+    ADMToneMapper * toneMapper;
   public :
     
-                    ADMColorScalerFull(ADMColorScaler_algo algo, int sw, int sh, int dw,int dh,ADM_colorspace from,ADM_colorspace to);
-    bool            reset(ADMColorScaler_algo, int sw, int sh, int dw,int dh,ADM_colorspace from,ADM_colorspace to);
+                    ADMColorScalerFull(ADMColorScaler_algo algo, int sw, int sh, int dw,int dh,ADM_pixelFormat from,ADM_pixelFormat to);
+    bool            reset(ADMColorScaler_algo, int sw, int sh, int dw,int dh,ADM_pixelFormat from,ADM_pixelFormat to);
     
 
     bool            convert(uint8_t  *from, uint8_t *to);
@@ -71,7 +70,7 @@
 {
 public:
     bool            changeWidthHeight(int newWidth, int newHeight);
-                    ADMColorScalerSimple( int width, int height, ADM_colorspace from,ADM_colorspace to,ADMColorScaler_algo algo=ADM_CS_BICUBIC):
+                    ADMColorScalerSimple( int width, int height, ADM_pixelFormat from,ADM_pixelFormat to,ADMColorScaler_algo algo=ADM_CS_BICUBIC):
                         ADMColorScalerFull(algo, width, height, width,height, from, to)
                      {
 
@@ -79,6 +78,7 @@
                     
 };
 
+
 #endif
 //EOF

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_image.h Changed

@@ -40,8 +40,9 @@
 
 //#define vi.num_frames _info.nb_frames
 //#define vi.IsYV12()   1
-#define GetRowSize GetPitch
+// Nop #define GetRowSize GetPitch
 #define ADM_IMAGE_ALIGN(x) ((x+63)&(~63))
+#define ADM_IMAGE_UNKNOWN_QP 100
 
 typedef enum
 {
@@ -68,6 +69,24 @@
         ADM_HW_ANY=0xff
 }ADM_HW_IMAGE;
 
+class ADM_COREIMAGE6_EXPORT ADM_HDR_Info
+{
+public:
+    double primaries[3][2];	// [RGB][xy]
+    double whitePoint[2];	// [xy]
+    double maxLuminance;
+    double minLuminance;
+    double maxCLL;
+    double maxFALL;
+    double maxSCL[3];	// [RGB]
+    double avgMaxRGB;
+    double kneePoint[2];
+    double bezierCurveAnchors[15];
+    double colorSaturationWeight;
+    double targetMaxLuminance;
+
+    ADM_HDR_Info();
+};
 
 typedef bool refFunction(void *instance,void *cookie);
 typedef bool refDownloadFunction(ADMImage *image, void *refCodec, void *refHwImage);
@@ -104,12 +123,16 @@
 public:
         uint32_t	    _width;		/// Width of image
         uint32_t	    _height;	/// Height of image
-        uint32_t	    _Qp;		/// Average quantizer for this image, Default=2
+        uint32_t	    _Qp;    /// Average quantizer for this image
         uint32_t	    flags;		/// Flags for this image (AVI_KEY_FRAME/AVI_B_FRAME)
         uint64_t        Pts;        /// Presentation time in us
         ADM_IMAGE_TYPE  _imageType;     /// Plain image or reference or vdpau wrapper
-        ADM_colorspace  _colorspace;    /// Colorspace we are moving, default is YV12
+        ADM_pixelFormat  _pixfrmt;    /// Pixel format we are moving, default is YV12
         ADM_colorRange  _range;     /// MPEG or JPEG
+        ADM_colorPrimaries _colorPrim;
+        ADM_colorTrC    _colorTrc;
+        ADM_colorSpace  _colorSpace;
+        ADM_HDR_Info    _hdrInfo;
         uint8_t         _noPicture;     /// No picture to display
         ADM_ASPECT	    _aspect;	/// Aspect ratio
         //

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/include/ADM_imageResizer.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_imageResizer.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h Changed

@@ -19,35 +19,252 @@
  #ifndef ADM_RGB_H
  #define ADM_RGB_H
 
-#define ADM_COLOR_IS_YUV 0x1000
+extern "C" {
+#include "libavutil/pixfmt.h"
+}
+#include "ADM_default.h"
+
+#define ADM_PIXFRMT_IS_YUV 0x1000
  typedef enum 
  {
-    ADM_COLOR_RGB24,
-    ADM_COLOR_BGR24,
-    ADM_COLOR_BGR32A,
-    ADM_COLOR_RGB32A,
-    ADM_COLOR_RGB16,
-    ADM_COLOR_RGB555,
-    ADM_COLOR_BGR555,
-    ADM_COLOR_YV12 = ADM_COLOR_IS_YUV,	// YUV420
-    ADM_COLOR_NV12,
-    ADM_COLOR_YUV422,
-    ADM_COLOR_UYVY422,
-    ADM_COLOR_YUV422P,
-    ADM_COLOR_YUV411,
-    ADM_COLOR_YUV444,
-    ADM_COLOR_VDPAU,
-    ADM_COLOR_XVBA,
-    ADM_COLOR_LIBVA,
-    ADM_COLOR_Y8,
-    ADM_COLOR_YUV444_10BITS,
-    ADM_COLOR_NV12_10BITS,
-    ADM_COLOR_YUV420_10BITS,
-    ADM_COLOR_YUV420_12BITS,
-    ADM_COLOR_YUV422_10BITS,
-    ADM_COLOR_YUV444_12BITS
- } ADM_colorspace;
-#define ADM_COLOR_BACKWARD 0x8000
-#define ADM_COLOR_MASK     0x7FFF
- 
- #endif
+    ADM_PIXFRMT_INVALID = -1,
+    ADM_PIXFRMT_RGB24 = 0,
+    ADM_PIXFRMT_BGR24,
+    ADM_PIXFRMT_GBR24P,
+    ADM_PIXFRMT_BGR32A,
+    ADM_PIXFRMT_RGB32A,
+    ADM_PIXFRMT_RGB16,
+    ADM_PIXFRMT_RGB555,
+    ADM_PIXFRMT_BGR555,
+    ADM_PIXFRMT_YV12 = ADM_PIXFRMT_IS_YUV,	// YUV420
+    ADM_PIXFRMT_NV12,
+    ADM_PIXFRMT_YUV422,
+    ADM_PIXFRMT_UYVY422,
+    ADM_PIXFRMT_YUV422P,
+    ADM_PIXFRMT_YUV411,
+    ADM_PIXFRMT_YUV444,
+    ADM_PIXFRMT_VDPAU,
+    ADM_PIXFRMT_XVBA,
+    ADM_PIXFRMT_LIBVA,
+    ADM_PIXFRMT_Y8,
+    ADM_PIXFRMT_YUV444_10BITS,
+    ADM_PIXFRMT_NV12_10BITS,
+    ADM_PIXFRMT_YUV420_10BITS,
+    ADM_PIXFRMT_YUV420_12BITS,
+    ADM_PIXFRMT_YUV422_10BITS,
+    ADM_PIXFRMT_YUV444_12BITS
+ } ADM_pixelFormat;
+#define ADM_PIXFRMT_BACKWARD 0x8000
+#define ADM_PIXFRMT_MASK     0x7FFF
+
+#define BGR32_IS_SWAPPED 1
+
+/**
+    \fn ADMPixFrmt2LAVPixFmt
+    \brief Convert ADM colorspace type swscale/lavcodec colorspace name
+
+*/
+static AVPixelFormat ADMPixFrmt2LAVPixFmt(ADM_pixelFormat fromPixFrmt_)
+{
+  ADM_pixelFormat fromPixFrmt=fromPixFrmt_;
+  int intPixFrmt=(int)fromPixFrmt;
+  intPixFrmt&=ADM_PIXFRMT_MASK;
+  fromPixFrmt=(ADM_pixelFormat)intPixFrmt;
+  switch(fromPixFrmt)
+  {
+    case ADM_PIXFRMT_YUV444: return AV_PIX_FMT_YUV444P;
+    case ADM_PIXFRMT_YUV411: return AV_PIX_FMT_YUV411P;
+    case ADM_PIXFRMT_YUV422: return AV_PIX_FMT_YUYV422;
+    case ADM_PIXFRMT_UYVY422: return AV_PIX_FMT_UYVY422;
+    case ADM_PIXFRMT_YV12: return AV_PIX_FMT_YUV420P;
+    case ADM_PIXFRMT_NV12: return AV_PIX_FMT_NV12;
+    case ADM_PIXFRMT_YUV422P: return AV_PIX_FMT_YUV422P;
+    case ADM_PIXFRMT_RGB555: return AV_PIX_FMT_RGB555LE;
+    case ADM_PIXFRMT_BGR555: return AV_PIX_FMT_BGR555LE;
+    case ADM_PIXFRMT_RGB32A: return AV_PIX_FMT_RGBA;
+#ifdef BGR32_IS_SWAPPED
+    case ADM_PIXFRMT_BGR32A: return AV_PIX_FMT_RGBA; // Faster that way...
+#else
+    case ADM_PIXFRMT_BGR32A: return AV_PIX_FMT_BGRA;
+#endif
+    case ADM_PIXFRMT_RGB24: return AV_PIX_FMT_RGB24;
+    case ADM_PIXFRMT_BGR24: return AV_PIX_FMT_BGR24;
+    case ADM_PIXFRMT_GBR24P: return AV_PIX_FMT_GBRP;
+    case ADM_PIXFRMT_YUV420_10BITS: return AV_PIX_FMT_YUV420P10LE;
+    case ADM_PIXFRMT_YUV420_12BITS: return AV_PIX_FMT_YUV420P12LE;
+    case ADM_PIXFRMT_NV12_10BITS:  return AV_PIX_FMT_P010LE;
+    case ADM_PIXFRMT_YUV444_10BITS: return AV_PIX_FMT_YUV444P10LE;
+    case ADM_PIXFRMT_YUV422_10BITS: return AV_PIX_FMT_YUV422P10LE;
+    case ADM_PIXFRMT_YUV444_12BITS: return AV_PIX_FMT_YUV444P12LE;
+    case ADM_PIXFRMT_Y8: return AV_PIX_FMT_GRAY8;
+    default : ADM_assert(0); 
+  }
+  return AV_PIX_FMT_YUV420P;
+}
+
+
+
+
+typedef enum
+{
+    ADM_COL_RANGE_UNSPECIFIED = 0,
+    ADM_COL_RANGE_MPEG,
+    ADM_COL_RANGE_JPEG,
+}ADM_colorRange;
+
+typedef enum
+{
+    ADM_COL_PRI_RESERVED0   = 0,
+    ADM_COL_PRI_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+    ADM_COL_PRI_UNSPECIFIED = 2,
+    ADM_COL_PRI_RESERVED    = 3,
+    ADM_COL_PRI_BT470M      = 4,  ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
+    ADM_COL_PRI_BT470BG     = 5,  ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+    ADM_COL_PRI_SMPTE170M   = 6,  ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    ADM_COL_PRI_SMPTE240M   = 7,  ///< functionally identical to above
+    ADM_COL_PRI_FILM        = 8,  ///< colour filters using Illuminant C
+    ADM_COL_PRI_BT2020      = 9,  ///< ITU-R BT2020
+    ADM_COL_PRI_SMPTE428    = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
+    ADM_COL_PRI_SMPTE431    = 11, ///< SMPTE ST 431-2 (2011) / DCI P3
+    ADM_COL_PRI_SMPTE432    = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3
+    ADM_COL_PRI_EBU3213     = 22  ///< EBU Tech. 3213-E / JEDEC P22 phosphors
+    //ADM_COL_PRI_JEDEC_P22 = ADM_COL_PRI_EBU3213
+}ADM_colorPrimaries;
+
+typedef enum
+{
+    ADM_COL_TRC_RESERVED0    = 0,
+    ADM_COL_TRC_BT709        = 1,  ///< also ITU-R BT1361
+    ADM_COL_TRC_UNSPECIFIED  = 2,
+    ADM_COL_TRC_RESERVED     = 3,
+    ADM_COL_TRC_GAMMA22      = 4,  ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    ADM_COL_TRC_GAMMA28      = 5,  ///< also ITU-R BT470BG
+    ADM_COL_TRC_SMPTE170M    = 6,  ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
+    ADM_COL_TRC_SMPTE240M    = 7,
+    ADM_COL_TRC_LINEAR       = 8,  ///< "Linear transfer characteristics"
+    ADM_COL_TRC_LOG          = 9,  ///< "Logarithmic transfer characteristic (100:1 range)"
+    ADM_COL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)"
+    ADM_COL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
+    ADM_COL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
+    ADM_COL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
+    ADM_COL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10-bit system
+    ADM_COL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12-bit system
+    ADM_COL_TRC_SMPTE2084    = 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
+    //ADM_COL_TRC_SMPTEST2084 = ADM_COL_TRC_SMPTE2084,
+    ADM_COL_TRC_SMPTE428     = 17, ///< SMPTE ST 428-1
+    //ADM_COL_TRC_SMPTEST428_1 = ADM_COL_TRC_SMPTE428,
+    ADM_COL_TRC_ARIB_STD_B67 = 18  ///< ARIB STD-B67, known as "Hybrid log-gamma"
+}ADM_colorTrC;
+
+typedef enum
+{
+    ADM_COL_SPC_sRGB        = 0,  ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB)
+    ADM_COL_SPC_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    ADM_COL_SPC_UNSPECIFIED = 2,
+    ADM_COL_SPC_RESERVED    = 3,
+    ADM_COL_SPC_FCC         = 4,  ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
+    ADM_COL_SPC_BT470BG     = 5,  ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    ADM_COL_SPC_SMPTE170M   = 6,  ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    ADM_COL_SPC_SMPTE240M   = 7,  ///< functionally identical to above
+    ADM_COL_SPC_YCGCO       = 8,  ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    //ADM_COL_SPC_YCOCG = ADM_COL_SPC_YCGCO,
+    ADM_COL_SPC_BT2020_NCL  = 9,  ///< ITU-R BT2020 non-constant luminance system
+    ADM_COL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
+    ADM_COL_SPC_SMPTE2085   = 11, ///< SMPTE 2085, Y'D'zD'x
+    ADM_COL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system
+    ADM_COL_SPC_CHROMA_DERIVED_CL  = 13, ///< Chromaticity-derived constant luminance system
+    ADM_COL_SPC_ICTCP       = 14  ///< ITU-R BT.2100-0, ICtCp
+}ADM_colorSpace;
+
+static inline ADM_colorRange validateColorRange(uint32_t val)
+{
+    switch(val)
+    {
+        case ADM_COL_RANGE_UNSPECIFIED:
+        case ADM_COL_RANGE_MPEG:
+        case ADM_COL_RANGE_JPEG:
+            return (ADM_colorRange)val;
+        default:break;
+    }
+    return ADM_COL_RANGE_UNSPECIFIED;
+}
+
+static inline ADM_colorPrimaries validateColorPrimaries(uint32_t val)
+{
+    switch(val)
+    {
+        case ADM_COL_PRI_RESERVED0:
+        case ADM_COL_PRI_BT709:
+        case ADM_COL_PRI_UNSPECIFIED:
+        case ADM_COL_PRI_RESERVED:
+        case ADM_COL_PRI_BT470M:
+        case ADM_COL_PRI_BT470BG:
+        case ADM_COL_PRI_SMPTE170M:
+        case ADM_COL_PRI_SMPTE240M:
+        case ADM_COL_PRI_FILM:
+        case ADM_COL_PRI_BT2020:
+        case ADM_COL_PRI_SMPTE428:
+        case ADM_COL_PRI_SMPTE431:
+        case ADM_COL_PRI_SMPTE432:
+        case ADM_COL_PRI_EBU3213:
+            return (ADM_colorPrimaries)val;
+        default:break;
+    }
+    return ADM_COL_PRI_UNSPECIFIED;
+}
+
+static inline ADM_colorTrC validateColorTrC(uint32_t val)
+{
+    switch(val)
+    {
+        case ADM_COL_TRC_RESERVED0:
+        case ADM_COL_TRC_BT709:
+        case ADM_COL_TRC_UNSPECIFIED:
+        case ADM_COL_TRC_RESERVED:
+        case ADM_COL_TRC_GAMMA22:
+        case ADM_COL_TRC_GAMMA28:
+        case ADM_COL_TRC_SMPTE170M:
+        case ADM_COL_TRC_SMPTE240M:
+        case ADM_COL_TRC_LINEAR:
+        case ADM_COL_TRC_LOG:
+        case ADM_COL_TRC_LOG_SQRT:
+        case ADM_COL_TRC_IEC61966_2_4:
+        case ADM_COL_TRC_BT1361_ECG:
+        case ADM_COL_TRC_IEC61966_2_1:
+        case ADM_COL_TRC_BT2020_10:
+        case ADM_COL_TRC_BT2020_12:
+        case ADM_COL_TRC_SMPTE2084:
+        case ADM_COL_TRC_SMPTE428:
+        case ADM_COL_TRC_ARIB_STD_B67:
+            return (ADM_colorTrC)val;
+        default:break;
+    }
+    return ADM_COL_TRC_UNSPECIFIED;
+}
+
+static inline ADM_colorSpace validateColorSpace(uint32_t val)
+{
+    switch(val)
+    {
+        case ADM_COL_SPC_sRGB:
+        case ADM_COL_SPC_BT709:
+        case ADM_COL_SPC_UNSPECIFIED:
+        case ADM_COL_SPC_RESERVED:
+        case ADM_COL_SPC_FCC:
+        case ADM_COL_SPC_BT470BG:
+        case ADM_COL_SPC_SMPTE170M:
+        case ADM_COL_SPC_SMPTE240M:
+        case ADM_COL_SPC_YCGCO:
+        case ADM_COL_SPC_BT2020_NCL:
+        case ADM_COL_SPC_BT2020_CL:
+        case ADM_COL_SPC_SMPTE2085:
+        case ADM_COL_SPC_CHROMA_DERIVED_NCL:
+        case ADM_COL_SPC_CHROMA_DERIVED_CL:
+        case ADM_COL_SPC_ICTCP:
+            return (ADM_colorSpace)val;
+        default:break;
+    }
+    return ADM_COL_SPC_UNSPECIFIED;
+}
+
+#endif

avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/include/ADM_toneMapper.h Added

@@ -0,0 +1,105 @@
+/***************************************************************************
+                       
+    copyright            : (C) 2007 by mean
+    email                : fixounet@free.fr
+    copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_TONEMAPPER_H
+#define ADM_TONEMAPPER_H
+
+#include "ADM_coreImage6_export.h"
+#include "ADM_rgb.h" // To have colors
+#include "ADM_threads.h"
+
+class ADM_COREIMAGE6_EXPORT ADMToneMapperConfig
+{
+  protected:
+    static uint32_t method;
+    static float saturation;
+    static float boost;
+  public:
+            ADMToneMapperConfig(bool init=false);
+    void    getConfig(uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust, float * targetLuminance=NULL);
+    void    setConfig(uint32_t toneMappingMethod, float saturationAdjust, float boostAdjust);
+};
+
+class ADMImage;
+/**
+    \class ADMToneMapper
+*/
+class ADM_COREIMAGE6_EXPORT ADMToneMapper
+{
+  protected:
+    ADMToneMapperConfig * config;
+    void            *contextYUV;
+    void            *contextRGB1, *contextRGB2;
+    uint32_t        srcWidth,srcHeight;
+    uint32_t        dstWidth,dstHeight;
+    ADM_pixelFormat fromPixFrmt,toPixFrmt;
+    int             sws_flag;
+    #define ADM_COLORSPACE_HDR_LUT_WIDTH (12)	// bits
+    #define ADM_COLORSPACE_HDR_LUT_SIZE	(1<<ADM_COLORSPACE_HDR_LUT_WIDTH)
+    uint8_t         *hdrLumaLUT;
+    uint8_t         *hdrChromaBLUT[256];
+    uint8_t         *hdrChromaRLUT[256];
+    uint8_t         *hdrLumaCrLUT[256];
+    uint16_t        *hdrRGBLUT;
+    uint8_t         *hdrGammaLUT;
+    double          hdrTMsrcLum, hdrTMtrgtLum, hdrTMsat, hdrTMboost;
+    unsigned int    hdrTMmethod;
+    uint16_t        *hdrYUV;
+    uint16_t        *hdrRGB[3];
+    uint8_t         *sdrRGB[3];
+    uint8_t         sdrRGBSat[256];
+    uint32_t        threadCount;
+    pthread_t       *worker_threads;
+    
+    typedef struct {
+        uint32_t        dstWidth,dstHeight;
+        uint32_t        ystart, yincr;
+        uint8_t         *gbrData[3];
+        uint8_t         *dstData[3];
+        bool            p3_primaries;
+        uint8_t         *hdrLumaLUT;
+        uint8_t         *hdrChromaBLUT[256];
+        uint8_t         *hdrChromaRLUT[256];
+        uint8_t         *hdrLumaCrLUT[256];
+    } fastYUV_worker_thread_arg;
+    
+    fastYUV_worker_thread_arg *fastYUV_worker_thread_args;
+
+    typedef struct {
+        uint32_t        srcWidth,srcHeight;
+        uint32_t        ystart, yincr;
+        uint16_t        *hdrRGB[3];
+        uint8_t         *sdrRGB[3];
+        uint16_t        *hdrRGBLUT;
+        int             *ccmx;
+        uint8_t         *hdrGammaLUT;
+    } RGB_worker_thread_arg;
+    
+    RGB_worker_thread_arg *RGB_worker_thread_args;
+
+    static void *   toneMap_fastYUV_worker(void *argptr);
+    bool            toneMap_fastYUV(ADMImage *sourceImage, ADMImage *destImage, double targetLuminance, double saturationAdjust, double boostAdjust);
+    static void *   toneMap_RGB_worker(void *argptr);
+    void            toneMap_RGB_ColorMatrix(int32_t * matrix, ADM_colorPrimaries colorPrim, ADM_colorSpace colorSpace, double * primaries, double * whitePoint);
+    bool            toneMap_RGB(ADMImage *sourceImage, ADMImage *destImage, unsigned int method, double targetLuminance, double saturationAdjust, double boostAdjust);
+  public :
+                    ADMToneMapper(int sws_flag, int sw, int sh, int dw,int dh,ADM_pixelFormat from,ADM_pixelFormat to);
+    bool            toneMap(ADMImage *sourceImage, ADMImage *destImage);
+                    ~ADMToneMapper();
+};
+
+#endif
+//EOF
+

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp Changed

@@ -17,6 +17,8 @@
 #include "ADM_default.h"
 #include "ADM_colorspace.h"
 #include "ADM_image.h"
+#include "ADM_rgb.h" 
+#include "prefs.h"
 
 extern "C" {
 #include "libavcodec/avcodec.h"
@@ -24,8 +26,6 @@
 #include "libswscale/swscale.h"
 }
 
-#include "ADM_rgb.h" 
-#include "ADM_colorspace.h"
 
 #ifdef ADM_CPU_X86
 		#define ADD(x,y) if( CpuCaps::has##x()) flags|=SWS_CPU_CAPS_##y;
@@ -39,7 +39,6 @@
 #endif
 
 #define CONTEXT (SwsContext *)context
-#define BGR32_IS_SWAPPED 1
 
 /**
     \fn swapRGB
@@ -62,54 +61,14 @@
         }
     }
 }
-/**
-    \fn ADMColor2LAVColor
-    \brief Convert ADM colorspace type swscale/lavcodec colorspace name
 
-*/
-static AVPixelFormat ADMColor2LAVColor(ADM_colorspace fromColor_)
-{
-  ADM_colorspace fromColor=fromColor_;
-  int intColor=(int)fromColor;
-  intColor&=ADM_COLOR_MASK;
-  fromColor=(ADM_colorspace)intColor;
-  switch(fromColor)
-  {
-    case ADM_COLOR_YUV444: return AV_PIX_FMT_YUV444P;
-    case ADM_COLOR_YUV411: return AV_PIX_FMT_YUV411P;
-    case ADM_COLOR_YUV422: return AV_PIX_FMT_YUYV422;
-    case ADM_COLOR_UYVY422: return AV_PIX_FMT_UYVY422;
-    case ADM_COLOR_YV12: return AV_PIX_FMT_YUV420P;
-    case ADM_COLOR_NV12: return AV_PIX_FMT_NV12;
-    case ADM_COLOR_YUV422P: return AV_PIX_FMT_YUV422P;
-    case ADM_COLOR_RGB555: return AV_PIX_FMT_RGB555LE;
-    case ADM_COLOR_BGR555: return AV_PIX_FMT_BGR555LE;
-    case ADM_COLOR_RGB32A: return AV_PIX_FMT_RGBA;
-#ifdef BGR32_IS_SWAPPED
-    case ADM_COLOR_BGR32A: return AV_PIX_FMT_RGBA; // Faster that way...
-#else
-    case ADM_COLOR_BGR32A: return AV_PIX_FMT_BGRA;
-#endif
-    case ADM_COLOR_RGB24: return AV_PIX_FMT_RGB24;
-    case ADM_COLOR_BGR24: return AV_PIX_FMT_BGR24;
-    case ADM_COLOR_YUV420_10BITS: return AV_PIX_FMT_YUV420P10LE;
-    case ADM_COLOR_YUV420_12BITS: return AV_PIX_FMT_YUV420P12LE;
-    case ADM_COLOR_NV12_10BITS:  return AV_PIX_FMT_P010LE;
-    case ADM_COLOR_YUV444_10BITS: return AV_PIX_FMT_YUV444P10LE;
-    case ADM_COLOR_YUV422_10BITS: return AV_PIX_FMT_YUV422P10LE;
-    case ADM_COLOR_YUV444_12BITS: return AV_PIX_FMT_YUV444P12LE;
-    case ADM_COLOR_Y8: return AV_PIX_FMT_GRAY8;
-    default : ADM_assert(0); 
-  }
-  return AV_PIX_FMT_YUV420P;
-}
 /**
       \fn getStrideAndPointers
       \param dst=1 -> destination, =0 source
       \brief Fill in strides etc.. needed by libswscale
 */
 uint8_t ADMColorScalerFull::getStrideAndPointers(bool dst,
-        uint8_t  *from,ADM_colorspace fromColor,
+        uint8_t  *from,ADM_pixelFormat fromPixFrmt,
         uint8_t **srcData,int *srcStride)
 {
     uint32_t width,height;
@@ -122,9 +81,9 @@
         width=dstWidth;
         height=dstHeight;
     }
-  switch(fromColor)
+  switch(fromPixFrmt)
   {
-    case ADM_COLOR_RGB555: 
+    case ADM_PIXFRMT_RGB555: 
             srcData[0]=from;
             srcData[1]=NULL;
             srcData[2]=NULL;
@@ -132,8 +91,8 @@
             srcStride[1]=0;
             srcStride[2]=0;
             break;
-    case ADM_COLOR_RGB24:
-    case ADM_COLOR_BGR24:
+    case ADM_PIXFRMT_RGB24:
+    case ADM_PIXFRMT_BGR24:
             srcData[0]=from;
             srcData[1]=NULL;
             srcData[2]=NULL;
@@ -141,7 +100,19 @@
             srcStride[1]=0;
             srcStride[2]=0;
             break;
-    case  ADM_COLOR_YV12:
+    case ADM_PIXFRMT_GBR24P:
+            srcData[0]=from;
+            width=ADM_IMAGE_ALIGN(width);
+            height=ADM_IMAGE_ALIGN(height);
+            from+=width*height;
+            srcData[1]=from;
+            from+=width*height;
+            srcData[2]=from;
+            srcStride[0]=width;
+            srcStride[1]=width;
+            srcStride[2]=width;
+            break;
+    case  ADM_PIXFRMT_YV12:
             srcData[0]=from;
             width=ADM_IMAGE_ALIGN(width);
             height=ADM_IMAGE_ALIGN(height);
@@ -153,8 +124,8 @@
             srcStride[1]=width>>1;
             srcStride[2]=width>>1;
             break;
-    case ADM_COLOR_YUV420_10BITS:
-    case ADM_COLOR_YUV420_12BITS:
+    case ADM_PIXFRMT_YUV420_10BITS:
+    case ADM_PIXFRMT_YUV420_12BITS:
             srcData[0]=from;
             width=ADM_IMAGE_ALIGN(width*2);
             height=ADM_IMAGE_ALIGN(height);
@@ -166,7 +137,7 @@
             srcStride[1]=width>>1;
             srcStride[2]=width>>1;
             break;
-    case ADM_COLOR_NV12:
+    case ADM_PIXFRMT_NV12:
             srcData[0]=from;
             width=ADM_IMAGE_ALIGN(width);
             height=ADM_IMAGE_ALIGN(height);
@@ -177,8 +148,8 @@
             srcStride[1]=width;
             srcStride[2]=0;
             break;
-    case  ADM_COLOR_YUV422:
-    case  ADM_COLOR_UYVY422:        
+    case  ADM_PIXFRMT_YUV422:
+    case  ADM_PIXFRMT_UYVY422:        
             srcData[0]=from;
             srcData[1]=NULL;
             srcData[2]=NULL;
@@ -186,7 +157,7 @@
             srcStride[1]=0;
             srcStride[2]=0;
             break;            
-    case  ADM_COLOR_YUV422P:
+    case  ADM_PIXFRMT_YUV422P:
             srcData[0]=from;
             width=ADM_IMAGE_ALIGN(width);
             height=ADM_IMAGE_ALIGN(height);
@@ -198,8 +169,8 @@
             srcStride[1]=width>>1;
             srcStride[2]=width>>1;
             break;
-    case ADM_COLOR_RGB32A:
-    case ADM_COLOR_BGR32A:
+    case ADM_PIXFRMT_RGB32A:
+    case ADM_PIXFRMT_BGR32A:
             srcData[0]=from;
             srcData[1]=NULL;
             srcData[2]=NULL;
@@ -207,7 +178,7 @@
             srcStride[1]=0;
             srcStride[2]=0;
             break;
-    case ADM_COLOR_YUV422_10BITS:
+    case ADM_PIXFRMT_YUV422_10BITS:
             srcData[0]=from;
             width=ADM_IMAGE_ALIGN(width*2);
             height=ADM_IMAGE_ALIGN(height);
@@ -219,7 +190,7 @@
             srcStride[1]=width>>1;
             srcStride[2]=width>>1;
             break;
-    case ADM_COLOR_YUV444_12BITS:
+    case ADM_PIXFRMT_YUV444_12BITS:
             srcData[0]=from;
             width=ADM_IMAGE_ALIGN(width*2);
             height=ADM_IMAGE_ALIGN(height);
@@ -250,16 +221,16 @@
     int srcStride[3];
     int dstStride[3];
 
-    getStrideAndPointers(false,from,fromColor,srcData,srcStride);
-    getStrideAndPointers(true,to,toColor,dstData,dstStride);
+    getStrideAndPointers(false,from,fromPixFrmt,srcData,srcStride);
+    getStrideAndPointers(true,to,toPixFrmt,dstData,dstStride);
 
-    if(fromColor == ADM_COLOR_YV12)
+    if(fromPixFrmt == ADM_PIXFRMT_YV12)
     {
         uint8_t *p=srcData[1];
         srcData[1]=srcData[2];
         srcData[2]=p;
     }
-    if(toColor == ADM_COLOR_YV12)
+    if(toPixFrmt == ADM_PIXFRMT_YV12)
     {
         uint8_t *p=dstData[1];
         dstData[1]=dstData[2];
@@ -267,12 +238,12 @@
     }
 
 #ifdef BGR32_IS_SWAPPED
-    if(fromColor != toColor && fromColor == ADM_COLOR_BGR32A)
+    if(fromPixFrmt != toPixFrmt && fromPixFrmt == ADM_PIXFRMT_BGR32A)
         swapRGB32(srcWidth,srcHeight,srcStride[0],srcData[0]);
 #endif
     sws_scale(CONTEXT,srcData,srcStride,0,srcHeight,dstData,dstStride);
 #ifdef BGR32_IS_SWAPPED
-    if(fromColor != toColor && toColor==ADM_COLOR_BGR32A)
+    if(fromPixFrmt != toPixFrmt && toPixFrmt==ADM_PIXFRMT_BGR32A)
         swapRGB32(dstWidth,dstHeight,dstStride[0],dstData[0]);
 #endif
     return true;
@@ -293,12 +264,12 @@
         dst[i]=destData[i];
     }
 #ifdef BGR32_IS_SWAPPED
-    if(fromColor != toColor && fromColor == ADM_COLOR_BGR32A)
+    if(fromPixFrmt != toPixFrmt && fromPixFrmt == ADM_PIXFRMT_BGR32A)
         swapRGB32(srcWidth,srcHeight,xs[0],src[0]);
 #endif
     sws_scale(CONTEXT,src,xs,0,srcHeight,dst,xd);
 #ifdef BGR32_IS_SWAPPED
-    if(fromColor != toColor && toColor == ADM_COLOR_BGR32A)
+    if(fromPixFrmt != toPixFrmt && toPixFrmt == ADM_PIXFRMT_BGR32A)
         swapRGB32(dstWidth,dstHeight,xd[0],dst[0]);
 #endif
     return true;
@@ -309,6 +280,12 @@
 */
 bool            ADMColorScalerFull::convertImage(ADMImage *sourceImage, ADMImage *destImage)
 {
+    if (toneMapper != NULL)
+    {
+        if (toneMapper->toneMap(sourceImage, destImage))
+            return true;
+    }
+
     int xs[4];
     int xd[4];
     uint8_t *src[4];
@@ -324,20 +301,20 @@
     src[3]=sourceImage->GetReadPtr(PLANAR_ALPHA);
     dst[3]=destImage->GetWritePtr(PLANAR_ALPHA);
 
-    if(fromColor==ADM_COLOR_YV12)
+    if(fromPixFrmt==ADM_PIXFRMT_YV12)
     {
         uint8_t *p=src[1];
         src[1]=src[2];
         src[2]=p;
     }
 
-    if(toColor==ADM_COLOR_YV12)
+    if(toPixFrmt==ADM_PIXFRMT_YV12)
     {
         uint8_t *p=dst[1];
         dst[1]=dst[2];
         dst[2]=p;
     }
-    if(fromColor != toColor)
+    if(fromPixFrmt != toPixFrmt)
     {
         int *itbl = NULL;
         int *ta = NULL;
@@ -359,7 +336,7 @@
             }
         }
 #ifdef BGR32_IS_SWAPPED
-        if(fromColor == ADM_COLOR_BGR32A)
+        if(fromPixFrmt == ADM_PIXFRMT_BGR32A)
             swapRGB32(srcWidth,srcHeight,xs[0],src[0]);
 #endif
     }else
@@ -370,7 +347,7 @@
     sws_scale(CONTEXT,src,xs,0,srcHeight,dst,xd);
 
 #ifdef BGR32_IS_SWAPPED
-    if(fromColor != toColor && toColor == ADM_COLOR_BGR32A)
+    if(fromPixFrmt != toPixFrmt && toPixFrmt == ADM_PIXFRMT_BGR32A)
         swapRGB32(dstWidth,dstHeight,xd[0],dst[0]);
 #endif
     return true;
@@ -388,11 +365,12 @@
 ADMColorScalerFull::ADMColorScalerFull(ADMColorScaler_algo algo,
             int sw, int sh,
             int dw, int dh,
-            ADM_colorspace from,ADM_colorspace to)
+            ADM_pixelFormat from,ADM_pixelFormat to)
 {
-   context=NULL;
-   reset(algo,sw,sh,dw,dh,from,to);
-
+    context=NULL;
+    possibleHdrContent=false;
+    toneMapper=NULL;
+    reset(algo,sw,sh,dw,dh,from,to);
 }
 /**
     \fn  ~ADMColorScaler
@@ -400,19 +378,29 @@
 */
 ADMColorScalerFull::~ADMColorScalerFull()
 {
-  if(context)
-  {
-     sws_freeContext(CONTEXT);
-     context=NULL;
-  }
+    if(context)
+    {
+        sws_freeContext(CONTEXT);
+        context=NULL;
+    }
+    if (toneMapper)
+    {
+        delete toneMapper;
+        toneMapper=NULL;
+    }
 }
 /**
     \fn reset
 */
-bool  ADMColorScalerFull::reset(ADMColorScaler_algo algo, int sw, int sh, int dw,int dh,ADM_colorspace from,ADM_colorspace to)
+bool  ADMColorScalerFull::reset(ADMColorScaler_algo algo, int sw, int sh, int dw,int dh,ADM_pixelFormat from,ADM_pixelFormat to)
 {
     if(context) sws_freeContext(CONTEXT);
     context=NULL;
+    if (toneMapper)
+    {
+        delete toneMapper;
+        toneMapper=NULL;
+    }
     this->algo=algo;
     int flags;
     switch(algo)
@@ -427,6 +415,7 @@
     SETAL(GAUSS);
     SETAL(SINC);
     SETAL(SPLINE);
+    SETAL(POINT);    // nearest neighbor
     default: ADM_assert(0);
     }
 #if 0 // this is gone, we need to patch av_get_cpu_flags directly now
@@ -434,17 +423,22 @@
         FLAGS();
     }
 #endif
-  
+    possibleHdrContent = (from >= ADM_PIXFRMT_YUV444_10BITS) && (from <= ADM_PIXFRMT_YUV444_12BITS) && (to == ADM_PIXFRMT_YV12);
+    if (possibleHdrContent)
+    {
+        toneMapper = new ADMToneMapper(flags, sw, sh, dw, dh, from, to);
+    }
+    
     srcWidth=sw;
     srcHeight=sh;
 
     dstWidth=dw;
     dstHeight=dh;
 
-    fromColor=from;
-    toColor=to;
-    AVPixelFormat lavFrom=ADMColor2LAVColor(fromColor );
-    AVPixelFormat lavTo=ADMColor2LAVColor(toColor );
+    fromPixFrmt=from;
+    toPixFrmt=to;
+    AVPixelFormat lavFrom=ADMPixFrmt2LAVPixFmt(fromPixFrmt );
+    AVPixelFormat lavTo=ADMPixFrmt2LAVPixFmt(toPixFrmt );
     
     context=(void *)sws_getContext(
                       srcWidth,srcHeight,
@@ -459,7 +453,7 @@
 {
     if(newWidth==srcWidth && newHeight==srcHeight) return true; // no change
     
-     return reset(algo, newWidth,newHeight, newWidth,newHeight,fromColor,toColor);
+     return reset(algo, newWidth,newHeight, newWidth,newHeight,fromPixFrmt,toPixFrmt);
 
 }
 
@@ -474,15 +468,15 @@
     int dstPitch[3];
     img->GetPitches(srcPitch);
     img->GetReadPlanes(srcPlanes);
-    getStrideAndPointers(true,to,toColor, dstPlanes, dstPitch);
+    getStrideAndPointers(true,to,toPixFrmt, dstPlanes, dstPitch);
 
-    if(fromColor==ADM_COLOR_YV12)
+    if(fromPixFrmt==ADM_PIXFRMT_YV12)
     {
         uint8_t *p=srcPlanes[1];
         srcPlanes[1]=srcPlanes[2];
         srcPlanes[2]=p;
     }
-    if(toColor==ADM_COLOR_YV12)
+    if(toPixFrmt==ADM_PIXFRMT_YV12)
     {
         uint8_t *p=dstPlanes[1];
         dstPlanes[1]=dstPlanes[2];
@@ -505,4 +499,5 @@
     }
     return convertPlanes(srcPitch,dstPitch,srcPlanes,dstPlanes);
 }
+
 //EOF

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_image.cpp Changed

@@ -10,7 +10,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
+#include <cmath>	// for NAN
 #include "ADM_default.h"
 #include "ADM_image.h"
 extern "C"
@@ -33,6 +33,30 @@
 	printf("Cur image used               : %" PRIu32"\n",imgCurNb);
 
 }
+
+/**
+    \fn ADM_HDR_Info
+    \brief Intialize all fields to NaNs
+*/
+ADM_HDR_Info::ADM_HDR_Info(void)
+{
+    int j,k;
+    for (j=0; j<3; j++)
+    {
+        for (k=0; k<2; k++)
+            primaries[j][k] = NAN;
+        maxSCL[j] = NAN;
+    }
+    for (j=0; j<2; j++)
+    {
+        whitePoint[j] = NAN;
+        kneePoint[j] = NAN;
+    }
+    for (j=0; j<15; j++)
+        bezierCurveAnchors[j] = NAN;
+    maxLuminance = minLuminance = maxCLL = maxFALL = avgMaxRGB = colorSaturationWeight = targetMaxLuminance = NAN;
+}
+
 /**
     \fn ADMImage
     \brief ctor
@@ -44,15 +68,18 @@
 
         _width=width;
         _height=height;
-        _Qp=2;
+        _Qp = ADM_IMAGE_UNKNOWN_QP;
         flags=0;
         _aspect=ADM_ASPECT_1_1;
         imgCurNb++;
         if(imgCurNb>imgMaxNb)
             imgMaxNb=imgCurNb;
         _noPicture=0;
-        _colorspace=ADM_COLOR_YV12;
+        _pixfrmt=ADM_PIXFRMT_YV12;
         _range=ADM_COL_RANGE_MPEG;
+        _colorPrim=ADM_COL_PRI_BT709;
+        _colorTrc=ADM_COL_TRC_BT709;
+        _colorSpace=ADM_COL_SPC_BT709;
         Pts=0;
         _imageType=type;
         quant=NULL;
@@ -125,15 +152,16 @@
     if(alpha>255) alpha=255;
     if(alpha==255) // take a shortcut
         return BitBlit(dst,pitchDst,src,pitchSrc,width,height);
+    float af = alpha * (256.0/255.0);
+    alpha = af+0.49;
+    uint32_t negalpha = 256-alpha;
+    uint32_t pix;
     for(int y=0;y<height;y++)
     {
         for(int x=0;x<width;x++)
         {
-            float s=src[x],d=dst[x];
-            d=s*alpha+(255.-alpha)*d;
-            d/=255.;
-            d+=0.49;
-            dst[x]=(uint8_t)d;
+            pix = alpha*src[x] + negalpha*dst[x];
+            dst[x]=(uint8_t)(pix>>8);
         }
         src+=pitchSrc;
         dst+=pitchDst;
@@ -152,13 +180,14 @@
  */
 bool BitBlit(uint8_t *dst, uint32_t pitchDst,uint8_t *src,uint32_t pitchSrc,uint32_t width, uint32_t height)
 {
-#if 1
+#if 0
+    // av_image_copy_plane is just a wrapper around a wrapper of line-by-line memcpy
     // ffmpeg makes it better
      av_image_copy_plane(dst, (int) pitchDst,
                          src, (int) pitchSrc,
                          width, height);
 #else
-    for(int y=0;y<height;y++)
+    for (;height > 0; height--)
     {
         memcpy(dst,src,width);
         src+=pitchSrc;

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp Changed

@@ -60,7 +60,10 @@
                         }
                     }
                 }
-                BitBlit(dest, destStride,source,sourceStride,opWidth, opHeight);
+                if (destStride == sourceStride)
+                    memcpy(dest, source, destStride*opHeight);  // copying in one run is faster then line-by-line
+                else
+                    BitBlit(dest, destStride,source,sourceStride,opWidth, opHeight);
             }
         }
          else // it is a hw surface
@@ -104,6 +107,10 @@
     _aspect=src->_aspect;
     Pts=src->Pts;
     _range=src->_range;
+    _colorPrim=src->_colorPrim;
+    _colorTrc=src->_colorTrc;
+    _colorSpace=src->_colorSpace;
+    memcpy(&_hdrInfo, &(src->_hdrInfo), sizeof(_hdrInfo));
     return 1;
 }
 /**
@@ -113,7 +120,7 @@
 bool ADMImage::shrinkColorRange(void)
 {
     if(!isWrittable()) return false;
-    if(_colorspace!=ADM_COLOR_YV12) return false;
+    if(_pixfrmt!=ADM_PIXFRMT_YV12) return false;
     if(_range==ADM_COL_RANGE_MPEG) return true;
 
     static uint8_t shrinkLumaTable[256];
@@ -164,7 +171,7 @@
 bool ADMImage::expandColorRange(void)
 {
     if(!isWrittable()) return false;
-    if(_colorspace!=ADM_COLOR_YV12) return false;
+    if(_pixfrmt!=ADM_PIXFRMT_YV12) return false;
     if(_range==ADM_COL_RANGE_JPEG) return true;
 
     static uint8_t expandLumaTable[256];

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageResizer.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageSave.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_pp.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/ADM_toneMapper.cpp Added

@@ -0,0 +1,1060 @@
+/***************************************************************************
+    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 <cmath>
+#include "ADM_default.h"
+#include "ADM_toneMapper.h" 
+#include "prefs.h"
+#include "ADM_image.h"
+#include "ADM_colorspace.h"
+
+extern "C" {
+#include "libavcodec/avcodec.h"
+#include "libavutil/avutil.h"
+#include "libswscale/swscale.h"
+}
+
+unsigned int ADMToneMapperConfig::method;
+float ADMToneMapperConfig::saturation;
+float ADMToneMapperConfig::boost;
+
+ADMToneMapperConfig::ADMToneMapperConfig(bool init)
+{
+    if (init)
+    {
+        if (!prefs->get(HDR_TONEMAPPING,&method))
+            method = 1;
+        saturation = 1;
+        boost = 1;
+    }
+}
+
+void ADMToneMapperConfig::getConfig(uint32_t * toneMappingMethod, float * saturationAdjust, float * boostAdjust, float * targetLuminance)
+{
+    if (toneMappingMethod)
+        *toneMappingMethod = method;
+    if (saturationAdjust)
+        *saturationAdjust = saturation;
+    if (boostAdjust)
+        *boostAdjust = boost;
+    if (targetLuminance)
+        if(!prefs->get(HDR_TARGET_LUMINANCE,targetLuminance))
+            *targetLuminance = 100.0;
+}
+
+void ADMToneMapperConfig::setConfig(uint32_t toneMappingMethod, float saturationAdjust, float boostAdjust)
+{
+    method = toneMappingMethod;
+    saturation = saturationAdjust;
+    boost = boostAdjust;
+}
+
+
+
+#define CONTEXTYUV (SwsContext *)contextYUV
+#define CONTEXTRGB1 (SwsContext *)contextRGB1
+#define CONTEXTRGB2 (SwsContext *)contextRGB2
+
+/**
+    \fn  ADMToneMapper
+    \brief Ctor
+*/
+ADMToneMapper::ADMToneMapper(int sws_flag,
+            int sw, int sh,
+            int dw, int dh,
+            ADM_pixelFormat from,ADM_pixelFormat to)
+{
+    config = new ADMToneMapperConfig();
+    contextYUV=NULL;
+    contextRGB1=NULL;
+    contextRGB2=NULL;
+    hdrLumaLUT = NULL;
+    hdrRGBLUT = NULL;
+    hdrGammaLUT = NULL;
+    for (int i=0; i<256; i++)
+    {
+        hdrChromaBLUT[i] = NULL;
+        hdrChromaRLUT[i] = NULL;
+        hdrLumaCrLUT[i] = NULL;
+    }
+    hdrTMsrcLum = hdrTMtrgtLum = hdrTMsat = hdrTMboost = -1.0;	// invalidate
+    hdrTMmethod = 0;
+    hdrYUV=NULL;
+    for (int i=0; i<3; i++)
+    {
+        hdrRGB[i]=NULL;
+        sdrRGB[i]=NULL;
+    }
+    
+    this->sws_flag=sws_flag;
+
+    srcWidth=sw;
+    srcHeight=sh;
+
+    dstWidth=dw;
+    dstHeight=dh;
+
+    ADM_assert(to==ADM_PIXFRMT_YV12);
+    fromPixFrmt=from;
+    toPixFrmt=to;
+
+    AVPixelFormat lavFrom=ADMPixFrmt2LAVPixFmt(fromPixFrmt );
+    AVPixelFormat lavTo=ADMPixFrmt2LAVPixFmt(toPixFrmt );
+    
+    contextYUV=(void *)sws_getContext(
+                      srcWidth,srcHeight,
+                      lavFrom ,
+                      dstWidth,dstHeight,
+                      AV_PIX_FMT_YUV420P16LE,
+                      sws_flag, NULL, NULL,NULL);
+
+    contextRGB1=(void *)sws_getContext(
+                      srcWidth,srcHeight,
+                      lavFrom ,
+                      srcWidth,srcHeight,
+                      AV_PIX_FMT_GBRP16LE,
+                      SWS_POINT, NULL, NULL,NULL);		// use fast n.n. scaling, as resolution will not change in the first step
+    contextRGB2=(void *)sws_getContext(
+                      srcWidth,srcHeight,
+                      AV_PIX_FMT_GBR24P ,
+                      dstWidth,dstHeight,
+                      lavTo,
+                      sws_flag, NULL, NULL,NULL);
+    const int *coeffsrc = sws_getCoefficients(SWS_CS_BT2020);
+    const int *coeffdst = sws_getCoefficients(SWS_CS_BT2020);
+    sws_setColorspaceDetails(CONTEXTRGB1, coeffsrc, 0, coeffdst, 0, 0, (1 << 16), (1 << 16));
+    coeffsrc = sws_getCoefficients(SWS_CS_ITU709);
+    coeffdst = sws_getCoefficients(SWS_CS_ITU709);
+    sws_setColorspaceDetails(CONTEXTRGB2, coeffsrc, 0, coeffdst, 0, 0, (1 << 16), (1 << 16));
+    
+    threadCount = ADM_cpu_num_processors();
+    if (threadCount < 1)
+        threadCount = 1;
+    if (threadCount > 64)
+        threadCount = 64;
+    if (threadCount > 4)
+        threadCount = (threadCount-4)/2 + 4;
+    worker_threads = new pthread_t [threadCount];
+    fastYUV_worker_thread_args = new fastYUV_worker_thread_arg [threadCount];
+    RGB_worker_thread_args = new RGB_worker_thread_arg [threadCount];
+}
+
+
+/**
+    \fn  ~ADMToneMapper
+    \brief Destructor
+*/
+ADMToneMapper::~ADMToneMapper()
+{
+    delete config;
+    if(contextYUV)
+    {
+        sws_freeContext(CONTEXTYUV);
+        contextYUV=NULL;
+    }
+    if(contextRGB1)
+    {
+        sws_freeContext(CONTEXTRGB1);
+        contextRGB1=NULL;
+    }
+    if(contextRGB2)
+    {
+        sws_freeContext(CONTEXTRGB2);
+        contextRGB2=NULL;
+    }
+
+    delete [] hdrLumaLUT;
+    delete [] hdrRGBLUT;
+    delete [] hdrGammaLUT;
+    for (int i=0; i<256; i++)
+    {
+        delete [] hdrChromaBLUT[i];
+        delete [] hdrChromaRLUT[i];
+        delete [] hdrLumaCrLUT[i];
+    }
+    if (hdrYUV)
+    {
+        delete [] hdrYUV;
+        hdrYUV = NULL;
+    }
+    for (int i=0; i<3; i++)
+    {
+        delete [] hdrRGB[i];
+        delete [] sdrRGB[i];
+    }
+    delete [] worker_threads;
+    delete [] fastYUV_worker_thread_args;
+    delete [] RGB_worker_thread_args;
+}
+
+
+/**
+    \fn toneMap
+*/
+bool ADMToneMapper::toneMap(ADMImage *sourceImage, ADMImage *destImage)
+{
+    uint32_t toneMappingMethod;
+    float targetLuminance;
+    float saturationAdjust;
+    float boostAdjust;
+    
+    config->getConfig(&toneMappingMethod, &saturationAdjust, &boostAdjust, &targetLuminance);
+    
+    if (hdrTMmethod != toneMappingMethod)
+    {
+        hdrTMmethod = toneMappingMethod;
+        hdrTMsrcLum = hdrTMtrgtLum = hdrTMsat = hdrTMboost = -1.0;	// invalidate
+    }
+
+    switch (toneMappingMethod)
+    {
+        case 1:	// fastYUV
+                return toneMap_fastYUV(sourceImage, destImage, targetLuminance, saturationAdjust, boostAdjust);
+            break;
+        case 2:
+        case 3:
+        case 4:
+                return toneMap_RGB(sourceImage, destImage, toneMappingMethod, targetLuminance, saturationAdjust, boostAdjust);
+        default:
+            return false;
+    }
+}
+
+
+
+/**
+    \fn toneMap_fastYUV_worker
+*/
+void * ADMToneMapper::toneMap_fastYUV_worker(void *argptr)
+{
+    fastYUV_worker_thread_arg * arg = (fastYUV_worker_thread_arg*)argptr;
+
+    int ystride = ADM_IMAGE_ALIGN(arg->dstWidth);
+    int uvstride = ADM_IMAGE_ALIGN(arg->dstWidth/2);
+    uint8_t * ptr, * ptrNext, * ptrU, * ptrV;
+    uint16_t * hptr, * hptrNext, * hptrU, * hptrV;
+    uint8_t ysdr[4];
+    int usdr,vsdr,urot,vrot,oormask;
+    oormask = 0xFF;
+    oormask = ~oormask;
+
+    for (int y=arg->ystart; y<(arg->dstHeight/2); y+=arg->yincr)
+    {
+        ptr = arg->dstData[0] + y*2*ystride;
+        ptrNext = ptr + ystride;
+        hptr = (uint16_t *)(arg->gbrData[0]) + y*2*ystride;
+        hptrNext = hptr+ystride;
+        ptrU = arg->dstData[1] + y*uvstride;
+        ptrV = arg->dstData[2] + y*uvstride;
+        hptrU = (uint16_t *)(arg->gbrData[1]) + y*uvstride;
+        hptrV = (uint16_t *)(arg->gbrData[2]) + y*uvstride;
+        for (int x=0; x<(arg->dstWidth/2); x++)
+        {
+            ysdr[0] = arg->hdrLumaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hptr>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            hptr++;
+            ysdr[1] = arg->hdrLumaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hptr>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            hptr++;
+            ysdr[2] = arg->hdrLumaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hptrNext>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            hptrNext++;
+            ysdr[3] = arg->hdrLumaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hptrNext>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            hptrNext++;
+
+            int luma = 0;
+            luma += ysdr[0];
+            luma += ysdr[1];
+            luma += ysdr[2];
+            luma += ysdr[3];
+            luma /= 4;
+            luma &= 0xFF;
+            usdr = arg->hdrChromaBLUT[luma][(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hptrU>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            vsdr = arg->hdrChromaRLUT[luma][(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hptrV>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            hptrU++; hptrV++;
+
+            *ptr = arg->hdrLumaCrLUT[vsdr][ysdr[0]];
+            ptr++;
+            *ptr = arg->hdrLumaCrLUT[vsdr][ysdr[1]];
+            ptr++;
+            *ptrNext = arg->hdrLumaCrLUT[vsdr][ysdr[2]];
+            ptrNext++;
+            *ptrNext = arg->hdrLumaCrLUT[vsdr][ysdr[3]];
+            ptrNext++;
+
+            if (arg->p3_primaries)	// -8 deg hue shift
+            {
+                usdr -= 128;
+                vsdr -= 128;
+                urot = 507*usdr + 71*vsdr;
+                vrot = 507*vsdr - 71*usdr;
+                usdr = (urot >> 9) + 128;
+                vsdr = (vrot >> 9) + 128;
+                if (usdr & oormask)
+                {
+                    usdr = (usdr < 0) ? 0:255;
+                }
+                if (vsdr & oormask)
+                {
+                    vsdr = (vsdr < 0) ? 0:255;
+                }
+            }
+
+            *ptrU = usdr;
+            *ptrV = vsdr;
+            ptrU++; ptrV++;
+        }
+    }
+
+
+    pthread_exit(NULL);
+    return NULL;
+}
+
+/**
+    \fn toneMap_fastYUV
+*/
+bool ADMToneMapper::toneMap_fastYUV(ADMImage *sourceImage, ADMImage *destImage, double targetLuminance, double saturationAdjust, double boostAdjust)
+{
+    // Check if tone mapping is needed & can do 
+    if (!((sourceImage->_colorTrc == ADM_COL_TRC_SMPTE2084) || (sourceImage->_colorTrc == ADM_COL_TRC_ARIB_STD_B67) || (sourceImage->_colorSpace == ADM_COL_SPC_BT2020_NCL) || (sourceImage->_colorSpace == ADM_COL_SPC_BT2020_CL)))
+        return false;
+    if ((sourceImage->_colorTrc == ADM_COL_TRC_BT2020_10) || (sourceImage->_colorTrc == ADM_COL_TRC_BT2020_12))	// excluding trc, not hdr
+        return false;
+    if (!std::isnan(sourceImage->_hdrInfo.colorSaturationWeight))
+        if (sourceImage->_hdrInfo.colorSaturationWeight > 0)
+            saturationAdjust *= sourceImage->_hdrInfo.colorSaturationWeight;
+    
+    // Determine max luminance
+    double maxLuminance = 10000.0;
+    if (!std::isnan(sourceImage->_hdrInfo.maxLuminance))
+        if (sourceImage->_hdrInfo.maxLuminance > 0)
+            if (maxLuminance > sourceImage->_hdrInfo.maxLuminance)
+                maxLuminance = sourceImage->_hdrInfo.maxLuminance;
+    if (!std::isnan(sourceImage->_hdrInfo.targetMaxLuminance))
+        if (sourceImage->_hdrInfo.targetMaxLuminance > 0)
+            if (maxLuminance > sourceImage->_hdrInfo.targetMaxLuminance)
+                maxLuminance = sourceImage->_hdrInfo.targetMaxLuminance;
+    if (sourceImage->_colorTrc == ADM_COL_TRC_ARIB_STD_B67)
+        if (maxLuminance == 10000.0)
+            maxLuminance=1000.0;
+    double boost = 1;
+    if ((!std::isnan(sourceImage->_hdrInfo.maxCLL)) && (!std::isnan(sourceImage->_hdrInfo.maxFALL)))
+        if ((sourceImage->_hdrInfo.maxCLL > 0) && (sourceImage->_hdrInfo.maxFALL > 0))
+            boost = sourceImage->_hdrInfo.maxCLL / sourceImage->_hdrInfo.maxFALL;
+    boost *= boostAdjust*boostAdjust;
+
+    // P3 primaries
+    bool p3_primaries = false;
+    if ((sourceImage->_colorPrim == ADM_COL_PRI_SMPTE431) || (sourceImage->_colorPrim == ADM_COL_PRI_SMPTE432))
+        p3_primaries = true;
+    if ((fabs(sourceImage->_hdrInfo.primaries[0][0] - 0.680) <= 0.001) && (fabs(sourceImage->_hdrInfo.primaries[0][1] - 0.320) <= 0.001) &&
+        (fabs(sourceImage->_hdrInfo.primaries[1][0] - 0.265) <= 0.001) && (fabs(sourceImage->_hdrInfo.primaries[1][1] - 0.690) <= 0.001) &&
+        (fabs(sourceImage->_hdrInfo.primaries[2][0] - 0.150) <= 0.001) && (fabs(sourceImage->_hdrInfo.primaries[2][1] - 0.060) <= 0.001) )
+        p3_primaries = true;
+
+    // Allocate if not done yet
+    if (hdrLumaLUT == NULL)
+    {
+        hdrLumaLUT = new uint8_t[ADM_COLORSPACE_HDR_LUT_SIZE];
+    }
+    for (int i=0; i<256; i++)
+    {
+        if (hdrChromaBLUT[i] == NULL)
+        {
+            hdrChromaBLUT[i] = new uint8_t[ADM_COLORSPACE_HDR_LUT_SIZE];
+        }
+        if (hdrChromaRLUT[i] == NULL)
+        {
+            hdrChromaRLUT[i] = new uint8_t[ADM_COLORSPACE_HDR_LUT_SIZE];
+        }
+        if (hdrLumaCrLUT[i] == NULL)
+        {
+            hdrLumaCrLUT[i] = new uint8_t[256];
+        }
+    }
+    if (hdrYUV == NULL)
+    {
+        hdrYUV = new uint16_t[ADM_IMAGE_ALIGN(dstWidth)*dstHeight*2];
+    }
+    
+    // Populate LUTs if parameters have changed
+    bool extended_range = false;
+    if ((maxLuminance != hdrTMsrcLum) || (targetLuminance != hdrTMtrgtLum) || (saturationAdjust != hdrTMsat) || (boost != hdrTMboost))
+    {
+        hdrTMsrcLum = maxLuminance;
+        hdrTMtrgtLum = targetLuminance;
+        hdrTMsat = saturationAdjust;
+        hdrTMboost = boost;
+        
+        int prevYSDRint=-1;
+        
+        for (int l=(ADM_COLORSPACE_HDR_LUT_SIZE-1); l>=0; l-=1)
+        {
+            double LumHDR = maxLuminance;	// peak mastering display luminance [nit]
+            double LumSDR = targetLuminance;		// peak target display luminance [nit]
+
+            double Y = l;
+            // normalize:
+            Y /= ADM_COLORSPACE_HDR_LUT_SIZE;
+            Y -= 16.0/256.0;	// deal with limited range
+            Y *= 256.0/220.0;
+            if (Y < 0)
+                Y = 0.0;
+            if (Y > 1)
+                Y = 1.0;
+
+            // WTF? step 0
+            Y = std::pow(Y, 2.4);
+
+            // Tone mapping step 1
+            double rhoHDR = 1 + 32*std::pow(LumHDR/10000.0, 1/2.4);
+            double Yp = std::log(1 + (rhoHDR-1)*Y) / std::log(rhoHDR);
+
+            // Tone mapping step 2
+            double Yc;
+            if (Yp < 0)
+                Yc = 0.0;
+            else if ((0 <= Yp) && (Yp <= 0.7399))
+                Yc = 1.0770*Yp;
+            else if ((0.7399 < Yp) && (Yp <  0.9909))
+                Yc = -1.1510*Yp*Yp + 2.7811*Yp - 0.6302;
+            else if (( 0.9909 <= Yp) && (Yp <= 1.0))
+                Yc = 0.5*Yp + 0.5;
+            else // Yp > 1
+                Yc = 1.0;
+
+            // Tone mapping step 3
+            double rhoSDR = 1 + 32*std::pow(LumSDR/10000.0, 1/2.4);
+            double YSDR = (std::pow(rhoSDR, Yc) - 1) / (rhoSDR - 1);
+
+            // WTF? step 4
+            double maxboost = std::sqrt(2)*1.1;
+            if (std::sqrt(boost) > maxboost)
+                maxboost = std::sqrt(boost);
+            YSDR *= maxboost;
+            if (YSDR < 0)
+                YSDR = 0;
+            if (YSDR > 1)
+                YSDR = 1.0;
+
+            int YSDRint;
+            if (extended_range)
+                YSDRint = std::round(255.0*YSDR);
+            else
+                YSDRint = std::round(219.0*YSDR) + 16;
+            hdrLumaLUT[l] = YSDRint;
+            
+            if (prevYSDRint != YSDRint)
+            {
+                prevYSDRint = YSDRint;
+                for (int l=0; l<ADM_COLORSPACE_HDR_LUT_SIZE; l+=1)
+                {
+                    double C = l;
+                    C /= ADM_COLORSPACE_HDR_LUT_SIZE;
+                    C -= 16.0/256.0;	// deal with limited range
+                    C *= 256.0/224.0;
+                    if (C < 0)
+                        C = 0.0;
+                    if (C > 1)
+                        C = 1.0;
+                    C -= 0.5;
+
+                    double fYSDR = ((Y==0)||(YSDR==0)) ? 1.0 : (YSDR / (1.1*Y));
+                    C *= fYSDR;
+                    // WTF? step 5 prevent shadow glow
+                    C *= std::pow(YSDR+0.001,1/2.4)*saturationAdjust;
+                    if (C < -0.5)
+                        C = -0.5;
+                    if (C > 0.5)
+                        C = 0.5;
+                    C += 0.5;
+                    if (extended_range)
+                    {
+                        hdrChromaBLUT[YSDRint][l] = std::round(255.0*C);
+                        hdrChromaRLUT[YSDRint][l] = std::round(255.0*C);
+                    }
+                    else
+                    {
+                        hdrChromaBLUT[YSDRint][l] = std::round(224.0*C) + 16;
+                        hdrChromaRLUT[YSDRint][l] = std::round(224.0*C) + 16;
+                    }
+                }
+            }
+        }
+
+        for (int cr=0; cr<256; cr++)
+        {
+            for (int y=0; y<256; y++)
+            {
+                double yn, crn;
+                if (extended_range)
+                {
+                    crn = cr/255.0;
+                    yn = y/255.0;
+                }
+                else
+                {
+                    crn = cr;
+                    crn -= 16.0;
+                    crn /= 224.0;
+                    if (crn < 0) crn = 0;
+                    if (crn > 1) crn = 1;
+                    yn = y;
+                    yn -= 16.0;
+                    yn /= 219.0;
+                    if (yn < 0) yn = 0;
+                    if (yn > 1) yn = 1;
+                }
+                crn -= 0.5;
+                if (crn > 0)
+                    yn -= 0.1*crn;
+                if (yn < 0) yn = 0;
+                int YSDRint;
+                if (extended_range)
+                    YSDRint = std::round(255.0*yn);
+                else
+                    YSDRint = std::round(219.0*yn) + 16;
+                hdrLumaCrLUT[cr][y] = YSDRint;
+            }
+        }
+    }
+    
+    // Do tone mapping
+    uint8_t * srcData[3];
+    int srcStride[3];
+    uint8_t * dstData[3];
+    int dstStride[3];
+    
+    sourceImage->GetPitches(srcStride);
+    destImage->GetPitches(dstStride);
+    sourceImage->GetReadPlanes(srcData);
+    destImage->GetWritePlanes(dstData);
+    
+    // ADM_PIXFRMT_YV12 swapped UV
+    uint8_t *p=dstData[1];
+    dstData[1]=dstData[2];
+    dstData[2]=p;
+    
+    uint8_t *gbrData[3];
+    int gbrStride[3];
+    gbrData[0] = (uint8_t*)hdrYUV;
+    gbrStride[0] = ADM_IMAGE_ALIGN(dstWidth)*2;
+    gbrStride[1] = gbrStride[2]= ADM_IMAGE_ALIGN(dstWidth/2)*2;
+    gbrData[1] = gbrData[0] + gbrStride[0]*(dstHeight);
+    gbrData[2] = gbrData[1] + gbrStride[1]*(dstHeight/2);
+
+    sws_scale(CONTEXTYUV,srcData,srcStride,0,srcHeight,gbrData,gbrStride);
+
+    for (int tr=0; tr<threadCount; tr++)
+    {
+        fastYUV_worker_thread_args[tr].dstWidth = dstWidth;
+        fastYUV_worker_thread_args[tr].dstHeight = dstHeight;
+        fastYUV_worker_thread_args[tr].ystart = tr;
+        fastYUV_worker_thread_args[tr].yincr = threadCount;
+        for (int i=0; i<3; i++)
+        {
+            fastYUV_worker_thread_args[tr].gbrData[i] = gbrData[i];
+            fastYUV_worker_thread_args[tr].dstData[i] = dstData[i];
+        }
+        fastYUV_worker_thread_args[tr].p3_primaries = p3_primaries;
+        fastYUV_worker_thread_args[tr].hdrLumaLUT = hdrLumaLUT;
+        for (int i=0; i<256; i++)
+        {
+            fastYUV_worker_thread_args[tr].hdrChromaBLUT[i] = hdrChromaBLUT[i];
+            fastYUV_worker_thread_args[tr].hdrChromaRLUT[i] = hdrChromaRLUT[i];
+            fastYUV_worker_thread_args[tr].hdrLumaCrLUT[i] = hdrLumaCrLUT[i];
+        }
+    }
+    for (int tr=0; tr<threadCount; tr++)
+    {
+        pthread_create( &worker_threads[tr], NULL, toneMap_fastYUV_worker, (void*) &fastYUV_worker_thread_args[tr]);
+    }
+    // work in thread workers...
+    for (int tr=0; tr<threadCount; tr++)
+    {
+        pthread_join( worker_threads[tr], NULL);
+    }
+
+    // Reset output color properties
+    destImage->_pixfrmt=ADM_PIXFRMT_YV12;
+    destImage->_range=ADM_COL_RANGE_MPEG;
+    destImage->_colorPrim=ADM_COL_PRI_BT709;
+    destImage->_colorTrc=ADM_COL_TRC_BT709;
+    destImage->_colorSpace=ADM_COL_SPC_BT709;
+    
+    return true;
+}
+
+/**
+    \fn toneMap_RGB_ColorMatrix
+*/
+void ADMToneMapper::toneMap_RGB_ColorMatrix(int32_t * matrix, ADM_colorPrimaries colorPrim, ADM_colorSpace colorSpace, double * primaries, double * whitePoint)
+{
+    double pri[3][2];
+    double wp[2];
+
+    // defaults to BT2020:
+    pri[0][0] = 0.708; pri[0][1] = 0.292;
+    pri[1][0] = 0.170; pri[1][1] = 0.797;
+    pri[2][0] = 0.131; pri[2][1] = 0.046;
+    wp[0]=0.3127; wp[1]=0.3290;
+
+    if (colorPrim == ADM_COL_PRI_SMPTE431)	//DCI P3
+    {
+        pri[0][0] = 0.680; pri[0][1] = 0.320;
+        pri[1][0] = 0.265; pri[1][1] = 0.690;
+        pri[2][0] = 0.150; pri[2][1] = 0.060;
+        wp[0]=0.314; wp[1]=0.351;
+    }
+
+    if (colorPrim == ADM_COL_PRI_SMPTE432)	//Display P3
+    {
+        pri[0][0] = 0.680; pri[0][1] = 0.320;
+        pri[1][0] = 0.265; pri[1][1] = 0.690;
+        pri[2][0] = 0.150; pri[2][1] = 0.060;
+        wp[0]=0.3127; wp[1]=0.3290;
+    }
+
+    if (primaries)
+    {
+        bool all = true;
+        for (int j=0; j<3; j++)
+            for (int k=0;k<2; k++)
+                if (std::isnan(primaries[j*2+k]) || (fabs(primaries[j*2+k])<0.001))
+                {
+                    all = false;
+                    break;
+                }
+        if (all)
+            for (int j=0; j<3; j++)
+                for (int k=0;k<2; k++)
+                    pri[j][k] = primaries[j*2+k];
+    }
+
+    if (whitePoint)
+    {
+        if (!(std::isnan(whitePoint[0]) || std::isnan(whitePoint[1])) && (whitePoint[0] != 0) && (whitePoint[1] != 0))
+        {
+            wp[0] = whitePoint[0];
+            wp[1] = whitePoint[1];
+        }
+    }
+
+    double bt709mx[3][3] = {
+            { 3.2410, -1.5374, -0.4986},
+            {-0.9692,  1.8759,  0.0416},
+            { 0.0556, -0.2040,  1.0571},
+        };
+
+    if ((fabs(wp[0] - 0.3127) > 0.001) || (fabs(wp[1] - 0.3290) > 0.001))	// need white point adaptation
+    {
+        float bradford[3][3] = {
+            { 0.8951,  0.2664, -0.1614},
+            {-0.7502,  1.7135,  0.0367},
+            { 0.0389, -0.0685,  1.0296},
+        };
+        float bradfordInv[3][3] = {
+            { 0.9870, -0.1471,  0.1600},
+            { 0.4323,  0.5184,  0.0493},
+            {-0.0085,  0.0400,  0.9685},
+        };
+
+        float dps[3][3] = {{0}};
+        for (int i=0; i<3; i++)
+        {
+            dps[i][i] = (bradford[i][0]*0.9505 + bradford[i][1] + bradford[i][2]*1.0891) / (bradford[i][0]*(wp[0]/wp[1]) + bradford[i][1] + bradford[i][2]*((1.0-wp[0]-wp[1])/wp[1]));
+        }
+        float dpsb[3][3] = {{0}};
+        for (int j=0; j<3; j++)
+            for (int k=0;k<3; k++)
+                for (int l=0;l<3; l++)
+                    dpsb[j][k] += dps[j][l] * bradford[l][k];
+        float tmpbt709mx[3][3] = {{0}};
+        for (int j=0; j<3; j++)
+            for (int k=0;k<3; k++)
+                for (int l=0;l<3; l++)
+                    tmpbt709mx[j][k] += bt709mx[j][l] * bradfordInv[l][k];
+        for (int j=0; j<3; j++)
+            for (int k=0;k<3; k++)
+                bt709mx[j][k] = 0;
+        for (int j=0; j<3; j++)
+            for (int k=0;k<3; k++)
+                for (int l=0;l<3; l++)
+                    bt709mx[j][k] += tmpbt709mx[j][l] * dpsb[l][k];
+    }
+    
+    double X[3], Z[3], S[3];
+    for (int i=0; i<3; i++)
+    {
+        X[i] = pri[i][0] / pri[i][1];
+        Z[i] = (1.0 - pri[i][0] - pri[i][1]) / pri[i][1];
+    }
+    double smx[3][3];
+    for (int i=0; i<3; i++)
+    {
+        smx[0][i] = X[i];
+        smx[1][i] = 1.0;
+        smx[2][i] = Z[i];
+    }
+    // invert smx
+    double smxInv[3][3];
+    smxInv[0][0] =  (smx[1][1]*smx[2][2] - smx[2][1]*smx[1][2]);
+    smxInv[0][1] = -(smx[0][1]*smx[2][2] - smx[2][1]*smx[0][2]);
+    smxInv[0][2] =  (smx[0][1]*smx[1][2] - smx[1][1]*smx[0][2]);
+    smxInv[1][0] = -(smx[1][0]*smx[2][2] - smx[2][0]*smx[1][2]);
+    smxInv[1][1] =  (smx[0][0]*smx[2][2] - smx[2][0]*smx[0][2]);
+    smxInv[1][2] = -(smx[0][0]*smx[1][2] - smx[1][0]*smx[0][2]);
+    smxInv[2][0] =  (smx[1][0]*smx[2][1] - smx[2][0]*smx[1][1]);
+    smxInv[2][1] = -(smx[0][0]*smx[2][1] - smx[2][0]*smx[0][1]);
+    smxInv[2][2] =  (smx[0][0]*smx[1][1] - smx[1][0]*smx[0][1]);
+    double determinant = smx[0][0] * smxInv[0][0] + smx[1][0] * smxInv[0][1] + smx[2][0] * smxInv[0][2];
+    if (determinant != 0.0)
+        for (int j=0; j<3; j++)
+            for (int k=0;k<3; k++)
+                smxInv[j][k] /= determinant;
+
+    for (int i=0; i<3; i++)
+        S[i] = smxInv[i][0]*(wp[0]/wp[1]) + smxInv[i][1] + smxInv[i][2]*((1.0-wp[0]-wp[1])/wp[1]);
+    for (int i=0; i<3; i++)
+    {
+        smx[0][i] = S[i]*X[i];
+        smx[1][i] = S[i];
+        smx[2][i] = S[i]*Z[i];
+    }
+    
+    double fmx[3][3] = {{0}};
+    for (int j=0; j<3; j++)
+        for (int k=0;k<3; k++)
+            for (int l=0;l<3; l++)
+                fmx[j][k] += bt709mx[j][l] * smx[l][k];
+
+    for (int j=0; j<3; j++)
+        for (int k=0;k<3; k++)
+            matrix[j*3+k] = std::round(fmx[j][k]*4096);
+}
+
+
+
+/**
+    \fn toneMap_RGB_worker
+*/
+void * ADMToneMapper::toneMap_RGB_worker(void *argptr)
+{
+    RGB_worker_thread_arg * arg = (RGB_worker_thread_arg*)argptr;
+
+    int stride = ADM_IMAGE_ALIGN(arg->srcWidth);
+    uint8_t * sdrR, * sdrG, * sdrB;
+    uint16_t * hdrR, * hdrG, * hdrB;
+    int32_t linR,linG,linB,linccR,linccG,linccB;
+    int32_t oormask;
+    oormask = 0xFFFF;
+    oormask = ~oormask;
+
+    for (int y=arg->ystart; y<(arg->srcHeight); y+=arg->yincr)
+    {
+        sdrR = arg->sdrRGB[0] + y*stride;
+        sdrG = arg->sdrRGB[1] + y*stride;
+        sdrB = arg->sdrRGB[2] + y*stride;
+        hdrR = arg->hdrRGB[0] + y*stride;
+        hdrG = arg->hdrRGB[1] + y*stride;
+        hdrB = arg->hdrRGB[2] + y*stride;
+
+        for (int x=0; x<(arg->srcWidth); x++)
+        {
+            linR = arg->hdrRGBLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hdrR>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            linG = arg->hdrRGBLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hdrG>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            linB = arg->hdrRGBLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(*hdrB>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            hdrR++; hdrG++; hdrB++;
+            linccB = arg->ccmx[0]*linB + arg->ccmx[1]*linG + arg->ccmx[2]*linR;
+            linccG = arg->ccmx[3]*linB + arg->ccmx[4]*linG + arg->ccmx[5]*linR;
+            linccR = arg->ccmx[6]*linB + arg->ccmx[7]*linG + arg->ccmx[8]*linR;
+            linccR >>= 12;
+            linccG >>= 12;
+            linccB >>= 12;
+            if ((linccR&oormask) || (linccG&oormask) || (linccB&oormask))
+            {
+                int32_t min = (linccR < linccG) ? linccR : linccG;
+                min = (min < linccB) ? min : linccB;
+                if (min < 0)
+                {
+                    int32_t luma = 54*linccB+183*linccG+18*linccR;
+                    luma >>= 8;
+                    int32_t coeff = ((min-luma)==0) ? 256: min*256/(min-luma);
+                    int32_t icoeff = 256-coeff;
+                    int32_t lc = luma*coeff;
+                    linccR = icoeff*linccR + lc;
+                    linccR >>= 8;
+                    linccG = icoeff*linccG + lc;
+                    linccG >>= 8;
+                    linccB = icoeff*linccB + lc;
+                    linccB >>= 8;
+                }
+                int32_t max = (linccR > linccG) ? linccR : linccG;
+                max = (max > linccB) ? max : linccB;
+                if (max > 65535)
+                {
+                    int32_t coeff = (4096*65536)/max;
+                    linccR *= coeff;
+                    linccR >>= 12;
+                    linccG *= coeff;
+                    linccG >>= 12;
+                    linccB *= coeff;
+                    linccB >>= 12;
+                }
+                
+                linccR = (linccR < 0) ? 0 : ((linccR > 65535) ? 65535 : linccR);
+                linccG = (linccG < 0) ? 0 : ((linccG > 65535) ? 65535 : linccG);
+                linccB = (linccB < 0) ? 0 : ((linccB > 65535) ? 65535 : linccB);
+            }
+            *sdrR = arg->hdrGammaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(linccR>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            *sdrG = arg->hdrGammaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(linccG>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            *sdrB = arg->hdrGammaLUT[(ADM_COLORSPACE_HDR_LUT_SIZE-1)&(linccB>>(16-ADM_COLORSPACE_HDR_LUT_WIDTH))];
+            sdrR++; sdrG++; sdrB++;
+        }
+    }
+
+    pthread_exit(NULL);
+    return NULL;
+}
+
+/**
+    \fn toneMap_RGB
+*/
+bool ADMToneMapper::toneMap_RGB(ADMImage *sourceImage, ADMImage *destImage, unsigned int method, double targetLuminance, double saturationAdjust, double boostAdjust)
+{
+    // Check if tone mapping is needed & can do 
+    if (!((sourceImage->_colorTrc == ADM_COL_TRC_SMPTE2084) || (sourceImage->_colorTrc == ADM_COL_TRC_ARIB_STD_B67) || (sourceImage->_colorSpace == ADM_COL_SPC_BT2020_NCL) || (sourceImage->_colorSpace == ADM_COL_SPC_BT2020_CL)))
+        return false;
+    if ((sourceImage->_colorTrc == ADM_COL_TRC_BT2020_10) || (sourceImage->_colorTrc == ADM_COL_TRC_BT2020_12))	// excluding trc, not hdr
+        return false;
+    if (!std::isnan(sourceImage->_hdrInfo.colorSaturationWeight))
+        if (sourceImage->_hdrInfo.colorSaturationWeight > 0)
+            saturationAdjust *= sourceImage->_hdrInfo.colorSaturationWeight;
+    
+    // Determine max luminance
+    double maxLuminance = 10000.0;
+    if (!std::isnan(sourceImage->_hdrInfo.maxLuminance))
+        if (sourceImage->_hdrInfo.maxLuminance > 0)
+            if (maxLuminance > sourceImage->_hdrInfo.maxLuminance)
+                maxLuminance = sourceImage->_hdrInfo.maxLuminance;
+    if (!std::isnan(sourceImage->_hdrInfo.targetMaxLuminance))
+        if (sourceImage->_hdrInfo.targetMaxLuminance > 0)
+            if (maxLuminance > sourceImage->_hdrInfo.targetMaxLuminance)
+                maxLuminance = sourceImage->_hdrInfo.targetMaxLuminance;
+    if (sourceImage->_colorTrc == ADM_COL_TRC_ARIB_STD_B67)
+        if (maxLuminance == 10000.0)
+            maxLuminance=1000.0;
+    double peakLuminance = maxLuminance;
+    if (!std::isnan(sourceImage->_hdrInfo.maxCLL))
+        if (sourceImage->_hdrInfo.maxCLL > 0)
+            if (peakLuminance > sourceImage->_hdrInfo.maxCLL)
+                peakLuminance = sourceImage->_hdrInfo.maxCLL;
+    double boost = 1;
+    if ((!std::isnan(sourceImage->_hdrInfo.maxCLL)) && (!std::isnan(sourceImage->_hdrInfo.maxFALL)))
+        if ((sourceImage->_hdrInfo.maxCLL > 0) && (sourceImage->_hdrInfo.maxFALL > 0))
+            boost = sourceImage->_hdrInfo.maxCLL / sourceImage->_hdrInfo.maxFALL;
+    boost *= boostAdjust*boostAdjust;
+
+    // Allocate if not done yet
+    if (hdrRGBLUT == NULL)
+    {
+        hdrRGBLUT = new uint16_t[ADM_COLORSPACE_HDR_LUT_SIZE];
+    }
+    if (hdrGammaLUT == NULL)
+    {
+        hdrGammaLUT = new uint8_t[ADM_COLORSPACE_HDR_LUT_SIZE];
+    }
+    for (int i=0; i<3; i++)
+    {
+        if (hdrRGB[i] == NULL)
+        {
+            hdrRGB[i] = new uint16_t[ADM_IMAGE_ALIGN(dstWidth)*dstHeight];
+        }
+        if (sdrRGB[i] == NULL)
+        {
+            sdrRGB[i] = new uint8_t[ADM_IMAGE_ALIGN(dstWidth)*dstHeight];
+        }
+    }
+
+
+    // Populate LUTs if parameters have changed
+    bool extended_range = false;
+    if ((maxLuminance != hdrTMsrcLum) || (targetLuminance != hdrTMtrgtLum) || (saturationAdjust != hdrTMsat) || (boost != hdrTMboost))
+    {
+        hdrTMsrcLum = maxLuminance;
+        hdrTMtrgtLum = targetLuminance;
+        hdrTMsat = saturationAdjust;
+        hdrTMboost = boost;
+        
+        for (int l=0; l<ADM_COLORSPACE_HDR_LUT_SIZE; l+=1)
+        {
+            double LumHDR = maxLuminance;	// peak mastering display luminance [nit]
+            double LumSDR = targetLuminance;		// peak target display luminance [nit]
+
+            double Y = l;
+            // normalize:
+            Y /= ADM_COLORSPACE_HDR_LUT_SIZE;
+            
+            double Ylin;
+            // linearize
+            if (sourceImage->_colorTrc == ADM_COL_TRC_ARIB_STD_B67)	//HLG
+            {
+                if (Y <= 0.5)
+                    Ylin = Y*Y/3.0;
+                else
+                    Ylin = (std::exp((Y-0.55991073)/0.17883277) + 0.28466892)/12;
+            } else
+            if ((sourceImage->_colorTrc == ADM_COL_TRC_SMPTE2084) || (sourceImage->_colorSpace == ADM_COL_SPC_BT2020_NCL) || (sourceImage->_colorSpace == ADM_COL_SPC_BT2020_CL))	//PQ
+            {
+                Ylin = 0;
+                if ((std::pow(Y, 1/78.84375) - 0.8359375) > 0)
+                    Ylin = std::pow((std::pow(Y, 1/78.84375) - 0.8359375) / (18.8515625 - 18.6875*std::pow(Y, 1/78.84375)) , 1/0.1593017578125);
+            } else {
+                Ylin = std::pow(Y, 2.6);
+            }
+            
+            Ylin *= LumHDR/LumSDR;
+            double npl = peakLuminance/LumSDR;
+            
+            double Ytm = Ylin;
+            // tonemap
+            switch (method)
+            {
+                default:
+                case 2:	// clip
+                        Ytm *= std::sqrt(boost);
+                        if (Ytm > 1.0)
+                            Ytm = 1.0;
+                    break;
+                case 3:	// reinhard
+                        Ytm *= std::sqrt(boost);
+                        Ytm = Ytm/(1.0+Ytm);
+                        Ytm *= (npl+1)/npl;
+                    break;
+                case 4:	// hable
+                        Ytm *= boost;
+                        Ytm = (Ytm * (Ytm * 0.15 + 0.50 * 0.10) + 0.20 * 0.02) / (Ytm * (Ytm * 0.15 + 0.50) + 0.20 * 0.30) - 0.02 / 0.30;
+                        Ytm /= (npl * (npl * 0.15 + 0.50 * 0.10) + 0.20 * 0.02) / (npl * (npl * 0.15 + 0.50) + 0.20 * 0.30) - 0.02 / 0.30;
+                    break;
+            }
+            
+            if (Ytm < 0)
+                Ytm = 0;
+            if (Ytm > 1)
+                Ytm = 1;
+            hdrRGBLUT[l] = std::round(65535.0*Ytm);
+            
+            // gamma
+            double Ygamma;
+            Ygamma = ((Y > 0.0031308) ? (( 1.055 * std::pow(Y, (1.0 / 2.4)) ) - 0.055) : (Y * 12.92));
+            hdrGammaLUT[l] = std::round(255.0*Ygamma);
+        }
+        
+        for (int l=0; l<256; l+=1)
+        {
+            double C = l;
+            C -= 128;
+            C *= saturationAdjust;
+            C += 128;
+            if (C < 0)
+                C = 0;
+            if (C > 255)
+                C = 255;
+            sdrRGBSat[l] = std::round(C);
+        }
+    }
+
+    // Do tone mapping
+    uint8_t * srcData[3];
+    int srcStride[3];
+    uint8_t * dstData[3];
+    int dstStride[3];
+    
+    sourceImage->GetPitches(srcStride);
+    destImage->GetPitches(dstStride);
+    sourceImage->GetReadPlanes(srcData);
+    destImage->GetWritePlanes(dstData);
+    
+    // ADM_PIXFRMT_YV12 swapped UV
+    uint8_t *p=dstData[1];
+    dstData[1]=dstData[2];
+    dstData[2]=p;
+    
+    uint8_t *gbrData[3];
+    int gbrStride[3];
+
+    for (int p=0; p<3; p++)
+    {
+        gbrData[p] = (uint8_t*)hdrRGB[p];
+        gbrStride[p] = ADM_IMAGE_ALIGN(srcWidth)*2;
+    }
+    sws_scale(CONTEXTRGB1,srcData,srcStride,0,srcHeight,gbrData,gbrStride);
+
+    int32_t ccmx[9];
+    toneMap_RGB_ColorMatrix(ccmx, sourceImage->_colorPrim, sourceImage->_colorSpace, &(sourceImage->_hdrInfo.primaries[0][0]), sourceImage->_hdrInfo.whitePoint);
+
+    for (int tr=0; tr<threadCount; tr++)
+    {
+        RGB_worker_thread_args[tr].srcWidth = srcWidth;
+        RGB_worker_thread_args[tr].srcHeight = srcHeight;
+        RGB_worker_thread_args[tr].ystart = tr;
+        RGB_worker_thread_args[tr].yincr = threadCount;
+        for (int i=0; i<3; i++)
+        {
+            RGB_worker_thread_args[tr].hdrRGB[i] = hdrRGB[i];
+            RGB_worker_thread_args[tr].sdrRGB[i] = sdrRGB[i];
+        }
+        RGB_worker_thread_args[tr].hdrRGBLUT = hdrRGBLUT;
+        RGB_worker_thread_args[tr].ccmx = ccmx;
+        RGB_worker_thread_args[tr].hdrGammaLUT = hdrGammaLUT;
+    }
+    for (int tr=0; tr<threadCount; tr++)
+    {
+        pthread_create( &worker_threads[tr], NULL, toneMap_RGB_worker, (void*) &RGB_worker_thread_args[tr]);
+    }
+    // work in thread workers...
+    for (int tr=0; tr<threadCount; tr++)
+    {
+        pthread_join( worker_threads[tr], NULL);
+    }
+
+    for (int p=0; p<3; p++)
+    {
+        gbrData[p] = (uint8_t*)sdrRGB[p];
+        gbrStride[p] = ADM_IMAGE_ALIGN(srcWidth);
+    }
+    sws_scale(CONTEXTRGB2,gbrData,gbrStride,0,srcHeight,dstData,dstStride);
+
+    // dst is YUV420
+    for (int p=1; p<3; p++)
+    {
+        uint8_t * ptr = dstData[p];
+        for (int q=0; q<(dstStride[p] * dstHeight/2); q++)
+        {
+            *ptr = sdrRGBSat[*ptr];
+            ptr++;
+        }
+    }
+
+    // Reset output color properties
+    destImage->_pixfrmt=ADM_PIXFRMT_YV12;
+    destImage->_range=ADM_COL_RANGE_MPEG;
+    destImage->_colorPrim=ADM_COL_PRI_BT709;
+    destImage->_colorTrc=ADM_COL_TRC_BT709;
+    destImage->_colorSpace=ADM_COL_SPC_BT709;
+    
+    return true;
+
+}
+//EOF

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImage/src/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImage/src/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreImageLoader/src/ADM_imageLoader.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxer.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxer.h Changed

@@ -79,16 +79,18 @@
                 uint64_t videoIncrement; // Used/set by initUI
                 uint64_t videoDuration;
                 DIA_encodingBase *encoding;
+                std::string outputFileName;
 
 public:
-                          ADM_muxer() {vStream=NULL;aStreams=NULL;nbAStreams=0;encoding=NULL;};
-        virtual           ~ADM_muxer() {closeUI();};
+                          ADM_muxer() {vStream=NULL;aStreams=NULL;nbAStreams=0;encoding=NULL;}
+        virtual           ~ADM_muxer() {closeUI();}
         virtual bool      open(const char *filename,   ADM_videoStream *videoStream,
                                 uint32_t nbAudioTrack, ADM_audioStream **audioStreams)=0;
 
         virtual  bool     save(void)=0;
         virtual  bool     close(void)=0; 
         virtual  DIA_encodingBase *getEncoding(void) { return encoding; };
+        virtual  void     setOutputFileName(const char * fn) { outputFileName = fn; }
         virtual  bool     initUI(const char *title);
         virtual  bool     createUI(uint64_t duration);
         virtual  bool     updateUI(void);

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxerInternal.h Changed

@@ -37,6 +37,7 @@
         bool  (*getConfiguration)(CONFcouple **conf);
         bool  (*resetConfiguration)();
         bool  (*setConfiguration)(CONFcouple *conf);
+        void  (*clearDefaultConfig)(void);
 
         ADM_dynMuxer(const char *file) : ADM_LibWrapper()
         {
@@ -48,7 +49,7 @@
 
 
 
-			initialised = (loadLibrary(file) && getSymbols(8+4,
+			initialised = (loadLibrary(file) && getSymbols(8+5,
 				&createmuxer, "create",
 				&deletemuxer, "destroy",
 				&getMuxerName, "getName",
@@ -60,7 +61,8 @@
                 &setConfiguration,"setConfiguration",
                 &getConfiguration,"getConfiguration",
 				&resetConfiguration,"resetConfiguration",
-                &getDefaultExtension,"getDefaultExtension"
+                &getDefaultExtension,"getDefaultExtension",
+                &clearDefaultConfig,"clearDefaultConfig"
                 ));
                 if(initialised)
                 {
@@ -75,6 +77,7 @@
                     printf("[Muxer]Symbol loading failed for %s\n",file);
                 }
         }
+        virtual ~ADM_dynMuxer() { if(initialised) clearDefaultConfig(); }
 };
 
 #define ADM_MUXER_BEGIN( Ext,Class,maj,mn,pat,name,desc,displayName,configureFunc,confTemplate,confVar,confSize) \
@@ -98,6 +101,7 @@
 ADM_PLUGIN_EXPORT const char  *getDescriptor(void) {return desc;} \
 ADM_PLUGIN_EXPORT const char  *getDisplayName(void) { return displayName;} \
 ADM_PLUGIN_EXPORT const char  *getDefaultExtension(void) { return Ext;} \
+ADM_PLUGIN_EXPORT void        clearDefaultConfig(void) { ADM_dealloc(defaultConfig); defaultConfig = NULL; } \
 ADM_PLUGIN_EXPORT bool        getConfiguration(CONFcouple **conf) \
 {\
          if(confTemplate==NULL) {*conf=NULL;return true;} \

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_coreMuxerFfmpeg.cpp Changed

@@ -20,6 +20,7 @@
 #include "ADM_default.h"
 #include "ADM_vidMisc.h"
 #include "fourcc.h"
+#include "ADM_rgb.h"
 #include "ADM_coreMuxerFfmpeg.h"
 #include "ADM_muxerUtils.h"
 #include "ADM_coreCodecMapping.h"
@@ -107,7 +108,7 @@
         audio_st[i]=NULL;
     }
     video_st=NULL;
-    return !res;
+    return res >= 0;
 }
 /**
     \fn muxerFFmpeg
@@ -183,7 +184,7 @@
         par->sample_aspect_ratio.num=1;
         par->sample_aspect_ratio.den=1;
         video_st->sample_aspect_ratio=par->sample_aspect_ratio;
-        par->bit_rate=9000*1000;
+        //par->bit_rate=9000*1000;
         par->codec_type = AVMEDIA_TYPE_VIDEO;
         par->width = stream->getWidth();
         par->height =stream->getHeight();
@@ -192,10 +193,10 @@
         uint32_t r,p,t,m;
         if(stream->getColorInfo(&r,&p,&t,&m))
         {
-            par->color_range = (AVColorRange)r;
-            par->color_primaries = (AVColorPrimaries)p;
-            par->color_trc = (AVColorTransferCharacteristic)t;
-            par->color_space = (AVColorSpace)m;
+            par->color_range = (AVColorRange) validateColorRange(r);
+            par->color_primaries = (AVColorPrimaries) validateColorPrimaries(p);
+            par->color_trc = (AVColorTransferCharacteristic) validateColorTrC(t);
+            par->color_space = (AVColorSpace) validateColorSpace(m);
         }
         }
 
@@ -418,6 +419,7 @@
                                   par->codec_id = AV_CODEC_ID_AAC;
                                   par->frame_size=audio[i]->getSamplesPerPacket();
                                   break;
+                  case WAV_TRUEHD: par->codec_id = AV_CODEC_ID_TRUEHD; par->frame_size = 40; break;
                   default:
                                  printf("[FF]: Unsupported audio\n");
                                  return false;

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_dynaMuxer.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreScript/include/IScriptWriter.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreScript/include/IScriptWriter.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreScript/src/ADM_scriptDialogFactory.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreScript/src/ADM_scriptDialogFactory.cpp Changed

@@ -36,6 +36,7 @@
 diaElem** ADM_scriptDialogFactoryHelper::getControls(int *controlCount)
 {
 	*controlCount = (int)_controls.size();
+	if (! *controlCount) return NULL;
 
 	std::vector<ADM_scriptDFBaseHelper*>::iterator it;
 	int i = 0;
@@ -55,22 +56,23 @@
 */
 int  ADM_scriptDialogFactoryHelper::run(void)
 {
-	int nb = (int)_controls.size();
+    diaElem **elems = NULL;
+    uint32_t nb = _controls.size();
+
+    if (nb)
+    {
+        elems = new diaElem*[nb];
+        int i = 0;
+        std::vector<ADM_scriptDFBaseHelper*>::iterator it;
+        for (it = _controls.begin(); it != _controls.end(); it++)
+            elems[i++] = (*it)->getControl();
+    }
 
-	std::vector<ADM_scriptDFBaseHelper*>::iterator it;
-	int i = 0;
-	diaElem **elems = new diaElem*[nb];
-
-	for (it = _controls.begin(); it != _controls.end(); it++)
-	{
-		elems[i] = (*it)->getControl();
-		i++;
-	}
     int ret = diaFactoryRun(_title, nb, elems);
 
-	delete [] elems;
+    delete [] elems;
 
-	return ret;
+    return ret;
 
 }
 const char* ADM_scriptDialogFactoryHelper::title(void)

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreSocket/include/ADM_coreSocket.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUI/include/DIA_coreUI_internal.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUI/include/DIA_encoding.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUI/include/DIA_encoding.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUI/include/DIA_factory.h Changed

@@ -31,6 +31,7 @@
   ELEM_TOGGLE,
   ELEM_INTEGER,
   ELEM_FLOAT,
+  ELEM_FLOAT_RESETTABLE,
   ELEM_MENU,
   ELEM_FILE_READ,
   ELEM_BITRATE,
@@ -84,7 +85,7 @@
   virtual int getRequiredLayout(void)=0;
 };
 /*********************************************/
-#define MENU_MAX_lINK 10
+#define MENU_MAX_lINK 16
 typedef struct dialElemLink
 {
   uint32_t  value;
@@ -318,6 +319,26 @@
   void      enable(uint32_t onoff) ;
   int getRequiredLayout(void);
 };
+/*********************************************/
+typedef diaElem *(CREATE_FLOAT_RESETTABLE_T)(ELEM_TYPE_FLOAT *value, const char *toggleTitle,
+    ELEM_TYPE_FLOAT min, ELEM_TYPE_FLOAT max, ELEM_TYPE_FLOAT reset,
+    const char *tip, int decimals);
+class ADM_COREUI6_EXPORT diaElemFloatResettable : public diaElem
+{
+protected:
+    int decimals;
+
+public:
+    ELEM_TYPE_FLOAT min,max,reset;
+    diaElemFloatResettable(ELEM_TYPE_FLOAT *value, const char *toggleTitle,
+        ELEM_TYPE_FLOAT min, ELEM_TYPE_FLOAT max, ELEM_TYPE_FLOAT reset,
+        const char *tip=NULL, int decimals = 2);
+    virtual ~diaElemFloatResettable() ;
+    void setMe(void *dialog, void *opaque, uint32_t line);
+    void getMe(void);
+    void enable(uint32_t onoff);
+    int getRequiredLayout(void);
+};
 /*************************************************/
 class diaMenuEntry
 {

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUI/src/DIA_factory.cpp Changed

@@ -115,7 +115,7 @@
 DIA_MKSTUBS(diaElemTimeStamp)
 
 
-// ****************** Buttons ********************
+// ****************** Float ********************
 diaElemFloat ::diaElemFloat(ELEM_TYPE_FLOAT *intValue,const char *toggleTitle, ELEM_TYPE_FLOAT min,
         ELEM_TYPE_FLOAT max,const char *tip, int decimals) :diaElem(ELEM_FLOAT)
 {
@@ -134,6 +134,26 @@
 		internalPointer->enable(onoff); 
 	}
 DIA_MKSTUBS(diaElemFloat)
+// ************ Float resettable **************
+diaElemFloatResettable::diaElemFloatResettable(ELEM_TYPE_FLOAT *value, const char *title,
+    ELEM_TYPE_FLOAT min, ELEM_TYPE_FLOAT max, ELEM_TYPE_FLOAT reset, const char *tip, int decimals)
+    : diaElem(ELEM_FLOAT_RESETTABLE)
+{
+    ADM_assert(Factory);
+    internalPointer = Factory->CreateFloatResettable(value,title,min,max,reset,tip,decimals);
+}
+diaElemFloatResettable::~diaElemFloatResettable()
+{
+    ADM_assert(Factory);
+    Factory->DestroyFloatResettable(internalPointer);
+    internalPointer=NULL;
+}
+void diaElemFloatResettable::enable(uint32_t onoff)
+    {
+        ADM_assert(internalPointer);
+        internalPointer->enable(onoff);
+    }
+DIA_MKSTUBS(diaElemFloatResettable)
 // ****************** Integer ********************
 diaElemInteger ::diaElemInteger(int32_t *intValue,const char *toggleTitle, int32_t min, int32_t max,const char *tip) :
 	diaElem(ELEM_INTEGER)

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_coreJson.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_coreJson.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h Changed

@@ -7,6 +7,7 @@
 FEATURES_THREADING_LAVC, 	//uint32_t
 FEATURES_CPU_CAPS, 	//uint32_t
 FEATURES_CACHE_SIZE, 	//uint32_t
+FEATURES_SHARED_CACHE, 	//bool
 FEATURES_MPEG_NO_LIMIT, 	//bool
 FEATURES_DXVA2, 	//bool
 FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION, 	//bool
@@ -24,6 +25,8 @@
 KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS, 	//bool
 KEYBOARD_SHORTCUTS_ALT_MARK_A, 	//string
 KEYBOARD_SHORTCUTS_ALT_MARK_B, 	//string
+KEYBOARD_SHORTCUTS_ALT_RESET_MARK_A, 	//string
+KEYBOARD_SHORTCUTS_ALT_RESET_MARK_B, 	//string
 KEYBOARD_SHORTCUTS_ALT_RESET_MARKERS, 	//string
 KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_A, 	//string
 KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_B, 	//string
@@ -58,7 +61,11 @@
 DEFAULT_WARN_FOR_FONTS, 	//bool
 DEFAULT_MULTILOAD_USE_CUSTOM_SIZE, 	//bool
 DEFAULT_MULTILOAD_CUSTOM_SIZE_M, 	//uint32_t
+DEFAULT_DELETE_FIRST_PASS_LOG_FILES, 	//bool
 AVISYNTH_AVISYNTH_ALWAYS_ASK, 	//bool
 AVISYNTH_AVISYNTH_DEFAULTPORT, 	//uint32_t
 AVISYNTH_AVISYNTH_LOCALPORT, 	//uint32_t
 RESET_ENCODER_ON_VIDEO_LOAD, 	//bool
+LOAD_PICTURES_REVERSE_ORDER, 	//bool
+HDR_TONEMAPPING, 	//uint32_t
+HDR_TARGET_LUMINANCE, 	//float

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_coreCodecMapping.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp Changed

@@ -441,7 +441,7 @@
             *flags=AVI_P_FRAME;
             break;
         case 2:
-            *flags=AVI_KEY_FRAME; // intra
+            *flags = keyframe ? AVI_KEY_FRAME : AVI_P_FRAME; // non-keyframe intra
             break;
         default:
             ADM_warning("Unknown slice type %d\n",sliceType);
@@ -572,7 +572,7 @@
                 return decodeSliceHeaderH265(head, head+length, flags, spsinfo, poc);
             }
             default:
-                ADM_info("Skipping NALU of type %d (%s)\n",nalType,nalTypeToString(nalType));
+                //ADM_info("Skipping NALU of type %d (%s)\n",nalType,nalTypeToString(nalType));
                 break;
         }
         head+=length;
@@ -652,7 +652,7 @@
                 return decodeSliceHeaderH265(buffer, buffer+length, flags, spsinfo, poc);
             }
             default:
-                ADM_info("Skipping NALU of type %d (%s)\n",nalType,nalTypeToString(nalType));
+                //ADM_info("Skipping NALU of type %d (%s)\n",nalType,nalTypeToString(nalType));
                 break;
         }
         buffer = head;

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_iso639.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_json.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_json.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_paramList.cpp Changed

@@ -245,32 +245,48 @@
 }
 /**
     \fn ADM_paramValidatePartialList
-    \brief In that case couples is a sublist of params
+    \brief Return true if couples and params have some intersection
 */
 bool ADM_paramValidatePartialList(CONFcouple *couples, const    ADM_paramList *params)
 {
     int n=couples->getSize();
     int p=XgetParamSize(params);
-    if(n>p)
-    {
-        ADM_warning("Too many parameters in partial list\n");
-        return false;
-    }
     int found=0;
     for(int i=0;i<p;i++)
     {
         const char *name=params[i].paramName;
         if(true==couples->exist(name))
-        {
             found++;
-        }else
+        else
+            ADM_warning("Parameter \"%s\" not found in couples.\n",name);
+    }
+    if(!found)
+        return false; // no intersection
+    if(found==n)
+        return true;
+    int unmatched = 0;
+    for(int i=0;i<n;i++)
+    {
+        bool present = false;
+        char *key,*val;
+        couples->getInternalName(i,&key,&val);
+        for(int j=0;j<p;j++)
         {
-                ADM_warning("\tParam : <%s> not found\n",name);
+            const char *name = params[j].paramName;
+            if(!strcmp(key,name))
+            {
+                present = true;
+                break;
+            }
+        }
+        if(!present)
+        {
+            ADM_warning("Couple name \"%s\" absent in parameter list.\n",key);
+            unmatched++;
         }
     }
-    if(found==n) return true;
-    ADM_warning("Some parameters are not in the parameter list, typo ?(%d vs %d)\n",(int)found,(int)n);
-    return false;;
+    ADM_warning("Found %d/%d params, unmatched couples: %d/%d\n",found,p,unmatched,n);
+    return true;
 }
 
 /**
@@ -376,8 +392,18 @@
 {
     if(!couples && !params)
     {
-          ADM_warning("Empty parameter list\n");
-          return true;
+        ADM_warning("No couples and empty parameter list\n");
+        return true; // ??
+    }
+    if(!couples)
+    {
+        ADM_warning("No couples\n");
+        return false;
+    }
+    if(!params)
+    {
+        ADM_warning("No parameter list\n");
+        return false;
     }
     if(false==ADM_paramValidate(couples,params)) return false;
     return ADM_paramLoadInternal(false,couples,params,s);
@@ -390,10 +416,26 @@
 
 bool ADM_paramLoadPartial(CONFcouple *couples, const ADM_paramList *params,void *s)
 {
-   // don't reject too long or incomplete param lists, this does more harm than good
-   // e.g. on version update, but warnings are nice
-   ADM_paramValidatePartialList(couples,params);
-   return ADM_paramLoadInternal(true,couples,params,s);
+    if(!couples && !params)
+    {
+        ADM_warning("No couples and empty parameter list\n");
+        return true; // ??
+    }
+    if(!couples)
+    {
+        ADM_warning("No couples\n");
+        return false;
+    }
+    if(!params)
+    {
+        ADM_warning("No parameter list\n");
+        return false;
+    }
+    // don't reject too long or incomplete param lists, this does more harm than good
+    // e.g. on version update, but warnings are nice
+    if(ADM_paramValidatePartialList(couples,params))
+        return ADM_paramLoadInternal(true,couples,params,s);
+    return false;
 }
 /**
     \fn ADM_paramSave

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_threadQueue.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_threadQueue.cpp Changed

@@ -30,7 +30,8 @@
 ADM_threadQueue::ADM_threadQueue(void)
 {
     mutex=new admMutex("audioAccess");
-    cond=new admCond(mutex);
+    producerCond=new admCond(mutex);
+    consumerCond=new admCond(mutex);
     threadState=RunStateIdle;
     started=false;
 }
@@ -51,9 +52,9 @@
         {
             ADM_info("Asking the thread to stop\n");
             threadState=RunStateStopOrder;
-            if(cond->iswaiting())
+            if(producerCond->iswaiting())
             {
-                cond->wakeup();
+                producerCond->wakeup();
             }
             mutex->unlock();
             int count=100;
@@ -67,9 +68,11 @@
         pthread_join(myThread, &ret);
     }
     
-    if(cond) delete cond;
+    if(producerCond) delete producerCond;
+    if(consumerCond) delete consumerCond;
     if(mutex) delete mutex;
-    cond=NULL;
+    producerCond=NULL;
+    consumerCond=NULL;
     mutex=NULL;
 }
 
@@ -82,29 +85,59 @@
 
     threadState=RunStateRunning;
     runAction();
+
+    // wait til consumer done
+    if (threadState != RunStateStopOrder) do
+    {
+        bool done=false;
+        mutex->lock();
+        if (consumerCond->iswaiting())
+            consumerCond->wakeup();
+        if(!list.size())
+            done = true;
+        mutex->unlock();
+        if (done)
+            break;
+        ADM_usleep(1*1000); // wait 1 ms        
+    } while(1);
+    
     threadState=RunStateStopped;
+
+    // wait til consumer exit
+    do {
+        bool done=false;
+        mutex->lock();
+        if (consumerCond->iswaiting())
+            consumerCond->wakeup();
+        else
+            done = true;
+        mutex->unlock();
+        ADM_usleep(1*1000); // wait 1 ms        
+        if (done)
+            break;
+    } while(1);
 }
 /**
     \fn startThread
 */
 bool ADM_threadQueue::startThread(void)
 {
-      ADM_info("Starting thread...\n");
-      pthread_attr_t attr;
-      pthread_attr_init(&attr);
-      pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
-        if(pthread_create(&myThread,&attr, boomerang, this))
-        {
-            ADM_error("ERROR CREATING THREAD\n");
-            ADM_assert(0);
-        }
-        while(threadState==RunStateIdle)
-        {
-            ADM_usleep(10000);
-        }
-        ADM_info("Thread created and started\n");
-        started=true;
-        return true;
+    ADM_info("Starting thread...\n");
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+    if(pthread_create(&myThread,&attr, boomerang, this))
+    {
+        ADM_error("ERROR CREATING THREAD\n");
+        ADM_assert(0);
+    }
+    while(threadState==RunStateIdle)
+    {
+        ADM_usleep(10000);
+    }
+    ADM_info("Thread created and started\n");
+    started=true;
+    return true;
 }
 
 /**
@@ -112,33 +145,34 @@
 */
 bool ADM_threadQueue::stopThread(void)
 {
-        ADM_info("Destroying threadQueue\n");
-        mutex->lock();
-
-        if(threadState==RunStateRunning)
-        {
-            threadState=RunStateStopOrder;
+    ADM_info("Destroying threadQueue\n");
+    mutex->lock();
 
-            if(cond->iswaiting())
-            {
-                cond->wakeup();
-            }
+    if(threadState==RunStateRunning)
+    {
+        threadState=RunStateStopOrder;
 
-            mutex->unlock();
+        if(producerCond->iswaiting())
+        {
+            producerCond->wakeup();
+        }
 
-			int clockDown=10;
+        mutex->unlock();
 
-            while(threadState!=RunStateStopped && clockDown)
-            {
-                ADM_usleep(50*1000);
-                clockDown--;
-            };
+        int clockDown=10;
 
-            ADM_info("Thread stopped, continuing dtor\n");
-        }else
+        while(threadState!=RunStateStopped && clockDown)
         {
-                mutex->unlock();
-        }
-        return true;
+            ADM_usleep(50*1000);
+            clockDown--;
+        };
+
+        ADM_info("Thread stopped, continuing dtor\n");
+    }
+    else
+    {
+            mutex->unlock();
+    }
+    return true;
 }
 // EOF

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf Changed

@@ -25,6 +25,7 @@
 uint32_t:threading_lavc,               0,      0,     32
 uint32_t:cpu_caps,            4294967295,      0, 4294967295
 uint32_t:cache_size,                  16,      8,     16
+bool:shared_cache,                     0,      0,      1
 bool:mpeg_no_limit,                    0,      0,      1
 bool:dxva2,                            0,      0,      1
 bool:dxva2_override_blacklist_version, 0,      0,      1
@@ -45,6 +46,8 @@
 bool:swap_up_down_keys,                0,      0,      1
 string:alt_mark_a,                     "I"
 string:alt_mark_b,                     "O"
+string:alt_reset_mark_a,               "U"
+string:alt_reset_mark_b,               "P"
 string:alt_reset_markers,              "R"
 string:alt_goto_mark_a,                "A"
 string:alt_goto_mark_b,                "B"
@@ -98,6 +101,7 @@
 bool:warn_for_fonts,                   1,      0,      1
 bool:multiload_use_custom_size,        0,      0,      1
 uint32_t:multiload_custom_size_m,   4000,    250,   8192
+bool:delete_first_pass_log_files,      0,      0,      1
 }
 #
 avisynth{
@@ -107,6 +111,12 @@
 }
 #
 bool:reset_encoder_on_video_load,      0,      0,      1
+bool:load_pictures_reverse_order,      0,      0,      1
+#
+hdr{
+uint32_t:tonemapping,                  1,      0,     99
+float:target_luminance,            100.0,    0.0, 1000.0
+}
 #
 }
 #

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp Changed

@@ -9,6 +9,7 @@
  {"features.threading_lavc",offsetof(my_prefs_struct,features.threading_lavc),"uint32_t",ADM_param_uint32_t},
  {"features.cpu_caps",offsetof(my_prefs_struct,features.cpu_caps),"uint32_t",ADM_param_uint32_t},
  {"features.cache_size",offsetof(my_prefs_struct,features.cache_size),"uint32_t",ADM_param_uint32_t},
+ {"features.shared_cache",offsetof(my_prefs_struct,features.shared_cache),"bool",ADM_param_bool},
  {"features.mpeg_no_limit",offsetof(my_prefs_struct,features.mpeg_no_limit),"bool",ADM_param_bool},
  {"features.dxva2",offsetof(my_prefs_struct,features.dxva2),"bool",ADM_param_bool},
  {"features.dxva2_override_blacklist_version",offsetof(my_prefs_struct,features.dxva2_override_blacklist_version),"bool",ADM_param_bool},
@@ -26,6 +27,8 @@
  {"keyboard_shortcuts.swap_up_down_keys",offsetof(my_prefs_struct,keyboard_shortcuts.swap_up_down_keys),"bool",ADM_param_bool},
  {"keyboard_shortcuts.alt_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_mark_a),"std::string",ADM_param_stdstring},
  {"keyboard_shortcuts.alt_mark_b",offsetof(my_prefs_struct,keyboard_shortcuts.alt_mark_b),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_reset_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_reset_mark_a),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_reset_mark_b",offsetof(my_prefs_struct,keyboard_shortcuts.alt_reset_mark_b),"std::string",ADM_param_stdstring},
  {"keyboard_shortcuts.alt_reset_markers",offsetof(my_prefs_struct,keyboard_shortcuts.alt_reset_markers),"std::string",ADM_param_stdstring},
  {"keyboard_shortcuts.alt_goto_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_goto_mark_a),"std::string",ADM_param_stdstring},
  {"keyboard_shortcuts.alt_goto_mark_b",offsetof(my_prefs_struct,keyboard_shortcuts.alt_goto_mark_b),"std::string",ADM_param_stdstring},
@@ -60,9 +63,13 @@
  {"Default.warn_for_fonts",offsetof(my_prefs_struct,Default.warn_for_fonts),"bool",ADM_param_bool},
  {"Default.multiload_use_custom_size",offsetof(my_prefs_struct,Default.multiload_use_custom_size),"bool",ADM_param_bool},
  {"Default.multiload_custom_size_m",offsetof(my_prefs_struct,Default.multiload_custom_size_m),"uint32_t",ADM_param_uint32_t},
+ {"Default.delete_first_pass_log_files",offsetof(my_prefs_struct,Default.delete_first_pass_log_files),"bool",ADM_param_bool},
  {"avisynth.avisynth_always_ask",offsetof(my_prefs_struct,avisynth.avisynth_always_ask),"bool",ADM_param_bool},
  {"avisynth.avisynth_defaultport",offsetof(my_prefs_struct,avisynth.avisynth_defaultport),"uint32_t",ADM_param_uint32_t},
  {"avisynth.avisynth_localport",offsetof(my_prefs_struct,avisynth.avisynth_localport),"uint32_t",ADM_param_uint32_t},
  {"reset_encoder_on_video_load",offsetof(my_prefs_struct,reset_encoder_on_video_load),"bool",ADM_param_bool},
+ {"load_pictures_reverse_order",offsetof(my_prefs_struct,load_pictures_reverse_order),"bool",ADM_param_bool},
+ {"hdr.tonemapping",offsetof(my_prefs_struct,hdr.tonemapping),"uint32_t",ADM_param_uint32_t},
+ {"hdr.target_luminance",offsetof(my_prefs_struct,hdr.target_luminance),"float",ADM_param_float},
 {NULL,0,NULL}
 };

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp Changed

@@ -17,6 +17,7 @@
 json.addUint32("threading_lavc",key->features.threading_lavc);
 json.addUint32("cpu_caps",key->features.cpu_caps);
 json.addUint32("cache_size",key->features.cache_size);
+json.addBool("shared_cache",key->features.shared_cache);
 json.addBool("mpeg_no_limit",key->features.mpeg_no_limit);
 json.addBool("dxva2",key->features.dxva2);
 json.addBool("dxva2_override_blacklist_version",key->features.dxva2_override_blacklist_version);
@@ -36,6 +37,8 @@
 json.addBool("swap_up_down_keys",key->keyboard_shortcuts.swap_up_down_keys);
 json.addString("alt_mark_a",key->keyboard_shortcuts.alt_mark_a);
 json.addString("alt_mark_b",key->keyboard_shortcuts.alt_mark_b);
+json.addString("alt_reset_mark_a",key->keyboard_shortcuts.alt_reset_mark_a);
+json.addString("alt_reset_mark_b",key->keyboard_shortcuts.alt_reset_mark_b);
 json.addString("alt_reset_markers",key->keyboard_shortcuts.alt_reset_markers);
 json.addString("alt_goto_mark_a",key->keyboard_shortcuts.alt_goto_mark_a);
 json.addString("alt_goto_mark_b",key->keyboard_shortcuts.alt_goto_mark_b);
@@ -82,6 +85,7 @@
 json.addBool("warn_for_fonts",key->Default.warn_for_fonts);
 json.addBool("multiload_use_custom_size",key->Default.multiload_use_custom_size);
 json.addUint32("multiload_custom_size_m",key->Default.multiload_custom_size_m);
+json.addBool("delete_first_pass_log_files",key->Default.delete_first_pass_log_files);
 json.endNode();
 json.addNode("avisynth");
 json.addBool("avisynth_always_ask",key->avisynth.avisynth_always_ask);
@@ -89,6 +93,11 @@
 json.addUint32("avisynth_localport",key->avisynth.avisynth_localport);
 json.endNode();
 json.addBool("reset_encoder_on_video_load",key->reset_encoder_on_video_load);
+json.addBool("load_pictures_reverse_order",key->load_pictures_reverse_order);
+json.addNode("hdr");
+json.addUint32("tonemapping",key->hdr.tonemapping);
+json.addFloat("target_luminance",key->hdr.target_luminance);
+json.endNode();
 return json.dumpToFile(file);
 };
 bool  my_prefs_struct_jdeserialize(const char *file, const ADM_paramList *tmpl,my_prefs_struct *key){

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

@@ -20,6 +20,7 @@
 { FEATURES_THREADING_LAVC,"features.threading_lavc"                   ,ADM_param_uint32_t	,"0",	0,	32},
 { FEATURES_CPU_CAPS,"features.cpu_caps"                               ,ADM_param_uint32_t	,"4294967295",	0,	4294967295},
 { FEATURES_CACHE_SIZE,"features.cache_size"                           ,ADM_param_uint32_t	,"16",	8,	16},
+{ FEATURES_SHARED_CACHE,"features.shared_cache"                       ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit"                     ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_DXVA2,"features.dxva2"                                     ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_DXVA2_OVERRIDE_BLACKLIST_VERSION,"features.dxva2_override_blacklist_version",ADM_param_bool    	,"0",	0,	1},
@@ -37,6 +38,8 @@
 { KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,"keyboard_shortcuts.swap_up_down_keys",ADM_param_bool    	,"0",	0,	1},
 { KEYBOARD_SHORTCUTS_ALT_MARK_A,"keyboard_shortcuts.alt_mark_a"       ,ADM_param_stdstring  	,"I",	0,	0},
 { KEYBOARD_SHORTCUTS_ALT_MARK_B,"keyboard_shortcuts.alt_mark_b"       ,ADM_param_stdstring  	,"O",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_RESET_MARK_A,"keyboard_shortcuts.alt_reset_mark_a",ADM_param_stdstring  	,"U",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_RESET_MARK_B,"keyboard_shortcuts.alt_reset_mark_b",ADM_param_stdstring  	,"P",	0,	0},
 { KEYBOARD_SHORTCUTS_ALT_RESET_MARKERS,"keyboard_shortcuts.alt_reset_markers",ADM_param_stdstring  	,"R",	0,	0},
 { KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_A,"keyboard_shortcuts.alt_goto_mark_a",ADM_param_stdstring  	,"A",	0,	0},
 { KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_B,"keyboard_shortcuts.alt_goto_mark_b",ADM_param_stdstring  	,"B",	0,	0},
@@ -71,9 +74,13 @@
 { DEFAULT_WARN_FOR_FONTS,"Default.warn_for_fonts"                     ,ADM_param_bool    	,"1",	0,	1},
 { DEFAULT_MULTILOAD_USE_CUSTOM_SIZE,"Default.multiload_use_custom_size",ADM_param_bool    	,"0",	0,	1},
 { DEFAULT_MULTILOAD_CUSTOM_SIZE_M,"Default.multiload_custom_size_m"   ,ADM_param_uint32_t	,"4000",	250,	8192},
+{ DEFAULT_DELETE_FIRST_PASS_LOG_FILES,"Default.delete_first_pass_log_files",ADM_param_bool    	,"0",	0,	1},
 { AVISYNTH_AVISYNTH_ALWAYS_ASK,"avisynth.avisynth_always_ask"         ,ADM_param_bool    	,"0",	0,	1},
 { AVISYNTH_AVISYNTH_DEFAULTPORT,"avisynth.avisynth_defaultport"       ,ADM_param_uint32_t	,"9999",	1024,	65535},
 { AVISYNTH_AVISYNTH_LOCALPORT,"avisynth.avisynth_localport"           ,ADM_param_uint32_t	,"0",	1024,	65535},
 { RESET_ENCODER_ON_VIDEO_LOAD,"reset_encoder_on_video_load"           ,ADM_param_bool    	,"0",	0,	1},
+{ LOAD_PICTURES_REVERSE_ORDER,"load_pictures_reverse_order"           ,ADM_param_bool    	,"0",	0,	1},
+{ HDR_TONEMAPPING,"hdr.tonemapping"                                   ,ADM_param_uint32_t	,"1",	0,	99},
+{ HDR_TARGET_LUMINANCE,"hdr.target_luminance"                         ,ADM_param_float   	,"100.0",	0.0,	1000.0},
 };

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

@@ -877,7 +877,7 @@
 #else
                     ADMColorScalerSimple *color=src->fromNv12ToYv12;
                     if(!color)
-                        color = new ADMColorScalerSimple(src->w, src->h, ADM_COLOR_NV12, ADM_COLOR_YV12);
+                        color = new ADMColorScalerSimple(src->w, src->h, ADM_PIXFRMT_NV12, ADM_PIXFRMT_YV12);
                     ADMImageRef ref(dest->_width,dest->_height);
                     for(int i=0;i<2;i++)
                     {
@@ -896,7 +896,7 @@
                 {
                     ADMColorScalerSimple *color=src->color10bits;
                     if(!color)
-                        color = new ADMColorScalerSimple(src->w, src->h, ADM_COLOR_NV12_10BITS, ADM_COLOR_YV12);
+                        color = new ADMColorScalerSimple(src->w, src->h, ADM_PIXFRMT_NV12_10BITS, ADM_PIXFRMT_YV12);
                     ADMImageRef ref(dest->_width,dest->_height);
                     for(int i=0;i<2;i++)
                     {
@@ -1063,7 +1063,7 @@
                     ADM_assert(face);
                     ADMColorScalerSimple *color=face->color10bits;
                     if(!color)
-                        color = new ADMColorScalerSimple(src->_width, src->_height, ADM_COLOR_NV12_10BITS, ADM_COLOR_YV12);
+                        color = new ADMColorScalerSimple(src->_width, src->_height, ADM_PIXFRMT_NV12_10BITS, ADM_PIXFRMT_YV12);
                     ADMImageRef ref(src->_width,src->_height);
                     for(int i=0;i<2;i++)
                     {
@@ -1084,7 +1084,7 @@
                     ADM_assert(face);
                     ADMColorScalerSimple *color=face->fromNv12ToYv12;
                     if(!color)
-                        color = new ADMColorScalerSimple(src->_width, src->_height, ADM_COLOR_NV12, ADM_COLOR_YV12);
+                        color = new ADMColorScalerSimple(src->_width, src->_height, ADM_PIXFRMT_NV12, ADM_PIXFRMT_YV12);
                     ADMImageRef ref(src->_width,src->_height);
                     for(int i=0;i<2;i++)
                     {

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/src/ADM_coreVideoToolbox.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVideoToolbox/src/ADM_coreVideoToolbox.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h Changed

@@ -38,13 +38,16 @@
 protected:
   uint32_t _w;
   uint32_t _h;
-  uint8_t _lastQ;
 public:
     decoders (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp)
   {
     _w = w;
     _h = h;
-    _lastQ = 0;
+
+    UNUSED_ARG(fcc);
+    UNUSED_ARG(extraDataLen);
+    UNUSED_ARG(extraData);
+    UNUSED_ARG(bpp);
   }
 
   virtual ~decoders() { }
@@ -56,7 +59,7 @@
 
   virtual bool getConfiguration(CONFcouple **conf) { *conf = NULL; return true; }
   virtual bool resetConfiguration() { return true; }
-  virtual bool setConfiguration(CONFcouple * conf) { return true; }
+  virtual bool setConfiguration(CONFcouple * conf) { UNUSED_ARG(conf); return true; }
 
   // does this codec *possibly* can have b-frame ?
   virtual bool dontcopy (void)
@@ -84,12 +87,12 @@
   {
     return false;
   }
-  virtual void setEndOfStream(bool reached) { };
+  virtual void setEndOfStream(bool reached) { UNUSED_ARG(reached); }
   virtual bool getDrainingState(void)
   {
     return 0;
   }
-  virtual void setDrainingState(bool drain) { };
+  virtual void setDrainingState(bool drain) { UNUSED_ARG(drain); }
   virtual bool flush(void)
     {
         return true;

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

@@ -23,6 +23,10 @@
 {
 #include "libavcodec/avcodec.h"
 #include "libavutil/mem.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/mastering_display_metadata.h"
+#include "libavutil/hdr_dynamic_metadata.h"
+#include "libavutil/rational.h"
 }
 #include "ADM_hwAccel.h"
 
@@ -72,6 +76,7 @@
            int          _extraDataLen;
            uint32_t     _fcc;
            AVFrame      *_frame;
+           AVPacket     *_packet;
            uint32_t     _gmc;
            uint32_t     _usingMT;
            uint32_t     _threads;
@@ -83,6 +88,10 @@
            uint8_t      clonePic (AVFrame * src, ADMImage * out, bool swap);
            void         decoderMultiThread ();
            uint32_t     admFrameTypeFromLav (AVFrame *pic);
+           ADM_pixelFormat      admPixFrmtFromLav(AVPixelFormat pix_fmt, bool * swap);
+           ADM_colorPrimaries   admColPriFromLav(AVColorPrimaries color_primaries);
+           ADM_colorTrC         admColTrcFromLav(AVColorTransferCharacteristic color_trc);
+           ADM_colorSpace       admColSpcFromLav(AVColorSpace colorspace);
 
 public:
                         decoderFF (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataLen, uint8_t *extraData,uint32_t bpp);
@@ -135,6 +144,7 @@
                           }
         // for hw accel
         AVFrame *getFramePointer() {return _frame;}
+        AVPacket *getPacketPointer(void) { return _packet; }
 };
 
 #define FF_SIMPLE_DECLARE(x,y) \

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecFFsimple.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

@@ -66,11 +66,11 @@
 
   ref->_planes[2] = (uint8_t *) src->data[u];
   ref->_planeStride[2] = src->linesize[u];
-  
-  _lastQ = 0;			//_context->quality;
-  out->_Qp = (src->quality * 32) / FF_LAMBDA_MAX;
+
+  // out->_Qp = (src->quality * 32) / FF_LAMBDA_MAX;
   out->flags = frameType ();
 
+#if 0 /* deprecated and dead, removed upstream */
   // Quant ?
   if (src->qstride && src->qscale_table && codecId != AV_CODEC_ID_H264)
     {
@@ -80,6 +80,7 @@
       out->_qSize *= (_h + 15) >> 4;	// FixME?
     }
   else
+#endif
     {
       out->_qSize = out->_qStride = 0;
       out->quant = NULL;
@@ -89,6 +90,125 @@
     //printf("[LAVC] pts: %"PRIu64"\n",src->pts);
     out->Pts= (uint64_t)(pts_opaque);
     out->_range=(src->color_range==AVCOL_RANGE_JPEG)? ADM_COL_RANGE_JPEG : ADM_COL_RANGE_MPEG;
+    {
+    ADM_colorPrimaries cp = admColPriFromLav(src->color_primaries);
+    if (cp != ADM_COL_PRI_UNSPECIFIED)
+        out->_colorPrim = cp;
+    ADM_colorTrC tc = admColTrcFromLav(src->color_trc);
+    if (tc != ADM_COL_TRC_UNSPECIFIED)
+        out->_colorTrc = tc;
+    ADM_colorSpace cs = admColSpcFromLav(src->colorspace);
+    if (cs != ADM_COL_SPC_UNSPECIFIED)
+        out->_colorSpace = cs;
+    }
+#ifdef ADM_DEBUG
+    if (out->_colorPrim == ADM_COL_PRI_UNSPECIFIED)
+        ADM_warning("Unspecified color primaries\n");
+    if (out->_colorTrc == ADM_COL_TRC_UNSPECIFIED)
+        ADM_warning("Unspecified color transfer characteristic\n");
+    if (out->_colorSpace == ADM_COL_SPC_UNSPECIFIED)
+        ADM_warning("Unspecified colorspace\n");
+#endif
+
+    // process side data
+    for (int i = 0; i < src->nb_side_data; i++)
+    {
+        AVFrameSideData *sd = src->side_data[i];
+        switch (sd->type)
+        {
+            case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA:
+                {
+                    const AVMasteringDisplayMetadata *mastering_display;
+                    if (sd->size < sizeof(AVMasteringDisplayMetadata))
+                        break;
+                    mastering_display = (const AVMasteringDisplayMetadata *)sd->data;
+                    if (mastering_display->has_primaries)
+                    {
+                        for (int rgb=0; rgb<3; rgb++)
+                        {
+                            out->_hdrInfo.primaries[rgb][0] = av_q2d(mastering_display->display_primaries[rgb][0]);
+                            out->_hdrInfo.primaries[rgb][1] = av_q2d(mastering_display->display_primaries[rgb][1]);
+                        }
+                        out->_hdrInfo.whitePoint[0] = av_q2d(mastering_display->white_point[0]);
+                        out->_hdrInfo.whitePoint[1] = av_q2d(mastering_display->white_point[1]);
+#ifdef ADM_DEBUG
+                        ADM_info("HDR primaries: [%f,%f], [%f,%f], [%f,%f]\n",out->_hdrInfo.primaries[0][0],out->_hdrInfo.primaries[0][1], out->_hdrInfo.primaries[1][0],out->_hdrInfo.primaries[1][1], out->_hdrInfo.primaries[2][0],out->_hdrInfo.primaries[2][1]);
+                        ADM_info("HDR white point: [%f,%f]\n",out->_hdrInfo.whitePoint[0],out->_hdrInfo.whitePoint[1]);
+#endif
+                    }
+                    if (mastering_display->has_luminance)
+                    {
+                        out->_hdrInfo.maxLuminance = av_q2d(mastering_display->max_luminance);	// nits
+                        out->_hdrInfo.minLuminance = av_q2d(mastering_display->min_luminance);
+#ifdef ADM_DEBUG
+                        ADM_info("HDR max luminance: %f\n",out->_hdrInfo.maxLuminance);
+                        ADM_info("HDR min luminance: %f\n",out->_hdrInfo.minLuminance);
+#endif
+                    }
+                }
+                break;
+            case AV_FRAME_DATA_CONTENT_LIGHT_LEVEL:
+                {
+                    const AVContentLightMetadata *content_light;
+                    if (sd->size < sizeof(AVContentLightMetadata))
+                        break;
+                    content_light = (const AVContentLightMetadata *)sd->data;
+                    out->_hdrInfo.maxCLL = content_light->MaxCLL;	// integer, nits
+                    out->_hdrInfo.maxFALL = content_light->MaxFALL;
+#ifdef ADM_DEBUG
+                    ADM_info("HDR maxCLL: %f\n",out->_hdrInfo.maxCLL);
+                    ADM_info("HDR maxFALL: %f\n",out->_hdrInfo.maxFALL);
+#endif
+                }
+                break;
+            case AV_FRAME_DATA_DYNAMIC_HDR_PLUS:
+                {
+                    const AVDynamicHDRPlus *hdr_plus;
+                    if (sd->size < sizeof(AVDynamicHDRPlus))
+                        break;
+                    hdr_plus = (const AVDynamicHDRPlus *)sd->data;
+                    if (hdr_plus->num_windows > 0)
+                    {
+                        // CHEATING: assume num_windows==1; ATSC S34-301r2 A/341 Amendment – 2094-40 says: "The value of num_windows shall be 1."
+                        //           ignore bullshit parameters, like "elliptical pixel selector"; hope it's ok :)
+                        for (int rgb=0; rgb<3; rgb++)
+                        {
+                            out->_hdrInfo.maxSCL[rgb] = av_q2d(hdr_plus->params[0].maxscl[rgb]);
+                        }
+                        out->_hdrInfo.avgMaxRGB = av_q2d(hdr_plus->params[0].average_maxrgb);
+                        if (hdr_plus->params[0].tone_mapping_flag)
+                        {
+                            out->_hdrInfo.kneePoint[0] = av_q2d(hdr_plus->params[0].knee_point_x);
+                            out->_hdrInfo.kneePoint[1] = av_q2d(hdr_plus->params[0].knee_point_y);
+                        }
+                        if (hdr_plus->params[0].num_bezier_curve_anchors > 0)
+                        {
+                            for (int b=0; b<hdr_plus->params[0].num_bezier_curve_anchors; b++)
+                            {
+                                if (b >= 15)
+                                    break;
+                                out->_hdrInfo.bezierCurveAnchors[b] = av_q2d(hdr_plus->params[0].bezier_curve_anchors[b]);
+                            }
+                        }
+                        if (hdr_plus->params[0].color_saturation_mapping_flag)
+                        {
+                            out->_hdrInfo.colorSaturationWeight = av_q2d(hdr_plus->params[0].color_saturation_weight);
+                        }
+                    }
+                    out->_hdrInfo.targetMaxLuminance = av_q2d(hdr_plus->targeted_system_display_maximum_luminance);
+#ifdef ADM_DEBUG
+                    ADM_info("HDR maxSCL: %f, %f, %f\n",out->_hdrInfo.maxSCL[0],out->_hdrInfo.maxSCL[1],out->_hdrInfo.maxSCL[2]);
+                    ADM_info("HDR avgMaxRGB: %f\n",out->_hdrInfo.avgMaxRGB);
+                    ADM_info("HDR kneePoint: %f, %f\n",out->_hdrInfo.kneePoint[0],out->_hdrInfo.kneePoint[1]);
+                    ADM_info("HDR colorSaturationWeight: %f\n",out->_hdrInfo.colorSaturationWeight);
+                    ADM_info("HDR targetMaxLuminance: %f\n",out->_hdrInfo.targetMaxLuminance);
+#endif
+
+                    //other fields are not implemented as of ATSC S34-301r2 A/341 Amendment – 2094-40 
+                }
+                break;
+        }
+    }
 
     return 1;
 }
@@ -194,9 +314,11 @@
 
   _frame=av_frame_alloc();
   if(!_frame)
-  {
       return;
-  }
+
+  _packet = av_packet_alloc();
+  if(!_packet)
+      return;
 
   printf ("[lavc] Build: %d\n", LIBAVCODEC_BUILD);
   _extraDataCopy=NULL;
@@ -228,13 +350,10 @@
         _context=NULL;
         printf ("[lavc] Destroyed\n");
     }
-  
-  if(_frame)
-  {
-      av_frame_free(&_frame);
-      _frame=NULL;
-  }
-  
+  // NULL-safe and will set the pointer to NULL
+  av_frame_free(&_frame);
+  av_packet_free(&_packet);
+
   if(_extraDataCopy)
   {
       delete [] _extraDataCopy;
@@ -250,6 +369,204 @@
 {
     return _initCompleted;
 }
+
+
+ADM_pixelFormat decoderFF::admPixFrmtFromLav(AVPixelFormat pix_fmt, bool * swap)
+{
+  switch (pix_fmt)
+    {
+    case AV_PIX_FMT_YUV411P:
+      aprintf("pixel format is AV_PIX_FMT_YUV411P --> ADM_PIXFRMT_YUV411\n");
+      return ADM_PIXFRMT_YUV411;
+    case AV_PIX_FMT_YUYV422:
+      aprintf("pixel format is AV_PIX_FMT_YUYV422 --> ADM_PIXFRMT_YUV422\n");
+      return ADM_PIXFRMT_YUV422;
+    case AV_PIX_FMT_YUV422P:
+    case AV_PIX_FMT_YUVJ422P:
+      aprintf("pixel format is AV_PIX_FMT_YUV422P or AV_PIX_FMT_YUVJ422P --> ADM_PIXFRMT_YUV422P\n");
+      return ADM_PIXFRMT_YUV422P;
+    case AV_PIX_FMT_GRAY8:
+      aprintf("pixel format is AV_PIX_FMT_GRAY8 --> ADM_PIXFRMT_Y8\n");
+      return ADM_PIXFRMT_Y8;
+    case AV_PIX_FMT_YUV444P:
+    case AV_PIX_FMT_YUVJ444P:
+      aprintf("pixel format is AV_PIX_FMT_YUV444P or AV_PIX_FMT_YUVJ444P --> ADM_PIXFRMT_YUV444\n");
+      return ADM_PIXFRMT_YUV444;
+    case AV_PIX_FMT_YUV420P:
+    case AV_PIX_FMT_YUVJ420P:
+    case AV_PIX_FMT_YUVA420P:
+      // Default is YV12 or I420
+      // In that case depending on swap u/v
+      // we do it or not
+      aprintf("pixel format is AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P or AV_PIX_FMT_YUVA420P --> ADM_PIXFRMT_YV12\n");
+      if (swap)
+          *swap = true;
+      return ADM_PIXFRMT_YV12;
+    case AV_PIX_FMT_BGR24:
+      aprintf("pixel format is AV_PIX_FMT_BGR24 --> ADM_PIXFRMT_BGR24\n");
+      return ADM_PIXFRMT_BGR24;
+    case AV_PIX_FMT_RGB24:
+      aprintf("pixel format is AV_PIX_FMT_RGB24 --> ADM_PIXFRMT_RGB24\n");
+      return ADM_PIXFRMT_RGB24;
+    case AV_PIX_FMT_GBRP:
+      aprintf("pixel format is AV_PIX_FMT_GBRP --> ADM_PIXFRMT_GBR24P\n");
+      return ADM_PIXFRMT_GBR24P;
+    case AV_PIX_FMT_BGR0:
+    case AV_PIX_FMT_BGRA:
+      aprintf("pixel format is AV_PIX_FMT_BGR0 or AV_PIX_FMT_BGRA --> ADM_PIXFRMT_BGR32A\n");
+      return ADM_PIXFRMT_BGR32A;
+    case AV_PIX_FMT_RGBA: // ???PIX_FMT_RGBA32:
+      aprintf("pixel format is AV_PIX_FMT_RGBA --> ADM_PIXFRMT_RGB32A\n");
+      return ADM_PIXFRMT_RGB32A;
+    case AV_PIX_FMT_RGB555:
+      aprintf("pixel format is AV_PIX_FMT_RGB555 --> ADM_PIXFRMT_RGB555\n");
+      return ADM_PIXFRMT_RGB555;
+#if 0
+    case AV_PIX_FMT_VDPAU_MPEG1:
+    case AV_PIX_FMT_VDPAU_MPEG2:
+    case AV_PIX_FMT_VDPAU_WMV3:
+    case AV_PIX_FMT_VDPAU_VC1:
+    case AV_PIX_FMT_VDPAU_H264:
+    case AV_PIX_FMT_VDPAU:
+        return ADM_PIXFRMT_VDPAU;
+    case AV_PIX_FMT_VAAPI:
+        return ADM_PIXFRMT_LIBVA;
+        
+#ifdef USE_XVBA        
+    case AV_PIX_FMT_XVBA_VLD:
+        return ADM_PIXFRMT_XVBA;
+#endif        
+#endif
+  case AV_PIX_FMT_YUV444P10LE:
+        return ADM_PIXFRMT_YUV444_10BITS;
+  case AV_PIX_FMT_YUV422P10LE:
+        return ADM_PIXFRMT_YUV422_10BITS;
+  case   AV_PIX_FMT_P010LE:      
+        return ADM_PIXFRMT_NV12_10BITS;
+  case  AV_PIX_FMT_YUV420P10LE:
+        return ADM_PIXFRMT_YUV420_10BITS;
+  case  AV_PIX_FMT_YUV420P12LE:
+        return ADM_PIXFRMT_YUV420_12BITS;
+  case  AV_PIX_FMT_YUV444P12LE:
+        return ADM_PIXFRMT_YUV444_12BITS;
+    default:
+        return ADM_PIXFRMT_INVALID;
+    }
+}
+
+ADM_colorPrimaries decoderFF::admColPriFromLav(AVColorPrimaries color_primaries)
+{
+    switch(color_primaries)
+    {
+        case AVCOL_PRI_BT709:
+            return ADM_COL_PRI_BT709;
+        case AVCOL_PRI_BT470M:
+            return ADM_COL_PRI_BT470M;
+        case AVCOL_PRI_BT470BG:
+            return ADM_COL_PRI_BT470BG;
+        case AVCOL_PRI_SMPTE170M:
+            return ADM_COL_PRI_SMPTE170M;
+        case AVCOL_PRI_SMPTE240M:
+            return ADM_COL_PRI_SMPTE240M;
+        case AVCOL_PRI_FILM:
+            return ADM_COL_PRI_FILM;
+        case AVCOL_PRI_BT2020:
+            return ADM_COL_PRI_BT2020;
+        case AVCOL_PRI_SMPTE428:
+        //case AVCOL_PRI_SMPTEST428_1:
+            return ADM_COL_PRI_SMPTE428;
+        case AVCOL_PRI_SMPTE431:
+            return ADM_COL_PRI_SMPTE431;
+        case AVCOL_PRI_SMPTE432:
+            return ADM_COL_PRI_SMPTE432;
+        case AVCOL_PRI_EBU3213:
+        //case AVCOL_PRI_JEDEC_P22:
+            return ADM_COL_PRI_EBU3213;
+        default:
+            return ADM_COL_PRI_UNSPECIFIED;
+    }
+}
+
+ADM_colorTrC decoderFF::admColTrcFromLav(AVColorTransferCharacteristic color_trc)
+{
+    switch(color_trc)
+    {
+        case AVCOL_TRC_BT709:
+            return ADM_COL_TRC_BT709;
+        case AVCOL_TRC_GAMMA22:
+            return ADM_COL_TRC_GAMMA22;
+        case AVCOL_TRC_GAMMA28:
+            return ADM_COL_TRC_GAMMA28;
+        case AVCOL_TRC_SMPTE170M:
+            return ADM_COL_TRC_SMPTE170M;
+        case AVCOL_TRC_SMPTE240M:
+            return ADM_COL_TRC_SMPTE240M;
+        case AVCOL_TRC_LINEAR:
+            return ADM_COL_TRC_LINEAR;
+        case AVCOL_TRC_LOG:
+            return ADM_COL_TRC_LOG;
+        case AVCOL_TRC_LOG_SQRT:
+            return ADM_COL_TRC_LOG_SQRT;
+        case AVCOL_TRC_IEC61966_2_4:
+            return ADM_COL_TRC_IEC61966_2_4;
+        case AVCOL_TRC_BT1361_ECG:
+            return ADM_COL_TRC_BT1361_ECG;
+        case AVCOL_TRC_IEC61966_2_1:
+            return ADM_COL_TRC_IEC61966_2_1;
+        case AVCOL_TRC_BT2020_10:
+            return ADM_COL_TRC_BT2020_10;
+        case AVCOL_TRC_BT2020_12:
+            return ADM_COL_TRC_BT2020_12;
+        case AVCOL_TRC_SMPTE2084:
+        //case AVCOL_TRC_SMPTEST2084:
+            return ADM_COL_TRC_SMPTE2084;
+        case AVCOL_TRC_SMPTE428:
+        //case AVCOL_TRC_SMPTEST428_1:
+            return ADM_COL_TRC_SMPTE428;
+        case AVCOL_TRC_ARIB_STD_B67:
+            return ADM_COL_TRC_ARIB_STD_B67;
+        default:
+            return ADM_COL_TRC_UNSPECIFIED;
+    }
+}
+
+ADM_colorSpace decoderFF::admColSpcFromLav(AVColorSpace colorspace)
+{
+    switch(colorspace)
+    {
+        case AVCOL_SPC_RGB:
+            return ADM_COL_SPC_sRGB;
+        case AVCOL_SPC_BT709:
+            return ADM_COL_SPC_BT709;
+        case AVCOL_SPC_FCC:
+            return ADM_COL_SPC_FCC;
+        case AVCOL_SPC_BT470BG:
+            return ADM_COL_SPC_BT470BG;
+        case AVCOL_SPC_SMPTE170M:
+            return ADM_COL_SPC_SMPTE170M;
+        case AVCOL_SPC_SMPTE240M:
+            return ADM_COL_SPC_SMPTE240M;
+        case AVCOL_SPC_YCGCO:
+        //case AVCOL_SPC_YCOCG:
+            return ADM_COL_SPC_YCGCO;
+        case AVCOL_SPC_BT2020_NCL:
+            return ADM_COL_SPC_BT2020_NCL;
+        case AVCOL_SPC_BT2020_CL:
+            return ADM_COL_SPC_BT2020_CL;
+        case AVCOL_SPC_SMPTE2085:
+            return ADM_COL_SPC_SMPTE2085;
+        case AVCOL_SPC_CHROMA_DERIVED_NCL:
+            return ADM_COL_SPC_CHROMA_DERIVED_NCL;
+        case AVCOL_SPC_CHROMA_DERIVED_CL:
+            return ADM_COL_SPC_CHROMA_DERIVED_CL;
+        case AVCOL_SPC_ICTCP:
+            return ADM_COL_SPC_ICTCP;
+        default:
+            return ADM_COL_SPC_UNSPECIFIED;
+    }
+}
+
+
 /**
  * 
  * @param pic
@@ -270,10 +587,10 @@
                 SET (AVI_KEY_FRAME);
                 if (!pic->key_frame)
                   {
-                    if (codecId == AV_CODEC_ID_H264)
+                    if (codecId == AV_CODEC_ID_H264 || codecId == AV_CODEC_ID_FFV1)
                         SET (AVI_P_FRAME)
                     else
-                      ADM_info ("\n But keyframe is not set\n");
+                        ADM_info("Picture type is I, but keyframe is not set\n");
                   }
                 break;
         case AV_PICTURE_TYPE_S:
@@ -386,6 +703,7 @@
 {
   int ret = 0;
   out->_noPicture = 0;
+  out->_Qp = ADM_IMAGE_UNKNOWN_QP;
   if(hwDecoder && !_usingMT)
         return hwDecoder->uncompress(in,out);
  
@@ -413,16 +731,25 @@
         }
     }else
     {
-        AVPacket pkt;
-        av_init_packet(&pkt);
-        pkt.data=in->data;
-        pkt.size=in->dataLength;
+        _packet->data = in->data;
+        _packet->size = in->dataLength;
+
         if(in->flags&AVI_KEY_FRAME)
-            pkt.flags=AV_PKT_FLAG_KEY;
+            _packet->flags = AV_PKT_FLAG_KEY;
         else
-            pkt.flags=0;
+            _packet->flags = 0;
+
+        ret = avcodec_send_packet(_context, _packet);
+
+        if(ret)
+        {
+            char er[AV_ERROR_MAX_STRING_SIZE]={0};
+            av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, ret);
+            ADM_warning("Ignoring error %d submitting packet to decoder (\"%s\")\n",ret,er);
+        }
+
+        av_packet_unref(_packet);
 
-        avcodec_send_packet(_context, &pkt);
         // HW accel may be setup by now if this has been the very first packet. In this case
         // ask the hw decoder to collect the decoded picture.
         if(hwDecoder)
@@ -436,18 +763,17 @@
 
     out->_qStride = 0; // Default = no quant
 
-    if (ret && !hurryUp)
+    if (!_drain && ret && !hurryUp)
     {
         // Some encoder code a vop header with the
         // vop flag set to 0
         // it is meant to mean frame skipped but very dubious
 #define MPEG4_EMPTY_FRAME_THRESHOLD 19 // MAX_NVOP_SIZE
 #define FRAPS_EMPTY_FRAME_THRESHOLD  8 // assumption
-        if ((in->dataLength <= MPEG4_EMPTY_FRAME_THRESHOLD && codecId == AV_CODEC_ID_MPEG4) ||
-            (in->dataLength <= FRAPS_EMPTY_FRAME_THRESHOLD && codecId == AV_CODEC_ID_MPEG4))
+        if ((codecId == AV_CODEC_ID_MPEG4 && in->dataLength <= MPEG4_EMPTY_FRAME_THRESHOLD) ||
+            (codecId == AV_CODEC_ID_FRAPS && in->dataLength <= FRAPS_EMPTY_FRAME_THRESHOLD))
         {
             printf ("[lavc] Probably placeholder frame (data length: %u)\n",in->dataLength);
-            out->_Qp = 2;
             out->Pts=ADM_NO_PTS; // not sure
             out->_noPicture = 1;
             return true;
@@ -481,103 +807,23 @@
         _frame->reordered_opaque=(int64_t)in->demuxerPts;
     }
 
-  // We have an image....
-  bool swap = false;
-  switch (_context->pix_fmt)
+    // We have an image....
+    bool swap = false;
+    ADM_pixelFormat pix_fmt;
+    pix_fmt = admPixFrmtFromLav(_context->pix_fmt, &swap);
+    if (pix_fmt == ADM_PIXFRMT_INVALID)
     {
-    case AV_PIX_FMT_YUV411P:
-      out->_colorspace = ADM_COLOR_YUV411;
-      aprintf("colorspace is AV_PIX_FMT_YUV411P --> ADM_COLOR_YUV411\n");
-      break;
-    case AV_PIX_FMT_YUYV422:
-      out->_colorspace = ADM_COLOR_YUV422;
-      aprintf("colorspace is AV_PIX_FMT_YUYV422 --> ADM_COLOR_YUV422\n");
-      break;
-    case AV_PIX_FMT_YUV422P:
-    case AV_PIX_FMT_YUVJ422P:
-      out->_colorspace = ADM_COLOR_YUV422P;
-      aprintf("colorspace is AV_PIX_FMT_YUV422P or AV_PIX_FMT_YUVJ422P --> ADM_COLOR_YUV422P\n");
-      break;
-    case AV_PIX_FMT_GRAY8:
-      out->_colorspace = ADM_COLOR_Y8;
-      aprintf("colorspace is AV_PIX_FMT_GRAY8 --> ADM_COLOR_Y8\n");
-      break;
-    case AV_PIX_FMT_YUV444P:
-    case AV_PIX_FMT_YUVJ444P:
-      out->_colorspace = ADM_COLOR_YUV444;
-      aprintf("colorspace is AV_PIX_FMT_YUV444P or AV_PIX_FMT_YUVJ444P --> ADM_COLOR_YUV444\n");
-      break;
-    case AV_PIX_FMT_YUV420P:
-    case AV_PIX_FMT_YUVJ420P:
-    case AV_PIX_FMT_YUVA420P:
-      // Default is YV12 or I420
-      // In that case depending on swap u/v
-      // we do it or not
-      out->_colorspace = ADM_COLOR_YV12;
-      swap = true;
-      aprintf("colorspace is AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P or AV_PIX_FMT_YUVA420P --> ADM_COLOR_YV12\n");
-      break;
-    case AV_PIX_FMT_BGR24:
-      out->_colorspace = ADM_COLOR_BGR24;
-      aprintf("colorspace is AV_PIX_FMT_BGR24 --> ADM_COLOR_BGR24\n");
-      break;
-    case AV_PIX_FMT_RGB24:
-      out->_colorspace = ADM_COLOR_RGB24;
-      aprintf("colorspace is AV_PIX_FMT_RGB24 --> ADM_COLOR_RGB24\n");
-      break;
-    case AV_PIX_FMT_BGR0:
-    case AV_PIX_FMT_BGRA:
-      out->_colorspace = ADM_COLOR_BGR32A;
-      aprintf("colorspace is AV_PIX_FMT_BGR0 or AV_PIX_FMT_BGRA --> ADM_COLOR_BGR32A\n");
-      break;
-    case AV_PIX_FMT_RGBA: // ???PIX_FMT_RGBA32:
-      out->_colorspace = ADM_COLOR_RGB32A;
-      aprintf("colorspace is AV_PIX_FMT_RGBA --> ADM_COLOR_RGB32A\n");
-      break;
-    case AV_PIX_FMT_RGB555:
-      out->_colorspace = ADM_COLOR_RGB555;
-      aprintf("colorspace is AV_PIX_FMT_RGB555 --> ADM_COLOR_RGB555\n");
-      break;
-#if 0
-    case AV_PIX_FMT_VDPAU_MPEG1:
-    case AV_PIX_FMT_VDPAU_MPEG2:
-    case AV_PIX_FMT_VDPAU_WMV3:
-    case AV_PIX_FMT_VDPAU_VC1:
-    case AV_PIX_FMT_VDPAU_H264:
-    case AV_PIX_FMT_VDPAU:
-        out->_colorspace=ADM_COLOR_VDPAU;
-        break;        
-    case AV_PIX_FMT_VAAPI:
-        out->_colorspace=ADM_COLOR_LIBVA;
-        break;
-        
-#ifdef USE_XVBA        
-    case AV_PIX_FMT_XVBA_VLD:
-        out->_colorspace=ADM_COLOR_XVBA;
-        break;
-#endif        
-#endif
-  case AV_PIX_FMT_YUV444P10LE:
-        out->_colorspace=ADM_COLOR_YUV444_10BITS;
-        break;      
-  case AV_PIX_FMT_YUV422P10LE:
-        out->_colorspace=ADM_COLOR_YUV422_10BITS;
-        break;
-  case   AV_PIX_FMT_P010LE:      
-        out->_colorspace= ADM_COLOR_NV12_10BITS;
-        break;
-  case  AV_PIX_FMT_YUV420P10LE:
-        out->_colorspace=ADM_COLOR_YUV420_10BITS;
-        break;
-  case  AV_PIX_FMT_YUV420P12LE:
-        out->_colorspace=ADM_COLOR_YUV420_12BITS;
-        break;
-  case  AV_PIX_FMT_YUV444P12LE:
-        out->_colorspace=ADM_COLOR_YUV444_12BITS;
-        break;
-    default:
-      printf ("[lavc] Unhandled colorspace: %d (AV_PIX_FMT_YUV444P10BE=%d)\n", _context->pix_fmt,AV_PIX_FMT_YUV444P10BE);
-      return 0;
+        printf ("[lavc] Unhandled pixel format: %d (AV_PIX_FMT_YUV444P10BE=%d)\n", _context->pix_fmt,AV_PIX_FMT_YUV444P10BE);
+        return 0;
+    }
+    out->_pixfrmt = pix_fmt;
+
+    // make sure the output is not marked as a hw image
+    int count = 0;
+    while(out->refType != ADM_HW_NONE && count < 32 /* arbitrary limit */)
+    {
+        out->hwDecRefCount();
+        count++;
     }
     clonePic(_frame, out, swap);
     //printf("[AvCodec] Pts : %"PRIu64" Out Pts:%"PRIu64" \n",_frame.pts,out->Pts);

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_rgb16.cpp Changed

@@ -43,7 +43,7 @@
 bool decoderRGB16::uncompress(ADMCompressedImage * in, ADMImage * out)
 {
         int lineSize = (_w *bytePerPixel + 3) & ~3; // 4 bytes aligned ?
-        ADM_colorspace colorspace;
+        ADM_pixelFormat pixFrmt;
         int i, j;
         uint8_t *src = in->data;
         uint8_t *dst = decoded;
@@ -53,12 +53,12 @@
         {
                 case 16:
                         // FIXME - 16-bit could use a BGR555 or BGR565 colour mask
-                        colorspace = ADM_COLOR_RGB555;
+                        pixFrmt = ADM_PIXFRMT_RGB555;
                         break;
                 case 24:
                 case 32: // BGRx
                 case 96: // fake bpp indicating xBGR
-                        colorspace = ADM_COLOR_BGR24;
+                        pixFrmt = ADM_PIXFRMT_BGR24;
                         break;
                 default:
                         printf("bpp %d not supported\n", _bpp);
@@ -113,7 +113,7 @@
         ADM_assert(out->isRef());
         ADMImageRef *ref=out->castToRef();
         out->flags = AVI_KEY_FRAME;
-        out->_colorspace = colorspace;
+        out->_pixfrmt = pixFrmt;
         out->_range = ADM_COL_RANGE_JPEG; // full
 
         ref->_planes[0] = decoded;
@@ -124,6 +124,13 @@
         ref->_planeStride[1] = 0;
         ref->_planeStride[2] = 0;
         out->Pts=in->demuxerPts;
+        // make sure the output is not marked as a hw image
+        int count = 0;
+        while(out->refType != ADM_HW_NONE && count < 32 /* arbitrary limit */)
+        {
+            out->hwDecRefCount();
+            count++;
+        }
         return true;
 }
 //EOF

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp Changed

@@ -31,7 +31,7 @@
     
     ADMImageRef *ref=out->castToRef();
     out->flags = AVI_KEY_FRAME;
-    out->_colorspace = ADM_COLOR_UYVY422;
+    out->_pixfrmt = ADM_PIXFRMT_UYVY422;
 
     ref->_planes[0] = in->data;
     ref->_planes[1] = NULL;
@@ -41,6 +41,13 @@
     ref->_planeStride[1] = 0;
     ref->_planeStride[2] = 0;
     out->Pts=in->demuxerPts;
+    // make sure the output is not marked as a hw image
+    int count = 0;
+    while(out->refType != ADM_HW_NONE && count < 32 /* arbitrary limit */)
+    {
+        out->hwDecRefCount();
+        count++;
+    }
     return true;
 }
 
@@ -57,7 +64,7 @@
 
     ADMImageRef *ref=out->castToRef();
     out->flags = AVI_KEY_FRAME;
-    out->_colorspace = ADM_COLOR_YUV422;
+    out->_pixfrmt = ADM_PIXFRMT_YUV422;
 
     ref->_planes[0] = in->data;
     ref->_planes[1] = NULL;
@@ -67,5 +74,11 @@
     ref->_planeStride[1] = 0;
     ref->_planeStride[2] = 0;
     out->Pts=in->demuxerPts;
+    int count = 0;
+    while(out->refType != ADM_HW_NONE && count < 32 /* arbitrary limit */)
+    {
+        out->hwDecRefCount();
+        count++;
+    }
     return true;
 }

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_coreVideoEncoderFFmpeg.h Changed

@@ -32,14 +32,22 @@
 class ADM_COREVIDEOENCODER6_EXPORT ADM_coreVideoEncoderFFmpeg :public ADM_coreVideoEncoder
 {
 protected:
+
+typedef enum {
+    ADM_ENCODER_STATE_FEEDING,
+    ADM_ENCODER_STATE_START_FLUSHING,
+    ADM_ENCODER_STATE_FLUSHING,
+    ADM_ENCODER_STATE_FLUSHED
+} ADM_encoderState;
+
                FFcodecSettings  Settings;
                AVCodecContext   *_context;      // Context
                AVDictionary     *_options;
                AVFrame          *_frame;
+               AVPacket         *_pkt;
                ADMColorScalerSimple    *colorSpace;    // Colorspace converter if needed
                ADM_byteBuffer   rgbByteBuffer;     // Buffer for colorspace converter if needed
-               ADM_colorspace   targetColorSpace; // Wanted colorspace
-               bool             loadStatFile(const char *file);
+               ADM_pixelFormat   targetPixFrmt; // Wanted pixel format
                char             *statFileName;
                FILE             *statFile;
                int              pass;   // Pass number = 1 or 2, valid only if we use 2 pass mode
@@ -49,7 +57,10 @@
                bool             _hasSettings;
                int64_t          lastLavPts;
                int64_t          lavPtsFromPacket;
-               int              packetFlags;
+               ADM_encoderState encoderState;
+
+               bool             loadStatFile(const char *file);
+
 
 protected:
                           int              encodeWrapper(AVFrame *in,ADMBitstream *out); // Returns encoded size of <0 for error

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_encoderConf.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/include/ADM_encoderConf.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp Changed

@@ -51,15 +51,18 @@
         _hasSettings=true;
     }
     _options=NULL;
-    targetColorSpace=ADM_COLOR_YV12;
+    targetPixFrmt=ADM_PIXFRMT_YV12;
     w=getWidth();
     h=getHeight();
 
     image=new ADMImageDefault(w,h);
     _frame=av_frame_alloc();
+    ADM_assert(_frame);
     _frame->pts = AV_NOPTS_VALUE;
     _frame->width=w;
     _frame->height=h;
+    _pkt = av_packet_alloc();
+    ADM_assert(_pkt);
     rgbByteBuffer.setSize((w+7)*(h+7)*4);
     colorSpace=NULL;
     pass=0;
@@ -76,7 +79,8 @@
     else
         encoderDelay=0;
     ADM_info("[Lavcodec] Using a video encoder delay of %d ms\n",(int)(encoderDelay/1000));
-    lastLavPts=0;
+    lastLavPts = AV_NOPTS_VALUE;
+    encoderState = ADM_ENCODER_STATE_FEEDING;
 }
 /**
     \fn ADM_coreVideoEncoderFFmpeg
@@ -91,23 +95,18 @@
           printf ("[lavc] killing threads\n");
           _isMT = false;
         }
-
-        avcodec_close(_context);
-
-        av_free (_context);
-        _context = NULL;
+        char *stats = _context->stats_in;
+        avcodec_free_context(&_context);
+        av_freep(&stats);
     }
     if (_options)
     {
         av_dict_free(&_options);
         _options=NULL;
     }
-    if (_frame)
-    {
-        av_frame_free(&_frame);
-        _frame=NULL;
-    }
-    
+    av_frame_free(&_frame);
+    av_packet_free(&_pkt);
+
     if(colorSpace)
     {
         delete colorSpace;
@@ -119,7 +118,7 @@
         fclose(statFile);
         statFile=NULL;
     }
-    if(statFileName) ADM_dealloc(statFileName);
+    ADM_dealloc(statFileName);
     statFileName=NULL;
 }
 /**
@@ -130,25 +129,25 @@
 {
     int w=getWidth();
 
-  switch(targetColorSpace)
+  switch(targetPixFrmt)
     {
-        case ADM_COLOR_YV12:    _frame->linesize[0] = img->GetPitch(PLANAR_Y);
+        case ADM_PIXFRMT_YV12:    _frame->linesize[0] = img->GetPitch(PLANAR_Y);
                                 _frame->linesize[1] = img->GetPitch(PLANAR_U);
                                 _frame->linesize[2] = img->GetPitch(PLANAR_V);
                                 _frame->format=AV_PIX_FMT_YUV420P;
                                 _context->pix_fmt =AV_PIX_FMT_YUV420P;break;
-        case ADM_COLOR_YUV422P: w = ADM_IMAGE_ALIGN(w);
+        case ADM_PIXFRMT_YUV422P: w = ADM_IMAGE_ALIGN(w);
                                 _frame->linesize[0] = w;
                                 _frame->linesize[1] = w>>1;
                                 _frame->linesize[2] = w>>1;
                                 _frame->format=AV_PIX_FMT_YUV422P;
                                 _context->pix_fmt =AV_PIX_FMT_YUV422P;break;
-        case ADM_COLOR_RGB32A : _frame->linesize[0] = ADM_IMAGE_ALIGN(w*4);
+        case ADM_PIXFRMT_RGB32A : _frame->linesize[0] = ADM_IMAGE_ALIGN(w*4);
                                 _frame->linesize[1] = 0;//w >> 1;
                                 _frame->linesize[2] = 0;//w >> 1;
                                 _frame->format=AV_PIX_FMT_RGB32;
                                 _context->pix_fmt =AV_PIX_FMT_RGB32;break;
-        case ADM_COLOR_RGB24:   _frame->linesize[0] = ADM_IMAGE_ALIGN(w*3);
+        case ADM_PIXFRMT_RGB24:   _frame->linesize[0] = ADM_IMAGE_ALIGN(w*3);
                                 _frame->linesize[1] = 0;
                                 _frame->linesize[2] = 0;
                                 _frame->format = AV_PIX_FMT_RGB24;
@@ -195,10 +194,14 @@
 */
 bool             ADM_coreVideoEncoderFFmpeg::preEncode(void)
 {
+    if(encoderState != ADM_ENCODER_STATE_FEEDING)
+        return false;
+
     uint32_t nb;
     if(source->getNextFrame(&nb,image)==false)
     {
-        printf("[ff] Cannot get next image\n");
+        ADM_warning("[ff] Cannot get next image\n");
+        encoderState = ADM_ENCODER_STATE_START_FLUSHING;
         return false;
     }
     prolog(image);
@@ -208,7 +211,6 @@
     aprintf("Incoming frame PTS=%" PRIu64", delay=%" PRIu64"\n",p,getEncoderDelay());
     p+=getEncoderDelay();
     _frame->pts= timingToLav(p);    //
-    if(!_frame->pts) _frame->pts=AV_NOPTS_VALUE;
     if(_frame->pts!=AV_NOPTS_VALUE && lastLavPts!=AV_NOPTS_VALUE && _frame->pts==lastLavPts)
     {
         ADM_warning("Lav PTS collision at frame %" PRIu32", lav PTS=%" PRId64", time %s\n",nb,_frame->pts,ADM_us2plain(p));
@@ -226,15 +228,15 @@
     //
     int w=getWidth();
     int h=getHeight();
-    switch(targetColorSpace)
+    switch(targetPixFrmt)
     {
-        case ADM_COLOR_YV12:
+        case ADM_PIXFRMT_YV12:
                 _frame->data[0] = image->GetWritePtr(PLANAR_Y);
                 _frame->data[1] = image->GetWritePtr(PLANAR_U);
                 _frame->data[2] = image->GetWritePtr(PLANAR_V);
                 break;
 
-        case ADM_COLOR_YUV422P:
+        case ADM_PIXFRMT_YUV422P:
         {
                 if(!colorSpace->convertImage(image,rgbByteBuffer.at(0)))
                 {
@@ -250,8 +252,8 @@
                 _frame->data[2] = p;
                 break;
         }
-        case ADM_COLOR_RGB32A:
-        case ADM_COLOR_RGB24:
+        case ADM_PIXFRMT_RGB32A:
+        case ADM_PIXFRMT_RGB24:
         {
                 if(!colorSpace->convertImage(image,rgbByteBuffer.at(0)))
                 {
@@ -293,28 +295,77 @@
  */
 int ADM_coreVideoEncoderFFmpeg::encodeWrapper(AVFrame *in,ADMBitstream *out)
 {
-    int r=avcodec_send_frame(_context,in);
+    int r = 0;
+    switch(encoderState)
+    {
+        case ADM_ENCODER_STATE_FEEDING:
+            r = avcodec_send_frame(_context,in);
+            break;
+        case ADM_ENCODER_STATE_START_FLUSHING:
+            r = avcodec_send_frame(_context,NULL);
+            encoderState = ADM_ENCODER_STATE_FLUSHING;
+            break;
+        case ADM_ENCODER_STATE_FLUSHING:
+            break;
+        case ADM_ENCODER_STATE_FLUSHED:
+            return 0;
+        default:
+            ADM_assert(0);
+            return 0;
+    }
     if(r<0)
         return printLavError(r);
 
-    AVPacket pkt;
-    av_init_packet(&pkt);
+    r = avcodec_receive_packet(_context, _pkt);
 
-    r=avcodec_receive_packet(_context,&pkt);
-    if(r==AVERROR(EAGAIN))
+    if(r < 0)
     {
-        ADM_info("Encoder needs more input to produce data.\n");
-        return 0;
-    }
-    if(r<0)
+        av_packet_unref(_pkt);
+        if(r == AVERROR(EAGAIN))
+        {
+            ADM_info("Encoder needs more input to produce data.\n");
+            return 0;
+        }
+        if(r == AVERROR_EOF)
+        {
+            encoderState = ADM_ENCODER_STATE_FLUSHED;
+            ADM_info("End of stream.\n");
+            return 0;
+        }
         return printLavError(r);
+    }
 
-    ADM_assert(out->bufferSize>=pkt.size);
-    memcpy(out->data,pkt.data,pkt.size);
-    lavPtsFromPacket=pkt.pts; // some encoders don't set pts in coded_frame
-    packetFlags=pkt.flags;
-    r=pkt.size;
-    av_packet_unref(&pkt);
+    ADM_assert(out->bufferSize >= _pkt->size);
+    memcpy(out->data, _pkt->data, _pkt->size);
+    lavPtsFromPacket = _pkt->pts;
+    out->flags = (_pkt->flags & AV_PKT_FLAG_KEY)? AVI_KEY_FRAME : AVI_P_FRAME;
+    out->out_quantizer = (int)floor(_frame->quality / (float) FF_QP2LAMBDA); // fallback
+
+    int sideDataSize;
+    uint8_t *sideData = av_packet_get_side_data(_pkt, AV_PKT_DATA_QUALITY_STATS, &sideDataSize);
+    if(sideData && sideDataSize > 5)
+    {
+        int quality = 0;
+        memcpy(&quality,sideData,4);
+        out->out_quantizer = (int)floor(quality / (float) FF_QP2LAMBDA);
+
+        AVPictureType pict_type = (AVPictureType)sideData[4];
+        switch(pict_type)
+        {
+            case AV_PICTURE_TYPE_I:
+                out->flags = AVI_KEY_FRAME;
+                break;
+            case AV_PICTURE_TYPE_B:
+                out->flags = AVI_B_FRAME;
+                break;
+            default: break;
+        }
+        aprintf("[ADM_coreVideoEncoderFFmpeg::encodeWrapper] Out Quant : %d, pic type %d (%s), keyf %d\n",out->out_quantizer,pict_type,
+                (out->flags == AVI_P_FRAME)? "P" : (out->flags == AVI_B_FRAME)? "B" : (out->flags == AVI_KEY_FRAME)? "I" : "?",
+                (_pkt->flags & AV_PKT_FLAG_KEY)? 1 : 0);
+    }
+    r = _pkt->size;
+    av_packet_unref(_pkt);
     return r;
 }
 /**
@@ -396,9 +447,9 @@
     int w,h;
     w=info->width;
     h=info->height;
-    if(targetColorSpace!=ADM_COLOR_YV12)
+    if(targetPixFrmt!=ADM_PIXFRMT_YV12)
     {
-        colorSpace=new ADMColorScalerSimple(w,h,ADM_COLOR_YV12,targetColorSpace);
+        colorSpace=new ADMColorScalerSimple(w,h,ADM_PIXFRMT_YV12,targetPixFrmt);
         if(!colorSpace)
         {
             printf("[ADM_jpegEncoder] Cannot allocate colorspace\n");
@@ -499,26 +550,7 @@
 */
 bool ADM_coreVideoEncoderFFmpeg::postEncode(ADMBitstream *out, uint32_t size)
 {
-    int pict_type=AV_PICTURE_TYPE_P;
-    int keyframe=false;
-    if(_context->coded_frame)
-    {
-        pict_type=_context->coded_frame->pict_type;
-    }else
-    {
-        out->len=0;
-        ADM_warning("No picture...\n");
-        return false;
-    }
-    if(packetFlags & AV_PKT_FLAG_KEY)
-        keyframe=true;
-    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d %p\n",out->out_quantizer,pict_type,keyframe,_context->coded_frame);
     out->len=size;
-    out->flags=0;
-    if(keyframe)
-        out->flags=AVI_KEY_FRAME;
-    else if(pict_type==AV_PICTURE_TYPE_B)
-        out->flags=AVI_B_FRAME;
 
     // Update PTS/Dts
     if(!_context->max_b_frames)
@@ -547,14 +579,6 @@
 
     aprintf("Codec>Out pts=%" PRIu64" us, out Dts=%" PRIu64"\n",out->pts,out->dts);
 
-    // Update quant
-    if(!_context->coded_frame->quality)
-      out->out_quantizer=(int) floor (_frame->quality / (float) FF_QP2LAMBDA);
-    else
-      out->out_quantizer =(int) floor (_context->coded_frame->quality / (float) FF_QP2LAMBDA);
-
-
-
     // Update stats
     if(Settings.params.mode==COMPRESS_2PASS   || Settings.params.mode==COMPRESS_2PASS_BITRATE)
     {

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h Changed

@@ -7,11 +7,14 @@
 
 ADM_COREVIDEOFILTER6_EXPORT bool ADM_vf_clearFilters(void);
 ADM_COREVIDEOFILTER6_EXPORT ADM_vf_plugin *ADM_vf_getPluginFromTag(uint32_t tag);
+ADM_COREVIDEOFILTER6_EXPORT bool ADM_vf_duplicateFilterAtIndex(IEditor *editor, int index);
 ADM_COREVIDEOFILTER6_EXPORT bool ADM_vf_removeFilterAtIndex(int index);
+ADM_COREVIDEOFILTER6_EXPORT bool ADM_vf_toggleFilterEnabledAtIndex(int index);
 ADM_COREVIDEOFILTER6_EXPORT bool ADM_vf_recreateChain(void);
 ADM_COREVIDEOFILTER6_EXPORT ADM_coreVideoFilter *ADM_vf_createFromTag(uint32_t tag, ADM_coreVideoFilter *last, CONFcouple *couples);
 ADM_COREVIDEOFILTER6_EXPORT ADM_VideoFilterElement* ADM_vf_insertFilterFromTag(IEditor *editor, uint32_t tag, CONFcouple *c, int index);
 ADM_COREVIDEOFILTER6_EXPORT ADM_VideoFilterElement* ADM_vf_addFilterFromTag(IEditor *editor, uint32_t tag, CONFcouple *c, bool configure);
 ADM_coreVideoFilter *ADM_vf_getLastVideoFilter(IEditor *editor);
+ADM_COREVIDEOFILTER6_EXPORT void ADM_vf_rebuildBridge(IEditor *editor);
 
 #endif

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h Changed

@@ -37,6 +37,7 @@
 typedef VF_CATEGORY       (ADM_vf_getCategory)(void);
 typedef void              (ADM_vf_getDefaultConfiguration)(CONFcouple **c);
 typedef bool              (ADM_vf_partializable)(void);
+typedef bool              (ADM_vf_bwrdCompatMapper)(std::string &oldname, CONFcouple **c);
 
 /**
  *  \class ADM_vf_plugin
@@ -56,6 +57,7 @@
         ADM_vf_GetString            *getDisplayName;
         ADM_vf_getCategory          *getCategory;
         ADM_vf_partializable        *partializable;
+        ADM_vf_bwrdCompatMapper     *redirector;
 
         const char                  *nameOfLibrary;
         VF_FILTERS                  tag;
@@ -117,7 +119,11 @@
     }\
     }
 
-    
-#define DECLARE_VIDEO_FILTER(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,false) 
-#define DECLARE_VIDEO_FILTER_PARTIALIZABLE(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,true) 
-    
+#define NOREDIRECTOR \
+extern "C" { \
+    ADM_PLUGIN_EXPORT bool redirector(std::string &oldname, CONFcouple **c) { UNUSED_ARG(oldname); UNUSED_ARG(c); return false; } \
+}
+#define DECLARE_VIDEO_FILTER(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) \
+    DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,false) NOREDIRECTOR
+#define DECLARE_VIDEO_FILTER_PARTIALIZABLE(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc) \
+    DECLARE_VIDEO_FILTER_INTERNAL(Class,Major,Minor,Patch,UI,category,internalName,displayName,Desc,true) NOREDIRECTOR

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h Changed

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_coreVideoFilterFunc.cpp Changed

@@ -58,6 +58,38 @@
 }
 
 /**
+    \fn ADM_vf_duplicateFilterAtIndex
+
+*/
+bool ADM_vf_duplicateFilterAtIndex(IEditor *editor, int index)
+{
+    ADM_info("Duplicate video filter at index %d\n", index);
+
+    ADM_assert(index < ADM_VideoFilters.size());
+    
+    ADM_VideoFilterElement *e = &(ADM_VideoFilters[index]);
+    CONFcouple *conf=NULL;
+    if(!e->instance->getCoupledConf (&conf))
+    {
+        ADM_warning("Cannot get configuration\n");
+        return false;
+    }
+    
+    ADM_coreVideoFilter *last = ADM_vf_getLastVideoFilter(editor);
+    ADM_coreVideoFilter *nw = ADM_vf_createFromTag(e->tag, last, conf);
+
+    if (!nw) return NULL;
+
+    ADM_VideoFilterElement ne;
+    ne.tag = e->tag;
+    ne.enabled = e->enabled;
+    ne.instance = nw;
+    ne.objectId = objectCount++;
+    ADM_VideoFilters.append(ne);
+
+    return ADM_vf_recreateChain();
+}
+/**
     \fn ADM_vf_removeFilterAtIndex
 
 */
@@ -76,6 +108,21 @@
 }
 
 /**
+    \fn ADM_vf_toggleFilterEnabledAtIndex
+
+*/
+bool ADM_vf_toggleFilterEnabledAtIndex(int index)
+{
+    ADM_info("Toggle video filter enabled at index %d\n", index);
+
+    ADM_assert(index < ADM_VideoFilters.size());
+
+    ADM_VideoFilterElement *e = &(ADM_VideoFilters[index]);
+    e->enabled = !e->enabled;
+
+    return  ADM_vf_recreateChain();
+}
+/**
     \fn ADM_vf_recreateChain
     \brief Rebuild the whole filterchain
 */
@@ -92,12 +139,14 @@
         CONFcouple *c;
         ADM_coreVideoFilter *old = ADM_VideoFilters[i].instance;
         uint32_t tag = ADM_VideoFilters[i].tag;
+        bool enabled = ADM_VideoFilters[i].enabled;
 
         old->getCoupledConf(&c);
 
         ADM_coreVideoFilter *nw = ADM_vf_createFromTag(tag, f, c);
 
         ADM_VideoFilters[i].instance = nw;
+        ADM_VideoFilters[i].enabled = enabled;
         bin.append(old);
 
         if (c)
@@ -105,7 +154,7 @@
             delete c;
         }
 
-        f = nw;
+        if (enabled) f = nw;
     }
 
     // Now delete bin
@@ -136,12 +185,17 @@
 */
 ADM_VideoFilterElement* ADM_vf_addFilterFromTag(IEditor *editor, uint32_t tag, CONFcouple *c, bool configure)
 {
+    if (tag == VF_INVALID_FILTER)
+        return NULL;
+
     ADM_info("Creating video filter using tag %" PRIu32" \n", tag);
     // Fetch the descriptor...
 
     ADM_coreVideoFilter *last = ADM_vf_getLastVideoFilter(editor);
     ADM_coreVideoFilter *nw = ADM_vf_createFromTag(tag, last, c);
 
+    if (!nw) return NULL;
+
     if (configure && nw->configure() == false)
     {
         delete nw;
@@ -150,6 +204,7 @@
 
     ADM_VideoFilterElement e;
     e.tag = tag;
+    e.enabled = true;
     e.instance = nw;
     e.objectId = objectCount++;
     ADM_VideoFilters.append(e);
@@ -164,9 +219,13 @@
 
     ADM_coreVideoFilter *last = ADM_vf_getLastVideoFilter(editor);
     ADM_coreVideoFilter *nw = ADM_vf_createFromTag(tag, last, c);
+
+    if (!nw) return NULL;
+
     ADM_VideoFilterElement e;
 
     e.tag = tag;
+    e.enabled = true;
     e.instance = nw;
     e.objectId = objectCount++;
 
@@ -195,8 +254,28 @@
     }
     else
     {
-        last = ADM_VideoFilters[ADM_VideoFilters.size() - 1].instance;
+        last = bridge;
+        for (int i=(ADM_VideoFilters.size() - 1); i>=0; i--)
+        {
+            if (ADM_VideoFilters[i].enabled)
+            {
+                last = ADM_VideoFilters[i].instance;
+                break;
+            }
+        }
     }
 
     return last;
 }
+
+/**
+    \fn rebuildBridge
+*/
+void ADM_vf_rebuildBridge(IEditor *editor)
+{
+    if (!bridge)
+        return;
+    delete bridge;
+    bridge = new ADM_videoFilterBridge(editor, 0, -1LL);
+    ADM_vf_recreateChain();
+}

avidemux_2.7.8.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp -> avidemux_2.8.0.tar.gz/avidemux_core/ADM_coreVideoFilter/src/ADM_videoFilterBridge.cpp Changed

@@ -19,6 +19,7 @@
 #include "ADM_cpp.h"
 #include "ADM_default.h"
 #include "ADM_videoFilterBridge.h"
+#include "ADM_vidMisc.h"
 
 /**
     \fn ADM_videoFilterBridge
@@ -26,17 +27,19 @@
 */
 ADM_videoFilterBridge::ADM_videoFilterBridge(IEditor *editor, uint64_t startTime, uint64_t endTime) : ADM_coreVideoFilter(NULL, NULL)
 {
-    printf("[VideoFilterBridge] Creating bridge from %" PRIu32" s to %" PRIu32" s\n", (uint32_t)(startTime / 1000000LL), (uint32_t)(endTime / 1000000LL));
-    this->startTime = startTime;
+    printf("[VideoFilterBridge] Creating instance at %p ",this);
     this->editor = editor;
 
-    if (endTime == -1LL)
+    if (endTime == ADM_NO_PTS)
     {
-        uint64_t total = editor->getVideoDuration();
-        endTime = total - startTime + 1;
+        printf("using video duration ");
+        endTime = editor->getVideoDuration();
+        if(endTime < startTime) startTime = endTime;
     }
-
+    this->startTime = startTime;
     this->endTime = endTime;
+    printf("from %s ",ADM_us2plain(this->startTime));
+    printf("to %s\n",ADM_us2plain(this->endTime));
     myName = "Bridge";
     aviInfo fo;
     editor->getVideoInfo(&fo);
@@ -45,6 +48,9 @@
     bridgeInfo.frameIncrement = editor->getFrameIncrement();
     editor->getTimeBase(&(bridgeInfo.timeBaseNum), &(bridgeInfo.timeBaseDen));
     bridgeInfo.totalDuration = endTime - startTime;
+    bridgeInfo.markerA = editor->getMarkerAPts();
+    bridgeInfo.markerB = editor->getMarkerBPts();
+    
     rewind();
 }
 
@@ -80,7 +86,7 @@
     // Translate pts if any
     int64_t pts = image->Pts;
 
-    if (pts > endTime)
+    if (pts >= endTime)
     {
         ADM_warning("[VideoBridge] This frame is too late (%" PRId64" vs %" PRIu64")\n", pts, endTime);
         return false;
@@ -112,7 +118,7 @@
 */
 ADM_videoFilterBridge::~ADM_videoFilterBridge()
 {
-
+    printf("[VideoFilterBridge] Destroying instance at %p\n",this);
 }
 /**
     \fn getNextFrame

avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-4.4.1.tar.bz2 Added

avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavcodec_nvenc.c.patch Changed

avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/attic/libavformat_isom.c.patch Changed

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/common.mak.diff -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/common.mak.diff Changed

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ac3_h.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ac3_h.patch Changed

avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_slice.c.patch Added

@@ -0,0 +1,28 @@
+This patch reverts FFmpeg commit 99042c2bf6cc79006036502a6abbec5e51f73673
+(avcodec/h264_slice: don't copy frame data during error concealment) which
+broke error concealment with VDPAU.
+--- libavcodec/h264_slice.c.orig	2021-09-23 00:08:25.824670926 +0200
++++ libavcodec/h264_slice.c	2021-09-23 02:15:54.725778422 +0200
+@@ -1603,15 +1603,14 @@
+                 ff_thread_await_progress(&prev->tf, INT_MAX, 0);
+                 if (prev->field_picture)
+                     ff_thread_await_progress(&prev->tf, INT_MAX, 1);
+-                ff_thread_release_buffer(h->avctx, &h->short_ref[0]->tf);
+-                h->short_ref[0]->tf.f = h->short_ref[0]->f;
+-                ret = ff_thread_ref_frame(&h->short_ref[0]->tf, &prev->tf);
+-                if (ret < 0)
+-                    return ret;
++                av_image_copy(h->short_ref[0]->f->data,
++                              h->short_ref[0]->f->linesize,
++                              (const uint8_t **)prev->f->data,
++                              prev->f->linesize,
++                              prev->f->format,
++                              prev->f->width,
++                              prev->f->height);
+                 h->short_ref[0]->poc = prev->poc + 2U;
+-                ff_thread_report_progress(&h->short_ref[0]->tf, INT_MAX, 0);
+-                if (h->short_ref[0]->field_picture)
+-                    ff_thread_report_progress(&h->short_ref[0]->tf, INT_MAX, 1);
+             } else if (!h->frame_recovered && !h->avctx->hwaccel)
+                 ff_color_frame(h->short_ref[0]->f, c);
+             h->short_ref[0]->frame_num = h->poc.prev_frame_num;

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch Changed

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_internal_h_msvc.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_internal_h_msvc.patch Changed

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_mpegvideo_enc.c.patch Changed

@@ -1,35 +1,37 @@
---- libavcodec/mpegvideo_enc.c.orig	2017-10-15 17:59:37.000000000 +0200
-+++ libavcodec/mpegvideo_enc.c	2017-10-20 21:57:43.603220578 +0200
-@@ -507,14 +507,14 @@
+--- libavcodec/mpegvideo_enc.c.orig	2021-10-24 22:47:11.000000000 +0200
++++ libavcodec/mpegvideo_enc.c	2021-11-14 00:21:19.754422853 +0100
+@@ -528,14 +528,14 @@
                 "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "
                 "specified vbv buffer is too large for the given bitrate!\n");
      }
 -
 +#if 0 // MEANX
-     if ((s->avctx->flags & AV_CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
+     if ((avctx->flags & AV_CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
          s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&
          s->codec_id != AV_CODEC_ID_FLV1) {
          av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
-         return -1;
+         return AVERROR(EINVAL);
      }
 -
 +#endif // MEANX
-     if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
+     if (s->obmc && avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
          av_log(avctx, AV_LOG_ERROR,
                 "OBMC is only supported with simple mb decision\n");
-@@ -615,13 +615,14 @@
+@@ -634,7 +634,7 @@
+         s->mpeg_quant = 1;
+     FF_ENABLE_DEPRECATION_WARNINGS
  #endif
- 
-     // FIXME mpeg2 uses that too
+-
 +#if 0 // MEANX
+     // FIXME mpeg2 uses that too
      if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
                            && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
-         av_log(avctx, AV_LOG_ERROR,
+@@ -642,7 +642,7 @@
                 "mpeg2 style quantization not supported by codec\n");
-         return -1;
+         return AVERROR(EINVAL);
      }
 -
 +#endif // MEANX
      if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {
          av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
-         return -1;
+         return AVERROR(EINVAL);

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_nvenc.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/nvenc.c.orig	2019-09-08 19:21:09.585572028 +0200
-+++ libavcodec/nvenc.c	2019-09-08 19:21:09.590571998 +0200
-@@ -43,12 +43,12 @@
+--- libavcodec/nvenc.c.orig	2021-10-24 22:47:11.000000000 +0200
++++ libavcodec/nvenc.c	2021-11-14 00:21:19.771422746 +0100
+@@ -47,12 +47,12 @@
      AV_PIX_FMT_YUV420P,
      AV_PIX_FMT_NV12,
      AV_PIX_FMT_P010,
@@ -19,7 +19,7 @@
  #if CONFIG_D3D11VA
      AV_PIX_FMT_D3D11,
  #endif
-@@ -1243,12 +1243,13 @@
+@@ -1404,12 +1404,13 @@
  {
      switch (pix_fmt) {
      case AV_PIX_FMT_YUV420P:
@@ -34,7 +34,7 @@
      case AV_PIX_FMT_YUV444P:
          return NV_ENC_BUFFER_FORMAT_YUV444_PL;
      case AV_PIX_FMT_YUV444P16:
-@@ -1257,6 +1258,7 @@
+@@ -1418,6 +1419,7 @@
          return NV_ENC_BUFFER_FORMAT_ARGB;
      case AV_PIX_FMT_0BGR32:
          return NV_ENC_BUFFER_FORMAT_ABGR;
@@ -42,7 +42,7 @@
      default:
          return NV_ENC_BUFFER_FORMAT_UNDEFINED;
      }
-@@ -1522,10 +1524,33 @@
+@@ -1688,10 +1690,33 @@
      av_fifo_generic_read(ctx->unused_surface_queue, &tmp_surf, sizeof(tmp_surf), NULL);
      return tmp_surf;
  }
@@ -76,7 +76,7 @@
      int dst_linesize[4] = {
          lock_buffer_params->pitch,
          lock_buffer_params->pitch,
-@@ -1551,6 +1576,34 @@
+@@ -1717,6 +1742,34 @@
                    avctx->width, avctx->height);
  
      return 0;

avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_ratecontrol.patch Added

avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_videotoolboxenc.patch Added

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch Changed

@@ -1,15 +1,15 @@
---- libavformat/matroskaenc.c.orig	2019-08-05 22:52:21.000000000 +0200
-+++ libavformat/matroskaenc.c	2019-09-08 19:48:09.874774972 +0200
-@@ -627,6 +627,8 @@
- 
- static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par)
+--- libavformat/matroskaenc.c.orig	2021-04-08 23:28:40.000000000 +0200
++++ libavformat/matroskaenc.c	2021-04-22 19:59:01.050122387 +0200
+@@ -603,6 +603,8 @@
+ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb,
+                               const AVCodecParameters *par)
  {
 +#if 0 // MEANX avidemux does thing differently
 +
      const uint8_t *header_start[3];
      int header_len[3];
      int first_header_size;
-@@ -651,6 +653,29 @@
+@@ -628,6 +630,29 @@
          avio_write(pb, header_start[j], header_len[j]);
  
      return 0;
@@ -38,31 +38,4 @@
 +
  }
  
- static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par)
-@@ -1213,7 +1238,25 @@
-     put_ebml_uint (pb, MATROSKA_ID_TRACKUID,
-                    mkv->is_dash ? mkv->dash_track_number : i + 1);
-     put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0);    // no lacing (yet)
--
-+#if  0 // TODO FIXME
-+	/**  MEANX : Add a default duration for video **/
-+	if(par->codec_type==AVMEDIA_TYPE_VIDEO)
-+	{
-+		if(par->time_base.den && par->time_base.num)
-+		{
-+			int num = par->time_base.num;
-+			int den = par->time_base.den;
-+			unsigned int default_duration;
-+			float period = num;
-+
-+			period /= den;
-+			period *= 1000*1000*1000; // in ns
-+			default_duration = (unsigned int)floor(period);
-+			put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, default_duration);
-+		}
-+	}
-+	/**  MEANX : Add a default duration for video **/
-+#endif
-     if ((tag = av_dict_get(st->metadata, "title", NULL, 0)))
-         put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
-     tag = av_dict_get(st->metadata, "language", NULL, 0);
+ static int put_wv_codecpriv(AVIOContext *pb, const AVCodecParameters *par)

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch Changed

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch Changed

avidemux_2.7.8.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch -> avidemux_2.8.0.tar.gz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch Changed

@@ -1,5 +1,5 @@
---- libavutil/log.c.orig	2018-04-20 12:02:58.000000000 +0200
-+++ libavutil/log.c	2018-07-16 20:28:17.928746112 +0200
+--- libavutil/log.c.orig	2020-07-11 12:39:30.000000000 +0200
++++ libavutil/log.c	2021-04-22 20:27:47.604676518 +0200
 @@ -39,6 +39,7 @@
  #include "common.h"
  #include "internal.h"
@@ -14,29 +14,25 @@
  static int use_color = -1;
 -
 +static AV_FATAL_HANDLER *fatalHandler=NULL; // MEANX
- static void check_color_terminal(void)
+ #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE
+ static void win_console_puts(const char *str)
  {
- #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE
-@@ -433,3 +434,22 @@
+@@ -488,3 +489,18 @@
      missing_feature_sample(0, avc, msg, argument_list);
      va_end(argument_list);
  }
-+// MEANX
 +
-+void av_fatalHandler(const char *why,const char *filez, int lineno)
++// 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);
++    if(!fatalHandler)
++        printf("[CRASH] %s, file %s, lineno=%d\n",why,filez,lineno);
++    else
++        (fatalHandler)(why,lineno,filez);
 +}
++
 +void av_setFatalHandler(AV_FATAL_HANDLER *func)
 +{
-+        fatalHandler=func;
++    fatalHandler=func;
 +}
 +//
-+
-+
-+
-+

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp Changed

@@ -64,6 +64,8 @@
             bool        decodeToS32(float **outptr,uint32_t *nbOut);
             bool        decodeToFloatPlanarStereo(float **outptr,uint32_t *nbOut);
 
+            bool        setChannelMapping(void);
+
 public:
                         ADM_AudiocoderLavcodec(uint32_t fourcc, WAVHeader *info, uint32_t l, uint8_t *d);
     virtual             ~ADM_AudiocoderLavcodec() ;
@@ -83,6 +85,7 @@
 static  ad_supportedFormat Formats[]={
         {WAV_WMA,AD_MEDIUM_QUAL},
         {WAV_WMAPRO,AD_MEDIUM_QUAL},
+        {WAV_WMALOSSLESS,AD_MEDIUM_QUAL},
         {WAV_QDM2,AD_MEDIUM_QUAL},
         {WAV_AMV_ADPCM,AD_MEDIUM_QUAL},
         {WAV_NELLYMOSER,AD_MEDIUM_QUAL},
@@ -95,6 +98,7 @@
         {0x706D,AD_HIGH_QUAL},
         {WAV_EAC3,AD_MEDIUM_QUAL},
         {WAV_OGG_VORBIS,AD_HIGH_QUAL},
+        {WAV_TRUEHD,AD_MEDIUM_QUAL}
 };
 
 DECLARE_AUDIO_DECODER(ADM_AudiocoderLavcodec,						// Class
@@ -138,6 +142,9 @@
       case WAV_WMAPRO:
         codecID = AV_CODEC_ID_WMAPRO;
         break;
+      case WAV_WMALOSSLESS:
+        codecID = AV_CODEC_ID_WMALOSSLESS;
+        break;
       case WAV_WMA:
         codecID = AV_CODEC_ID_WMAV2;
         break;
@@ -185,6 +192,9 @@
         codecID = AV_CODEC_ID_AAC;
         _blockalign = 1;
         break;
+      case WAV_TRUEHD:
+        codecID = AV_CODEC_ID_TRUEHD;
+        break;
       default:
              ADM_assert(0);
     }   
@@ -526,7 +536,6 @@
                 ADM_warning("[ADM_ad_lav] decoding error %d: %s\n",res,er);
                 break;
             }
-
             if(_context->sample_rate!=outputFrequency)
             {
                 if(!frequencyChecked)
@@ -547,6 +556,11 @@
                 nbChannelsChecked=true;
                 reconfigureNeeded=true;
             }
+            if(reconfigureNeeded && _context->channels == channels && _context->sample_rate == outputFrequency)
+            {
+                ADM_info("Output frequency and # of channels match again, cancelling the reconfigure request\n");
+                reconfigureNeeded = false;
+            }
 
             bool invalid=false;
             int  toCheck=1;
@@ -598,32 +612,42 @@
         }
     }
 
-    if(channels>=5)
-    {
-        CHANNEL_TYPE *p_ch_type = channelMapping;
-        if(!_context->channel_layout)
-            _context->channel_layout=av_get_default_channel_layout(channels);
+    setChannelMapping();
+
+    return 1;
+}
+
+/**
+    \fn setChannelMapping
+*/
+bool ADM_AudiocoderLavcodec::setChannelMapping(void)
+{
+    memset(channelMapping,0,sizeof(CHANNEL_TYPE) * MAX_CHANNELS);
+
+    CHANNEL_TYPE *p_ch_type = channelMapping;
+    if(!_context->channel_layout)
+        _context->channel_layout=av_get_default_channel_layout(channels);
 #define HAVE(chan) (_context->channel_layout & AV_CH_ ##chan)
 #define MAPIT(chan) *(p_ch_type++)=ADM_CH_ ##chan;
 #define DOIT(x,y) if HAVE(x) MAPIT(y)
-        DOIT(FRONT_LEFT,FRONT_LEFT)
-        DOIT(FRONT_RIGHT,FRONT_RIGHT)
-        DOIT(FRONT_CENTER,FRONT_CENTER)
-        DOIT(LOW_FREQUENCY,LFE)
-        if(HAVE(SIDE_LEFT) && !HAVE(BACK_LEFT))
-            MAPIT(REAR_LEFT) // see https://trac.ffmpeg.org/ticket/3160
-        if(HAVE(SIDE_RIGHT) && !HAVE(BACK_RIGHT))
-            MAPIT(REAR_RIGHT)
-        DOIT(BACK_LEFT,REAR_LEFT)
-        DOIT(BACK_RIGHT,REAR_RIGHT)
-        if(HAVE(SIDE_LEFT) && HAVE(BACK_LEFT))
-            MAPIT(SIDE_LEFT)
-        if(HAVE(SIDE_RIGHT) && HAVE(BACK_RIGHT))
-            MAPIT(SIDE_RIGHT)
-    }
+    DOIT(FRONT_LEFT,FRONT_LEFT)
+    DOIT(FRONT_RIGHT,FRONT_RIGHT)
+    DOIT(FRONT_CENTER,FRONT_CENTER)
+    DOIT(LOW_FREQUENCY,LFE)
+    if(HAVE(SIDE_LEFT) && !HAVE(BACK_LEFT))
+        MAPIT(REAR_LEFT) // see https://trac.ffmpeg.org/ticket/3160
+    if(HAVE(SIDE_RIGHT) && !HAVE(BACK_RIGHT))
+        MAPIT(REAR_RIGHT)
+    DOIT(BACK_LEFT,REAR_LEFT)
+    DOIT(BACK_RIGHT,REAR_RIGHT)
+    if(HAVE(SIDE_LEFT) && HAVE(BACK_LEFT))
+        MAPIT(SIDE_LEFT)
+    if(HAVE(SIDE_RIGHT) && HAVE(BACK_RIGHT))
+        MAPIT(SIDE_RIGHT)
 
-    return 1;
+    return true;
 }
+
 /**
     \fn getOutputFrequency
     \brief return sampling rate as seen by libavcodec
@@ -654,6 +678,7 @@
     if(false==updateChannels(_context->channels))
         return false;
     channels=_context->channels;
+    setChannelMapping();
     reconfigureNeeded=false;
     frequencyChecked=false;
     nbChannelsChecked=false;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp Changed

@@ -2,8 +2,8 @@
                           ADM_deviceAlsa.cpp  -  description
                              -------------------
 
-	Strongly derivated from code sample from alsa-project.org with some bits
-		from mplayer concerning the swparams
+    Strongly derivated from code sample from alsa-project.org with some bits
+        from mplayer concerning the swparams
 
     begin                : Sat Sep 28 2002
     copyright            : (C) 2002 by mean
@@ -58,20 +58,29 @@
 /* Handle for the PCM device */
 snd_pcm_t *pcm_handle;
 
-    alsaAudioDevice::alsaAudioDevice( void )
-    {
-		_init=0;
-    }
+alsaAudioDevice::alsaAudioDevice( void )
+{
+    _init=0;
+    volumeHack=0;
+    softVolumeBuffer = NULL;
+}
+
+alsaAudioDevice::~alsaAudioDevice( void )
+{
+    if (softVolumeBuffer)
+        delete [] softVolumeBuffer;
+    softVolumeBuffer = NULL;
+}
 /**
     \fn localInit
     \brief
 */
 bool alsaAudioDevice::localInit( void )
 {
-	int dir=0;
+    int dir=0;
 
 
-	_init=0;
+    _init=0;
    /* Playback stream */
     snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
 
@@ -84,7 +93,7 @@
 
   static char *pcm_name;
 //  if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &pcm_name) != RC_OK )
-               pcm_name = ADM_strdup(ADEVICE);
+        pcm_name = ADM_strdup(ADEVICE);
     printf("[Alsa] Using device :%s\n",pcm_name);
  /* Allocate the snd_pcm_hw_params_t structure on the stack. */
     snd_pcm_hw_params_alloca(&hwparams);
@@ -97,16 +106,16 @@
     /* specified, SIGIO will be emitted whenever a period has     */
     /* been completely processed by the soundcard.                */
     if (snd_pcm_open(&pcm_handle, pcm_name, stream, 0*SND_PCM_NONBLOCK) < 0) {
-      fprintf(stderr, "[Alsa]Error opening PCM device %s\n", pcm_name);
-      return(0);
+        fprintf(stderr, "[Alsa]Error opening PCM device %s\n", pcm_name);
+        return(0);
     }
     // past this point we got _init=1 -> partially initialized
     _init=1;
       /* Init hwparams with full configuration space */
     if (snd_pcm_hw_params_any(pcm_handle, hwparams) < 0) {
-      fprintf(stderr, "[Alsa]Can not configure this PCM device.\n");
-      ADM_dealloc(pcm_name);
-      return(0);
+        fprintf(stderr, "[Alsa]Can not configure this PCM device.\n");
+        ADM_dealloc(pcm_name);
+        return(0);
     }
     ADM_dealloc(pcm_name);
     /* Set access type. This can be either    */
@@ -116,8 +125,8 @@
     /* access, but this is beyond the scope   */
     /* of this introduction.                  */
     if (snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0) {
-      fprintf(stderr, "[Alsa]Error setting access.\n");
-      return(0);
+        fprintf(stderr, "[Alsa]Error setting access.\n");
+        return(0);
     }
 
     /* Set sample format */
@@ -130,27 +139,27 @@
     if (snd_pcm_hw_params_set_format(pcm_handle, hwparams, SND_PCM_FORMAT_S16_LE) < 0)
 #endif
     {
-      fprintf(stderr, "[Alsa]Error setting format.\n");
-      return(0);
+        fprintf(stderr, "[Alsa]Error setting format.\n");
+        return(0);
     }
-	//}
+    //}
     /* Set sample rate. If the exact rate is not supported */
     /* by the hardware, use nearest possible rate.         */
     int exact_rate;
     dir=0;
     exact_rate = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &_frequency, &dir);
     if (dir != 0) {
-      fprintf(stderr, "[Alsa]The rate %" PRIu32" Hz is not supported by your hardware.\n  ==> Using %d Hz instead.\n", _frequency, exact_rate);
+        fprintf(stderr, "[Alsa]The rate %" PRIu32" Hz is not supported by your hardware.\n  ==> Using %d Hz instead.\n", _frequency, exact_rate);
     }
 
     /* Set number of channels */
     if (snd_pcm_hw_params_set_channels(pcm_handle, hwparams, _channels) < 0) {
-      fprintf(stderr, "[Alsa]Error setting channels.\n");
-      return(0);
+        fprintf(stderr, "[Alsa]Error setting channels.\n");
+        return(0);
     }
 #if 0
-    	uint32_t periods= _frequency*2*channel*10;
-	uint32_t periodsize=1;
+        uint32_t periods= _frequency*2*channel*10;
+    uint32_t periodsize=1;
     /* Set number of periods. Periods used to be called fragments. */
     if (snd_pcm_hw_params_set_periods(pcm_handle, hwparams, periods, 0) < 0) {
       fprintf(stderr, "[Alsa]Error setting periods.\n");
@@ -158,27 +167,27 @@
     }
 #else
 
- 	unsigned int buffer_time = 1000LL*1000LL; // 60 Ms ?
-	int er;
-	unsigned int buff;
-	dir=0;
-
-	if ((er=snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time, &dir)) < 0)
-	  {
-	    printf("[Alsa]Error : hw_params_set_buffer_time\n");
-	    return(0);
-	  }
-	  // unsigned ?
-	  dir=0;
-	  buff=buffer_time>>2;
-	snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &buff, &dir) ;
+    unsigned int buffer_time = 100LL*1000LL; // 60 Ms ?
+    int er;
+    unsigned int buff;
+    dir=0;
+
+    if ((er=snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time, &dir)) < 0)
+    {
+        printf("[Alsa]Error : hw_params_set_buffer_time\n");
+        return(0);
+    }
+    // unsigned ?
+    dir=0;
+    buff=buffer_time>>2;
+    snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &buff, &dir) ;
 #if 0
-	if (snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, buffer_time>>2, 0) < 0)
-	  /* original: alsa_buffer_time/ao_data.bps */
-	  {
-	    printf("[Alsa]Error : hw_params_set_period_time\n");
-	    return(0);
-	  }
+    if (snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, buffer_time>>2, 0) < 0)
+      /* original: alsa_buffer_time/ao_data.bps */
+      {
+        printf("[Alsa]Error : hw_params_set_period_time\n");
+        return(0);
+      }
 #endif
 #endif
 
@@ -191,37 +200,39 @@
     /* Apply HW parameter settings to */
     /* PCM device and prepare device  */
     if (snd_pcm_hw_params(pcm_handle, hwparams) < 0) {
-      fprintf(stderr, "[Alsa]Error setting HW params.\n");
-      return(0);
+        fprintf(stderr, "[Alsa]Error setting HW params.\n");
+        return(0);
+    }
+
+    if (snd_pcm_sw_params_current(pcm_handle, swparams) < 0)
+    {
+        printf("[Alsa]Error setting SW params.\n");
+        return(0);
     }
 
- 	if (snd_pcm_sw_params_current(pcm_handle, swparams) < 0)
-	    {
-	      printf("[Alsa]Error setting SW params.\n");
-	      return(0);
-	    }
+    // be sure that playback starts immediatly (or near)
+    if (snd_pcm_sw_params_set_avail_min(pcm_handle, swparams, 4) < 0)
+    {
+        printf("[Alsa]Error setting set_avail_min \n");
+        return(0);
+    }
 
- 	// be sure that playback starts immediatly (or near)
-	  if (snd_pcm_sw_params_set_avail_min(pcm_handle, swparams, 4) < 0)
-	    {
-	      printf("[Alsa]Error setting set_avail_min \n");
-	      return(0);
-	    }
+    if (snd_pcm_sw_params(pcm_handle, swparams) < 0)
+    {
+        printf("[Alsa]Error:snd_pcm_sw_params\n ");
+        return(0);
+    }
 
-	  if (snd_pcm_sw_params(pcm_handle, swparams) < 0)
-	    {
-	      printf("[Alsa]Error:snd_pcm_sw_params\n ");
-	      return(0);
-	    }
 
+    if ( snd_pcm_prepare(pcm_handle) < 0)
+    {
+        printf("[Alsa]Error : snd_pcm_prepare\n");
+        return(0);
+    }
 
-      if ( snd_pcm_prepare(pcm_handle) < 0)
-	{
-	  printf("[Alsa]Error : snd_pcm_prepare\n");
-	  return(0);
-	}
+    printf("[Alsa]Success initializing: fq :%u channel %u\n", _frequency,_channels);
 
-        printf("[Alsa]Success initializing: fq :%u channel %u\n", _frequency,_channels);
+    softVolumeBuffer = new int16_t[sizeOf10ms];
 
     // 2=fully initialized
     _init=2;
@@ -234,61 +245,85 @@
 */
 void alsaAudioDevice::sendData(void)
 {
-	/* Write num_frames frames from buffer data to    */
-	/* the PCM device pointed to by pcm_handle.       */
-	/* Returns the number of frames actually written. */
-    if(2!=_init) return ;
+    /* Write num_frames frames from buffer data to    */
+    /* the PCM device pointed to by pcm_handle.       */
+    /* Returns the number of frames actually written. */
+    if(2!=_init) return;
     uint32_t lenInBytes,lenInSample;
     lenInBytes=sizeOf10ms*2; // 20 ms at a time
     mutex.lock();
     uint32_t avail;
 _again:
 
-	avail=wrIndex-rdIndex;
+    avail=wrIndex-rdIndex;
 
     if(lenInBytes>avail) lenInBytes=avail;
     lenInSample=lenInBytes/(_channels*2);
     if(!lenInSample)
     {
-       // printf("[Alsa] Underflow\n");
+        // printf("[Alsa] Underflow\n");
         mutex.unlock();
         return ;
     }
-        uint8_t *start=audioBuffer.at(rdIndex);
-        int ret;
-
-        mutex.unlock(); // There is a race here....
-       	ret=snd_pcm_writei(pcm_handle,start, lenInSample);
-        mutex.lock();
-		if(ret==(int)lenInSample)
-		{
-			rdIndex+=lenInSample*2*_channels;
-            mutex.unlock();
-            return ;
-		}
-
-		if(ret<0)
-		{
-			switch(ret)
-			{
-				case    -EAGAIN :
-					//wait a bit to flush datas
-					printf("[Alsa]ALSA EAGAIN\n");
-					snd_pcm_wait(pcm_handle, 1000);
-					goto _again;
-
-				case    -EPIPE:
-					printf("[Alsa]ALSA EPIPE\n");
-					snd_pcm_prepare(pcm_handle);
-					goto _again;
-				default:
-					printf("[Alsa]ALSA Error %d : Play %s (len=%d)\n",ret, snd_strerror(ret),0);
-
-			}
-		}
-
-	mutex.unlock();
-	return ;
+    uint8_t *start;
+    int ret;
+    
+    if ((0 < volumeHack) && (volumeHack < 32768))    // between 0 .. 100%
+    {
+        memcpy(softVolumeBuffer, audioBuffer.at(rdIndex), lenInBytes);
+    }
+
+    if (volumeHack == 32768)    // 100%
+        start=audioBuffer.at(rdIndex);
+    else
+        start = (uint8_t *)softVolumeBuffer;
+
+    mutex.unlock();
+
+    if (0 == volumeHack)    // 0%
+        memset(softVolumeBuffer, 0, lenInBytes);
+    else
+    if (volumeHack < 32768)
+    {
+        for (int i=0; i<lenInSample*_channels; i++)
+        {
+            int32_t vh;
+            vh = softVolumeBuffer[i];
+            vh *= volumeHack;
+            softVolumeBuffer[i] = vh/32768;
+        }
+    }
+
+    ret=snd_pcm_writei(pcm_handle,start, lenInSample);
+    mutex.lock();
+    if(ret==(int)lenInSample)
+    {
+        rdIndex+=lenInSample*2*_channels;
+        mutex.unlock();
+        return ;
+    }
+
+    if(ret<0)
+    {
+        switch(ret)
+        {
+            case -EAGAIN:
+                    //wait a bit to flush datas
+                    printf("[Alsa]ALSA EAGAIN\n");
+                    snd_pcm_wait(pcm_handle, 1000);
+                    goto _again;
+            case -EPIPE:
+                    printf("[Alsa]ALSA EPIPE\n");
+                    snd_pcm_prepare(pcm_handle);
+                    goto _again;
+            default:
+                    printf("[Alsa]ALSA Error %d : Play %s (len=%d)\n",ret, snd_strerror(ret),0);
+
+        }
+    }
+
+    mutex.unlock();
+    return ;
 }
 /**
     \fn getWantedChannelMapping
@@ -326,88 +361,95 @@
  bool alsaAudioDevice::localStop( void )
  {
  // we have at least a partial initialization
- if(_init)
- {
-       /* Stop PCM device and drop pending frames */
-    snd_pcm_drop(pcm_handle);
-    /* Stop PCM device after pending frames have been played */
-    snd_pcm_drain(pcm_handle);
-    snd_pcm_hw_free(pcm_handle);
-    if (snd_pcm_close(pcm_handle) < 0)
+    if(_init)
     {
-        ADM_warning("[Alsa] Troubles closing alsa\n");
-
+        /* Stop PCM device and drop pending frames */
+        snd_pcm_drop(pcm_handle);
+        /* Stop PCM device after pending frames have been played */
+        snd_pcm_drain(pcm_handle);
+        snd_pcm_hw_free(pcm_handle);
+        if (snd_pcm_close(pcm_handle) < 0)
+        {
+            ADM_warning("[Alsa] Troubles closing alsa\n");
+        }
+        snd_config_update_free_global();
     }
-    snd_config_update_free_global();
-  }
-  _init=0;
-  return true;
+    _init=0;
+    return true;
 }
 
 uint8_t alsaAudioDevice::setVolume(int volume){
-  snd_mixer_t *mixer_handle;
-  char *pcm_name;
-  uint32_t which_vol;
-  int rc;
-/*
-	if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &pcm_name) != RC_OK )
-		pcm_name = ADM_strdup("hw:0");
-	if( prefs->get(FEATURE_AUDIOBAR_USES_MASTER,&which_vol) != RC_OK )
-		which_vol = 0;
-*/
-    pcm_name = ADM_strdup("hw:0");
-    which_vol = 0;
-	if( (rc=snd_mixer_open(&mixer_handle,0)) < 0 ){
-		printf("[Alsa]: snd_mixer_open failed: %d\n",rc);
-		ADM_dealloc(pcm_name);
-		return 0;
-	}
-// MEANX: Cannot use the real name, does not work with dmix
-	if( (rc=snd_mixer_attach(mixer_handle,"hw:0")) < 0 ){
-		printf("[Alsa]: snd_mixer_attach failed: %d, %s\n",rc, snd_strerror (rc));
-		snd_mixer_close(mixer_handle);
-		ADM_dealloc(pcm_name);
-		return 0;
-}
-	ADM_dealloc(pcm_name);
-	if( (rc=snd_mixer_selem_register(mixer_handle,NULL,NULL)) < 0 ){
-		printf("[Alsa]: snd_mixer_selem_register failed: %d\n",rc);
-		snd_mixer_close(mixer_handle);
-		return 0;
-	}
-	if( (rc=snd_mixer_load(mixer_handle)) < 0 ){
-		printf("[Alsa]: snd_mixer_load failed: %d\n",rc);
-		snd_mixer_close(mixer_handle);
-		return 0;}
-	{ snd_mixer_elem_t *elem;
-	  snd_mixer_selem_id_t *sid;
-	  const char *str;
-		snd_mixer_selem_id_alloca(&sid);
-		for (elem = snd_mixer_first_elem(mixer_handle);
-		     elem;
-		     elem = snd_mixer_elem_next(elem)) {
-			snd_mixer_selem_get_id(elem, sid);
-			str = snd_mixer_selem_id_get_name(sid);
-			if( (which_vol == 0 && !strcmp(str,"PCM"))   ||
-			    (which_vol == 1 && !strcmp(str,"Master"))  ){
-			  long val=0, min=0, max=0;
-				snd_mixer_selem_get_playback_volume_range(elem,&min,&max);
-				/*
-				if( (rc=snd_mixer_selem_get_playback_volume(elem,SND_MIXER_SCHN_FRONT_LEFT,&val)) < 0 ){
-					printf("ALSA: snd_mixer_selem_get_playback_volume failed: %d\n",rc);
-				}
-				printf("ALSA: old val: %lu\n",val*100/max);
-				*/
-				if( (rc=snd_mixer_selem_set_playback_volume_all(elem,volume*max/100)) < 0 ){
-					printf("[Alsa]: snd_mixer_selem_set_playback_volume_all failed: %d\n",rc);
-				}
-				printf("[Alsa]: new %s val: %" PRIu32"\n",(which_vol?"master":"pcm"),volume);
-				break;
-			}
-		}
-	}
-	snd_mixer_close(mixer_handle);
-	return 0;
+
+    if (volume < 0)
+        volume = 0;
+    if (volume > 100)
+        volume = 100;
+    volumeHack = (32768 * volume * volume) / 10000;
+    return 0;
+
+//  snd_mixer_t *mixer_handle;
+//  char *pcm_name;
+//  uint32_t which_vol;
+//  int rc;
+///*
+//    if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &pcm_name) != RC_OK )
+//        pcm_name = ADM_strdup("hw:0");
+//    if( prefs->get(FEATURE_AUDIOBAR_USES_MASTER,&which_vol) != RC_OK )
+//        which_vol = 0;
+//*/
+//    pcm_name = ADM_strdup("hw:0");
+//    which_vol = 0;
+//    if( (rc=snd_mixer_open(&mixer_handle,0)) < 0 ){
+//        printf("[Alsa]: snd_mixer_open failed: %d\n",rc);
+//        ADM_dealloc(pcm_name);
+//        return 0;
+//    }
+//// MEANX: Cannot use the real name, does not work with dmix
+//    if( (rc=snd_mixer_attach(mixer_handle,"hw:0")) < 0 ){
+//        printf("[Alsa]: snd_mixer_attach failed: %d, %s\n",rc, snd_strerror (rc));
+//        snd_mixer_close(mixer_handle);
+//        ADM_dealloc(pcm_name);
+//        return 0;
+//}
+//    ADM_dealloc(pcm_name);
+//    if( (rc=snd_mixer_selem_register(mixer_handle,NULL,NULL)) < 0 ){
+//        printf("[Alsa]: snd_mixer_selem_register failed: %d\n",rc);
+//        snd_mixer_close(mixer_handle);
+//        return 0;
+//    }
+//    if( (rc=snd_mixer_load(mixer_handle)) < 0 ){
+//        printf("[Alsa]: snd_mixer_load failed: %d\n",rc);
+//        snd_mixer_close(mixer_handle);
+//        return 0;}
+//    { snd_mixer_elem_t *elem;
+//      snd_mixer_selem_id_t *sid;
+//      const char *str;
+//        snd_mixer_selem_id_alloca(&sid);
+//        for (elem = snd_mixer_first_elem(mixer_handle);
+//             elem;
+//             elem = snd_mixer_elem_next(elem)) {
+//            snd_mixer_selem_get_id(elem, sid);
+//            str = snd_mixer_selem_id_get_name(sid);
+//            if( (which_vol == 0 && !strcmp(str,"PCM"))   ||
+//                (which_vol == 1 && !strcmp(str,"Master"))  ){
+//              long val=0, min=0, max=0;
+//                snd_mixer_selem_get_playback_volume_range(elem,&min,&max);
+//                /*
+//                if( (rc=snd_mixer_selem_get_playback_volume(elem,SND_MIXER_SCHN_FRONT_LEFT,&val)) < 0 ){
+//                    printf("ALSA: snd_mixer_selem_get_playback_volume failed: %d\n",rc);
+//                }
+//                printf("ALSA: old val: %lu\n",val*100/max);
+//                */
+//                if( (rc=snd_mixer_selem_set_playback_volume_all(elem,volume*max/100)) < 0 ){
+//                    printf("[Alsa]: snd_mixer_selem_set_playback_volume_all failed: %d\n",rc);
+//                }
+//                printf("[Alsa]: new %s val: %" PRIu32"\n",(which_vol?"master":"pcm"),volume);
+//                break;
+//            }
+//        }
+//    }
+//    snd_mixer_close(mixer_handle);
+//    return 0;
 }
 
 //EOF

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.cpp Changed

@@ -21,7 +21,6 @@
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioToolbox.h>
 
-#include <AudioUnit/AudioUnit.h>
 #include "ADM_default.h"
 #include "ADM_audiodevice.h"
 #include "ADM_audioDeviceInternal.h"
@@ -154,7 +153,7 @@
 #define CHECK_RESULT(msg) \
     if (err != noErr) \
 	{ \
-		ADM_info("[CoreAudio] Failed to initialise CoreAudio: " msg "\n"); \
+		ADM_info("[CoreAudio] Failed to initialise CoreAudio: " msg " error %d\n",err); \
         return 0; \
     }
 /**
@@ -164,7 +163,7 @@
 {
 
 	OSStatus err;
-	ComponentDescription desc;
+	AudioComponentDescription desc;
 	AURenderCallbackStruct input;
 	AudioStreamBasicDescription streamFormat;
 	AudioDeviceID theDevice;
@@ -175,7 +174,7 @@
 	desc.componentFlags = 0;
 	desc.componentFlagsMask = 0;
 
-	comp = FindNextComponent(NULL, &desc);
+	comp = AudioComponentFindNext(NULL, &desc);
 
 	if (comp == NULL)
 	{
@@ -183,8 +182,8 @@
 		return 0;
 	}
 
-	err = OpenAComponent(comp, &theOutputUnit);
-	CHECK_RESULT("OpenAComponent")
+	err = AudioComponentInstanceNew(comp, &theOutputUnit);
+	CHECK_RESULT("AudioComponentInstanceNew")
 
 	err = AudioUnitInitialize(theOutputUnit);
 	CHECK_RESULT("AudioUnitInitialize")

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/AudioCore/ADM_deviceAudioCore.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioDevices/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/CMakeLists.txt Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/PulseAudio Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/PulseAudio/ADM_devicePulse.cpp Added

@@ -0,0 +1,480 @@
+/***************************************************************************
+                          ADM_devicePulse.cpp  -  description
+
+    audio output plugin for PulseAudio
+                          
+    copyright            : (C) 2008 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_audiodevice.h"
+#include <cmath>
+
+#include "ADM_audioDeviceInternal.h"
+#include "pulse/pulseaudio.h"
+#include "ADM_devicePulse.h"
+
+ADM_DECLARE_AUDIODEVICE(PulseAudio,pulseAudioDevice,1,0,2,"PulseAudio audio device (c) mean");
+
+#define ADM_PULSE_LATENCY 50 // ms
+
+static int appetite;
+
+/**
+    \fn pulseAudioDevice
+    \brief ctor
+*/
+pulseAudioDevice::pulseAudioDevice()
+{
+    stream = connection = mainloop = NULL;
+    muted = false;
+    appetite = 0;
+}
+/**
+    \fn pulseSimpleAudioDevice
+    \brief Returns delay in ms, code mostly stolen from mpv
+*/
+uint32_t pulseAudioDevice::getLatencyMs(void)
+{
+    if(!mainloop || !stream || !connection)
+        return ADM_PULSE_LATENCY;
+
+    pa_threaded_mainloop *ml = (pa_threaded_mainloop *)mainloop;
+    pa_stream *st = (pa_stream *)stream;
+    pa_context *ctx = (pa_context *)connection;
+
+    pa_threaded_mainloop_lock(ml);
+    pa_stream_update_timing_info(st, NULL, NULL);
+
+    pa_usec_t latency = (pa_usec_t) -1;
+
+    int attempts = 10;
+    while(pa_stream_get_latency(st, &latency, NULL) < 0 && attempts > 0)
+    {
+        if(pa_context_errno(ctx) != PA_ERR_NODATA)
+        {
+            ADM_warning("pa_stream_get_latency() failed.\n");
+            break;
+        }
+        /* Wait until latency data is available again */
+        //printf("[pulseAudioDevice::getLatencyMs] Waiting for latency data, %d attempts left\n",attempts);
+        pa_threaded_mainloop_wait(ml);
+        attempts--;
+    }
+
+    pa_threaded_mainloop_unlock(ml);
+
+    if(attempts < 1)
+    {
+        //printf("[pulseAudioDevice::getLatencyMs] All attempts consumed, using hardcoded value.\n");
+        return ADM_PULSE_LATENCY;
+    }
+    if(latency == (pa_usec_t) -1)
+    {
+        //printf("[pulseAudioDevice::getLatencyMs] Cannot query latency, using hardcoded value.\n");
+        return ADM_PULSE_LATENCY;
+    }
+
+    return (uint32_t)(latency / 1000.0);
+}
+
+/**
+    \fn localStop
+    \brief stop & release device
+*/
+bool pulseAudioDevice::localStop(void) 
+{
+    if(mainloop)
+        pa_threaded_mainloop_stop((pa_threaded_mainloop *)mainloop);
+
+    if(stream)
+    {
+        pa_stream *st = (pa_stream *)stream;
+        pa_stream_disconnect(st);
+        pa_stream_unref(st);
+        stream = NULL;
+    }
+    if(connection)
+    {
+        pa_context *ctx = (pa_context *)connection;
+        pa_context_disconnect(ctx);
+        pa_context_unref(ctx);
+        connection = NULL;
+    }
+    if(mainloop)
+    {
+        pa_threaded_mainloop_free((pa_threaded_mainloop *)mainloop);
+        mainloop = NULL;
+    }
+    return true;
+}
+
+//
+// callbacks
+//
+static void context_state_cb(pa_context *c, void *userdata)
+{
+    pa_threaded_mainloop *ml = (pa_threaded_mainloop *)userdata;
+    switch(pa_context_get_state(c))
+    {
+        case PA_CONTEXT_READY:
+        case PA_CONTEXT_TERMINATED:
+        case PA_CONTEXT_FAILED:
+            pa_threaded_mainloop_signal(ml, 0);
+            break;
+        default:break;
+    }
+}
+
+static void stream_state_cb(pa_stream *s, void *userdata)
+{
+    pa_threaded_mainloop *ml = (pa_threaded_mainloop *)userdata;
+    switch(pa_stream_get_state(s))
+    {
+        case PA_STREAM_FAILED:
+            ADM_warning("[pulse] Stream failed.\n");
+            pa_threaded_mainloop_signal(ml, 0);
+            break;
+        case PA_STREAM_READY:
+        case PA_STREAM_TERMINATED:
+            pa_threaded_mainloop_signal(ml, 0);
+            break;
+        default:break;
+    }
+}
+
+static void stream_request_cb(pa_stream *s, size_t length, void *userdata)
+{
+    pa_threaded_mainloop *ml = (pa_threaded_mainloop *)userdata;
+    //printf("[pulse] Server requests %u bytes of data\n",length);
+    appetite += length;
+    pa_threaded_mainloop_signal(ml, 0);
+}
+
+/**
+    \fn    localInit
+    \brief initialize the device
+*/
+bool pulseAudioDevice::localInit(void) 
+{
+    ADM_info("PulseAudio, initiliazing channel=%d samplerate=%d\n",(int)_channels,(int)_frequency);
+    // Create and start threaded main loop
+    pa_threaded_mainloop *ml = pa_threaded_mainloop_new();
+    if(!ml)
+    {
+        ADM_error("[pulse] Cannot allocate main loop.\n");
+        return false;
+    }
+    mainloop = (void *)ml;
+    int err = pa_threaded_mainloop_start(ml);
+    if(err < 0)
+    {
+        ADM_error("[pulse] Error %d starting main loop: %s\n",err,pa_strerror(err));
+        return false;
+    }
+
+    // Create context and connect to PulseAudio server
+    pa_threaded_mainloop_lock(ml);
+    pa_context *ctx = pa_context_new(pa_threaded_mainloop_get_api(ml), "Avidemux2");
+    if(!ctx)
+    {
+        ADM_error("[pulse] Cannot allocate connection context.\n");
+        pa_threaded_mainloop_unlock(ml);
+        return false;
+    }
+
+    pa_context_set_state_callback(ctx, context_state_cb, mainloop);
+
+    ADM_info("[pulse] Connection context created.\n");
+    connection = (void *)ctx;
+
+    err = pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL);
+    if(err < 0)
+    {
+        ADM_error("[pulse] Error %d connecting to server: %s\n",err,pa_strerror(err));
+        pa_threaded_mainloop_unlock(ml);
+        return false;
+    }
+    // Wait until connection gets established
+    while(true)
+    {
+        pa_context_state_t state = pa_context_get_state(ctx);
+        if(state == PA_CONTEXT_READY)
+            break;
+        if(!PA_CONTEXT_IS_GOOD(state))
+        {
+            pa_threaded_mainloop_unlock(ml);
+            return false;
+        }
+#if 0
+        const char *c;
+        switch(state)
+        {
+            case PA_CONTEXT_CONNECTING: c = "connecting"; break;
+            case PA_CONTEXT_AUTHORIZING: c = "authorizing"; break;
+            case PA_CONTEXT_SETTING_NAME: c = "setting name"; break;
+            default: c = "???"; break;
+        }
+        printf("Connection context state: %s\n",c);
+#endif
+        pa_threaded_mainloop_wait(ml);
+    }
+
+    // Create stream
+    pa_sample_spec ss;
+    pa_channel_map map,*pmap=NULL;
+
+    // Channel mapping
+    if(_channels>2)
+    {
+        pmap=&map;
+        map.channels=_channels;
+        map.map[0]=PA_CHANNEL_POSITION_FRONT_LEFT;
+        map.map[1]=PA_CHANNEL_POSITION_FRONT_RIGHT;
+        map.map[2]=PA_CHANNEL_POSITION_FRONT_CENTER;
+        map.map[3]=PA_CHANNEL_POSITION_SUBWOOFER;
+        map.map[4]=PA_CHANNEL_POSITION_REAR_LEFT;
+        map.map[5]=PA_CHANNEL_POSITION_REAR_RIGHT;
+        map.map[6]=PA_CHANNEL_POSITION_SIDE_LEFT;
+        map.map[7]=PA_CHANNEL_POSITION_SIDE_RIGHT;
+    }
+
+    ss.format = PA_SAMPLE_S16LE;
+    ss.channels = _channels;
+    ss.rate =_frequency;
+
+    if(!pa_sample_spec_valid(&ss))
+    {
+        ADM_error("[pulse] Sample spec is invalid.\n");
+        pa_threaded_mainloop_unlock(ml);
+        return false;
+    }
+
+    pa_stream *st = pa_stream_new(ctx, "Avidemux2", &ss, pmap);
+    if(!st)
+    {
+        ADM_error("[pulse] Cannot create stream.\n");
+        pa_threaded_mainloop_unlock(ml);
+        return false;
+    }
+
+    pa_stream_set_state_callback(st, stream_state_cb, mainloop);
+    pa_stream_set_write_callback(st, stream_request_cb, mainloop);
+
+    stream = (void *)st;
+
+    // Connect to the default sink
+    pa_buffer_attr attr;
+    attr.maxlength = -1;
+    attr.tlength   = -1;
+    attr.prebuf    =  0;
+    attr.minreq    = -1;
+    attr.fragsize  = -1;
+
+    // We want something like 20 ms latency
+    uint64_t bufSize = _frequency;
+    bufSize *= _channels;
+    bufSize *= 2; // 1 second worth of audio
+
+    bufSize /= 1000;
+    bufSize *= ADM_PULSE_LATENCY;
+    attr.tlength = bufSize; // Latency in bytes
+
+    err = pa_stream_connect_playback(st, NULL, &attr, PA_STREAM_NOFLAGS, NULL, NULL);
+    if(err < 0)
+    {
+        ADM_error("[pulse] Error %d connecting stream: %s\n",err,pa_strerror(err));
+        pa_threaded_mainloop_unlock(ml);
+        return false;
+    }
+    // Wait for connection to the sink
+    while(true)
+    {
+        pa_stream_state_t state = pa_stream_get_state(st);
+        if(state == PA_STREAM_READY)
+            break;
+        if(!PA_STREAM_IS_GOOD(state))
+        {
+            pa_threaded_mainloop_unlock(ml);
+            return false;
+        }
+        pa_threaded_mainloop_wait(ml);
+    }
+
+    pa_threaded_mainloop_unlock(ml);
+
+    ADM_info("[pulse] open ok for fq=%d channels=%d\n",ss.rate,ss.channels);
+    return true;
+}
+
+/**
+    \fn setVolume
+*/
+uint8_t pulseAudioDevice::setVolume(int volume)
+{
+    if(!stream || !connection || !mainloop)
+        return 0;
+
+    if(volume < 0) volume = 0;
+    if(volume > 100) volume = 100;
+
+    if(!volume && muted) // nothing to do
+        return 1;
+
+    pa_stream *st = (pa_stream *)stream;
+    pa_context *ctx = (pa_context *)connection;
+    pa_threaded_mainloop *ml = (pa_threaded_mainloop *)mainloop;
+    pa_operation *op = NULL;
+
+    pa_threaded_mainloop_lock(ml);
+    uint32_t idx = pa_stream_get_index(st);
+
+    if(!volume) // mute
+    {
+        op = pa_context_set_sink_input_mute(ctx, idx, true, NULL, NULL);
+        if(op)
+        {
+            muted = true;
+            pa_operation_unref(op);
+        }else
+        {
+            ADM_warning("[pulse] Cannot mute output.\n");
+        }
+    }else
+    {
+        if(muted)
+        {
+            op = pa_context_set_sink_input_mute(ctx, idx, false, NULL, NULL);
+            if(op)
+            {
+                muted = false;
+                pa_operation_unref(op);
+            }else
+            {
+                ADM_warning("[pulse] Cannot unmute output.\n");
+            }
+        }
+        pa_cvolume vol;
+        pa_cvolume_reset(&vol, _channels);
+        volume = lrint((float)volume * PA_VOLUME_NORM / 100.);
+        pa_cvolume_set(&vol, vol.channels, volume);
+        op = pa_context_set_sink_input_volume(ctx, idx, &vol, NULL, NULL);
+        if(op)
+        {
+            muted = false;
+            pa_operation_unref(op);
+        }else
+        {
+            ADM_warning("[pulse] Cannot set volume.\n");
+        }
+    }
+
+    pa_threaded_mainloop_unlock(ml);
+
+    return 1;
+}
+
+/**
+    \fn sendData
+    \brief Play samples
+*/
+void pulseAudioDevice::sendData(void)
+{
+    if(!stream) return;
+    if(!mainloop) return;
+    // FIXME
+    if(!appetite)
+    {
+        ADM_usleep(1000);
+        return;
+    }
+
+    int err;
+    pa_stream *st = (pa_stream *)stream;
+    pa_threaded_mainloop *ml = (pa_threaded_mainloop *)mainloop;
+
+    mutex.lock();
+    ADM_assert(wrIndex >= rdIndex);
+    uint32_t avail = wrIndex - rdIndex;
+    if(!avail)
+    {
+        mutex.unlock();
+        pa_threaded_mainloop_lock(ml);
+
+        int size = appetite < sizeOf10ms ? appetite : sizeOf10ms;
+        appetite -= size;
+        if(appetite < 0) appetite = 0;
+
+        err = pa_stream_write(st, silence.at(0), size, NULL, 0, PA_SEEK_RELATIVE);
+
+        pa_threaded_mainloop_unlock(ml);
+
+        if(err < 0)
+            ADM_warning("[pulse] pa_stream_write error %d: %s\n",err,pa_strerror(err));
+        return;
+    }
+
+    if(avail > appetite)
+    {
+        avail = appetite;
+        appetite = 0;
+    }else
+    {
+        appetite -= avail;
+    }
+
+    uint8_t *data = audioBuffer.at(rdIndex);
+    mutex.unlock();
+    pa_threaded_mainloop_lock(ml);
+
+    err = pa_stream_write(st, data, avail, NULL, 0, PA_SEEK_RELATIVE);
+
+    pa_threaded_mainloop_unlock(ml);
+
+    if(err < 0)
+        ADM_warning("[pulse] pa_stream_write error %d: %s\n",err,pa_strerror(err));
+
+    mutex.lock();
+    rdIndex += avail;
+    mutex.unlock();
+    return;
+}
+/**
+    \fn getWantedChannelMapping
+*/
+static const CHANNEL_TYPE mono[MAX_CHANNELS]={ADM_CH_MONO};
+static const CHANNEL_TYPE stereo[MAX_CHANNELS]={ADM_CH_FRONT_LEFT,ADM_CH_FRONT_RIGHT};
+static const CHANNEL_TYPE fiveDotOne[MAX_CHANNELS]={
+    ADM_CH_FRONT_LEFT,ADM_CH_FRONT_RIGHT,
+    ADM_CH_FRONT_CENTER,ADM_CH_LFE,
+    ADM_CH_REAR_LEFT,ADM_CH_REAR_RIGHT
+};
+static const CHANNEL_TYPE sevenDotOne[MAX_CHANNELS]={
+    ADM_CH_FRONT_LEFT,ADM_CH_FRONT_RIGHT,
+    ADM_CH_FRONT_CENTER,ADM_CH_LFE,
+    ADM_CH_REAR_LEFT,ADM_CH_REAR_RIGHT,
+    ADM_CH_SIDE_LEFT,ADM_CH_SIDE_RIGHT
+};
+const CHANNEL_TYPE *pulseAudioDevice::getWantedChannelMapping(uint32_t channels)
+{
+    switch(channels)
+    {
+        case 1: return mono;
+        case 2: return stereo;
+        case 5:
+        case 6: return fiveDotOne;
+        case 8: return sevenDotOne;
+        default:break;
+    }
+    return NULL;
+}
+//EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/PulseAudio/ADM_devicePulse.h Added

@@ -0,0 +1,36 @@
+/***************************************************************************
+                          ADM_devicePulse.h  -  description
+                             -------------------
+                             Audio device for PulseAudio sound daemon
+    copyright            : (C) 2005/2008 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_devicePulse_H
+#define ADM_devicePulse_H
+class pulseAudioDevice : public audioDeviceThreaded
+{
+private:
+                void    *stream;
+                void    *connection;
+                void    *mainloop;
+                bool    muted;
+protected:
+    virtual     bool    localInit(void);
+    virtual     bool    localStop(void);
+    virtual     void    sendData(void);
+    virtual const CHANNEL_TYPE *getWantedChannelMapping(uint32_t channels);
+public:
+                pulseAudioDevice(void);
+    virtual     uint8_t  setVolume(int volume);
+                uint32_t getLatencyMs(void);
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioDevices/PulseAudio/CMakeLists.txt Added

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/aften/audioencoder_aften.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/faac/audioencoder_faac.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/fdk-aac/ae_fdk.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/lame/audioencoder_lame.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp Changed

@@ -75,6 +75,7 @@
 {
   _context=NULL;
   _frame=NULL;
+  _pkt = NULL;
   _globalHeader=globalHeader;
    ADM_info("[Lavcodec] Creating Lavcodec audio encoder (0x%x)\n",makeName(WAV));
 #if defined(ADM_LAV_GLOBAL_HEADER) // Only AAC ?
@@ -91,6 +92,8 @@
         ADM_paramLoad(setup,lav_encoder_param,&_config);
   planarBuffer=NULL;
   planarBufferSize=0;
+  outputFlavor = unsupported;
+  encoderState = normal;
 };
 /**
     \fn extraData
@@ -119,6 +122,8 @@
 AUDMEncoder_Lavcodec::~AUDMEncoder_Lavcodec()
 {
   ADM_info("[Lavcodec] Deleting Lavcodec\n");
+  if(_pkt)
+        av_packet_free(&_pkt);
   if(_context)
   {
     avcodec_close(CONTEXT);
@@ -142,70 +147,109 @@
 */
 bool AUDMEncoder_Lavcodec::initialize(void)
 {
-  int ret;
-  
+    if(_incoming->getInfo()->channels > ADM_LAV_MAX_CHANNEL) // TODO: query codec
+    {
+        ADM_error("[Lavcodec] Too many channels\n");
+        return false;
+    }
+    AVCodec *codec = NULL;
+    AVCodecID codecID = avMakeName;
+    // Try to find an encoder
+    codec = avcodec_find_encoder(codecID);
+    if(!codec)
+    {
+#define STR(x) #x
+#define MKSTRING(x) STR(x)
+        ADM_error("[Lavcodec] Cannot find encoder for %s\n",MKSTRING(avMakeName));
+        return false;
+    }
+    // Does the encoder support a sample format we do?
+    const AVSampleFormat *sfmt = codec->sample_fmts;
+    while(*sfmt != AV_SAMPLE_FMT_NONE)
+    {
+#define MATCH(x,y) if(*sfmt == AV_SAMPLE_FMT_ ##x) { outputFlavor = as ##y; break; }
+        MATCH(FLTP,FloatPlanar)
+        MATCH(FLT,Float)
+        MATCH(S16,Int16)
+        sfmt++;
+    }
+    if(outputFlavor == unsupported)
+    {
+        ADM_error("[Lavcodec] The encoder doesn't support any of sample formats we can offer.\n");
+        return false;
+    }
+    ADM_info("[Lavcodec] Selected %s as sample format.\n", av_get_sample_fmt_name(*sfmt));
+    // Allocate and fill codec context
+    AVCodecContext *ctx = avcodec_alloc_context3(codec);
+    if(!ctx)
+    {
+        ADM_error("[Lavcodec] Cannot allocate context.\n");
+        return false;
+    }
+    ctx->channels = wavheader.channels;
+    ctx->channel_layout = av_get_default_channel_layout(wavheader.channels);
+    ctx->sample_rate = wavheader.frequency;
+    ctx->sample_fmt = *sfmt;
+    ctx->frame_size = ADM_LAV_SAMPLE_PER_P;
+    ctx->bit_rate = _config.bitrate * 1000; // bits -> kbits
+    ctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+
+    if(_globalHeader)
+    {
+        ADM_info("Configuring audio codec to use global headers\n");
+        ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+    }
+    _context = (void *)ctx;
 
-  if( _incoming->getInfo()->channels>ADM_LAV_MAX_CHANNEL)
-  {
-    ADM_error("[Lavcodec]Too many channels\n");
-    return 0;
-  }
-  AVCodec *codec;
-  AVCodecID codecID;
-  codecID=avMakeName;
-  codec = avcodec_find_encoder(codecID);
-  ADM_assert(codec);
-  _context=( void *)avcodec_alloc_context3(codec);
-  _frame=av_frame_alloc();
-  
-  wavheader.byterate=(_config.bitrate*1000)>>3;
-
-  _chunk = ADM_LAV_SAMPLE_PER_P*wavheader.channels; // AC3
-  planarBuffer=new float[_chunk];
-  planarBufferSize=_chunk;
-  ADM_info("[Lavcodec]Incoming : fq : %" PRIu32", channel : %" PRIu32" bitrate: %" PRIu32" \n",
-  wavheader.frequency,wavheader.channels,_config.bitrate);
-
-    if(wavheader.channels>2) 
+    _chunk = ADM_LAV_SAMPLE_PER_P * wavheader.channels; // AC3
+
+    // Can we use the encoder?
+    int ret = avcodec_open2(ctx,codec,NULL);
+    if (ret<0)
     {
-        ADM_warning("Channel remapping activated\n");
-        needChannelRemapping=true;
+         printError("Init failed",ret);
+         return false;
     }
-    else needChannelRemapping=false;
-  
-  CONTEXT->channels     =  wavheader.channels;
-  CONTEXT->sample_rate  =  wavheader.frequency;
-  CONTEXT->bit_rate     = (_config.bitrate*1000); // bits -> kbits
-  CONTEXT->sample_fmt   =  AV_SAMPLE_FMT_FLT;
-  CONTEXT->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-  CONTEXT->frame_size=_chunk/wavheader.channels;
-  CONTEXT->channel_layout=av_get_default_channel_layout(wavheader.channels);
-  
-  if(true==_globalHeader)
-  {
-    ADM_info("Configuring audio codec to use global headers\n");
-    CONTEXT->flags|=AV_CODEC_FLAG_GLOBAL_HEADER;
-  }
-  
+
+    wavheader.byterate=(_config.bitrate*1000)>>3;
     computeChannelLayout();
-    CONTEXT->sample_fmt   =  AV_SAMPLE_FMT_FLTP;
-    ret = avcodec_open2(CONTEXT, codec,NULL);
-    if (ret<0)
-    {            
-                CONTEXT->sample_fmt=AV_SAMPLE_FMT_S16;
-                ret = avcodec_open2(CONTEXT, codec,NULL);
-                if (ret<0)
-                {
-                        printError("Init failed",ret);
-                        return 0;
-                }
-     
-   }
-    //ADM_info("Frame size : %d, %d\n",CONTEXT->frame_size,_chunk/wavheader.channels);
-    _frame->format=CONTEXT->sample_fmt;    
-    outputFlavor=asFloatPlanar;
+
+    // Allocate input frame
+    _frame = av_frame_alloc();
+    if(!_frame)
+    {
+        ADM_error("[Lavcodec] Cannot allocate frame.\n");
+        return false;
+    }
+
+    _frame->nb_samples = ctx->frame_size;
+    _frame->format = ctx->sample_fmt;
+    _frame->channel_layout = ctx->channel_layout;
+
+    ret = av_frame_get_buffer(_frame, 0);
+    if(ret < 0)
+    {
+        printError("av_frame_get_buffer",ret);
+        return false;
+    }
+
+    if(outputFlavor != asInt16)
+    {
+        planarBuffer = new float[_chunk];
+        planarBufferSize = _chunk;
+    }
+    ADM_info("[Lavcodec]Incoming : fq : %" PRIu32", channel : %" PRIu32" bitrate: %" PRIu32" \n",
+                wavheader.frequency,wavheader.channels,_config.bitrate);
+
+    // Allocate packet to hold encoder output
+    _pkt = av_packet_alloc();
+    if(!_pkt)
+    {
+        ADM_error("Cannot allocate AVPacket.\n");
+        return false;
+    }
     ADM_info("[Lavcodec]Lavcodec successfully initialized,wavTag : 0x%x\n",makeName(WAV));
-    return 1;
+    return true;
 }
 
 /**
@@ -215,104 +259,62 @@
  */
 void AUDMEncoder_Lavcodec::printError(const char *s,int er)
 {
-    char strer[256]={0};
-                av_strerror(er, strer, sizeof(strer));
-                ADM_error("[Lavcodec] %s,err : %d %s!\n",s,er,strer);
-                
-}
-bool	AUDMEncoder_Lavcodec::encodeBlock(int count, uint8_t *dest,int &encoded)
-{
-    if(wavheader.channels>2) return encodeBlockMultiChannels(count,dest,encoded);
-    else return encodeBlockSimple(count,dest,encoded);
-}
-/**
- * \fn lastBlock
- * \brief purge internal data if any
- * @param encoded
- * @return 
- */
-bool AUDMEncoder_Lavcodec::lastBlock(AVPacket *pkt,int &encoded)
-{
-    int gotPacket;
-    int er=avcodec_encode_audio2(CONTEXT, pkt,NULL,&gotPacket);
-    if(er<0)
-    {
-        printError("Encoding lastBlock",er);
-        return false;
-    }
-    if(gotPacket)
-        encoded=pkt->size;
-    return true;
+    char strer[AV_ERROR_MAX_STRING_SIZE]={0};
+    av_make_error_string(strer, AV_ERROR_MAX_STRING_SIZE, er);
+    ADM_error("[Lavcodec] %s error %d (\"%s\")\n",s,er,strer);
 }
 
 /**
- * \fn encodeBlockMultiChannel
- * \brief encode a block when # of channels is > 2
- * @param count
- * @return 
+ * \fn fillFrame
+ * \brief Prepare input for the encoder.
+ * @param  int  Size of input in floats, should be equal _chunk
+ * @return bool True on success, else false.
  */
-bool	AUDMEncoder_Lavcodec::encodeBlockMultiChannels(int count, uint8_t *dest,int &encoded)
+bool AUDMEncoder_Lavcodec::fillFrame(int count)
 {
-     encoded=0;
-     AVPacket pkt; // out
-     av_init_packet(&pkt);
-     pkt.size=5000;
-     pkt.data=dest;
-
-     
-      if(!count)
-      {
-          return lastBlock(&pkt,encoded);
-      }
-     
-     int gotPacket;
-     int channel=wavheader.channels;
-     int nbBlocks=count/channel;
-     _frame->channels=wavheader.channels;
-     _frame->channel_layout=CONTEXT->channel_layout;     
-     _frame->nb_samples=nbBlocks;
-
-        CHANNEL_TYPE *f=_incoming->getChannelMapping();
-        CHANNEL_TYPE *o=channelMapping;
-     
-      
-        
-        int er;
-        if( CONTEXT->sample_fmt   ==  AV_SAMPLE_FMT_FLTP)
-        {
-                    // reorder and de-interleave
-                reorderToPlanar(&(tmpbuffer[tmphead]),planarBuffer,nbBlocks,f,o);
-                er=avcodec_fill_audio_frame(_frame, channel,
-                              AV_SAMPLE_FMT_FLTP, (uint8_t *)planarBuffer,
-                               count*sizeof(float), 0);
-        }else
-        {
-              dither16(&(tmpbuffer[tmphead]),count,channel);
-              er=avcodec_fill_audio_frame(_frame, channel,
-                              AV_SAMPLE_FMT_S16, (uint8_t *)&(tmpbuffer[tmphead]),
-                               count*sizeof(uint16_t), 0);
-        }
-        if(er<0)
-        {
-            printError("Fill audio",er);
-            return false;
-        }
-
-    er = avcodec_encode_audio2(CONTEXT, &pkt,_frame,&gotPacket);
-    if(er<0)
+    int er, bufSize, channels = wavheader.channels;
+    float *fptr = &(tmpbuffer[tmphead]);
+    uint8_t *buffer;
+    AVSampleFormat format;
+    switch(outputFlavor)
     {
-        printError("Encoding",er);
-        return false;
+        case asInt16:
+            dither16(fptr,count,channels);
+            buffer = (uint8_t *)fptr;
+            bufSize = count * sizeof(uint16_t);
+            format = AV_SAMPLE_FMT_S16;
+            break;
+        case asFloat:
+            buffer = (uint8_t *)fptr;
+            bufSize = count * sizeof(float);
+            format = AV_SAMPLE_FMT_FLT;
+            break;
+        case asFloatPlanar:
+            if(channels > 2)
+            {
+                reorderToPlanar(fptr, planarBuffer, _frame->nb_samples, _incoming->getChannelMapping(), channelMapping);
+                buffer = (uint8_t *)planarBuffer;
+            }else
+            {
+                buffer = (uint8_t *)i2p(count);
+            }
+            bufSize = count * sizeof(float);
+            format = AV_SAMPLE_FMT_FLTP;
+            break;
+        default:
+            ADM_assert(0);
+            break;
     }
-    if(gotPacket)
+    er = avcodec_fill_audio_frame(_frame, channels, format, buffer, bufSize, 0);
+    if(er < 0)
     {
-        cprintf("Got %d bytes \n",pkt.size);
-        encoded=pkt.size;
+        printError("avcodec_fill_audio_frame",er);
+        return false;
     }
+    tmphead += count;
     return true;
 }
 
-
 /**
  * \fn i2p
  * \brief convert interleaved float to planar float
@@ -344,65 +346,6 @@
  }
 
 /**
- * \fn encodeBlockSimple
- * \brief mono or stereo
- */
-bool	AUDMEncoder_Lavcodec::encodeBlockSimple(int count, uint8_t *dest,int &encoded)
-{
-     encoded=0;
-     AVPacket pkt; // out
-     av_init_packet(&pkt);
-     pkt.size=5000;
-     pkt.data=dest;     
-     
-      if(!count)
-      {
-          return lastBlock(&pkt,encoded);
-      }
-     int gotPacket;
-     int channel=wavheader.channels;
-     _frame->channel_layout=CONTEXT->channel_layout;
-
-     int nbBlocks=count/channel;
-      _frame->nb_samples=nbBlocks;
-      
-      
-      int er;
-      if( CONTEXT->sample_fmt   ==  AV_SAMPLE_FMT_FLTP)
-        {
-                float *in=i2p(count);
-                // reorder and de-interleave
-                er=avcodec_fill_audio_frame(_frame, channel,
-                              AV_SAMPLE_FMT_FLTP, (uint8_t *)in,
-                               count*sizeof(float), 0);
-        }else
-        { // s16
-              dither16(&(tmpbuffer[tmphead]),count,channel);
-              er=avcodec_fill_audio_frame(_frame, channel,
-                              AV_SAMPLE_FMT_S16, (uint8_t *)&(tmpbuffer[tmphead]),
-                               count*sizeof(uint16_t), 0);
-        }
-     if(er<0)
-     {
-        printError("Fill audio",er);
-        return false;
-     }
-     
-     
-    int  nbout = avcodec_encode_audio2(CONTEXT, &pkt,_frame,&gotPacket);
-    if(nbout>=0 && gotPacket)
-    {
-        cprintf("Got %d bytes \n",pkt.size);
-        encoded=pkt.size;
-    }
-    else
-    {
-        printError("Encoding",nbout);
-        return false;
-    }
-    return true;
-}
-/**
  * \fn computeChannelLayout
  * @return 
  */
@@ -438,69 +381,79 @@
 */
 bool	AUDMEncoder_Lavcodec::encode(uint8_t *dest, uint32_t *len, uint32_t *samples)
 {
-  int retries=16;
-  bool r;
-  int sz;
+    int spoonful, er;
+    int channels = wavheader.channels;
+
+    *samples = _chunk/channels; //FIXME
+    *len = 0;
+
 again:
-  int channels=wavheader.channels;
-  *samples = _chunk/channels; //FIXME
-  *len = 0;
-  if(AudioEncoderStopped==_state)
+    if(_state == AudioEncoderStopped)
         return false;
 
-   refillBuffer (_chunk);
-   
-   if(AudioEncoderNoInput==_state)
+    spoonful = _chunk;
+    er = 0;
+
+    refillBuffer(_chunk);
+
+    if(_state == AudioEncoderNoInput)
     {
+        ADM_warning("[Lavcodec] No more input\n");
         int left=tmptail-tmphead;
-        if (left < _chunk)
+        if (left <= 0)
         {
-            if(left) // Last block
+            if(encoderState == normal)
             {
-                
-               encodeBlock(left,dest,sz);
-               *samples = left/channels;
-               *len=sz;
-               ADM_info("[Lav] Last audio block\n");
-               goto cnt;
+                ADM_info("[Lavcodec] Initiating flushing\n");
+                encoderState = flushing;
             }
-              // Flush
-               ADM_info("[Lav] Flush\n");
-              _state=AudioEncoderStopped;
-              if(CONTEXT->codec->capabilities & AV_CODEC_CAP_DELAY)
-              {
-                  if(false==encodeBlock(0,dest,sz))
-                  {
-                        ADM_warning("Error flushing encoder\n");
-                        return false;                      
-                  }
-                  *len=sz;
-                  *samples=_chunk/channels;
-                  ADM_info("[Lav] Flushing, last block is %d bytes\n",sz);
-                  return true;
-              }else
-              {
-              }
-              ADM_info("[Lav] No data to flush\n");
-              return true;
+        } else if (left <= _chunk)
+        {
+            ADM_info("[Lavcodec] Last audio block, %d samples left, frame size: %d\n",left/channels,ADM_LAV_SAMPLE_PER_P);
+            spoonful = left;
+            *samples = left/channels;
         }
     }
-   
-   r=encodeBlock(_chunk,dest,sz);
-   tmphead+=_chunk;
-cnt:
-  if(!r && retries)
-  {
-    retries--;
-    ADM_info("Audio encoder (lav): no packet, retrying\n");
-    goto again;
-  }
-  *len=sz;
-  *samples=_chunk/channels;
-  return true;
+    if(encoderState == flushing)
+    {
+        er = avcodec_send_frame(CONTEXT, NULL);
+        encoderState = flushed;
+    }else if(encoderState == normal)
+    { // feed raw audio to encoder
+        if(!fillFrame(spoonful))
+            return false;
+        er = avcodec_send_frame(CONTEXT, _frame);
+    }
+    if(er < 0)
+    {
+        if(er != AVERROR(EAGAIN))
+        {
+            printError("avcodec_send_frame",er);
+            return false;
+        }
+    }
+
+    er = avcodec_receive_packet(CONTEXT, _pkt);
+
+    if(er < 0)
+    {
+        av_packet_unref(_pkt);
+        if(er == AVERROR(EAGAIN))
+            goto again;
+        if(er == AVERROR_EOF)
+            _state = AudioEncoderStopped;
+        else
+            printError("avcodec_receive_packet",er);
+        return false;
+    }
+    cprintf("Got %d bytes \n",_pkt->size);
+    memcpy(dest,_pkt->data,_pkt->size);
+    *len = _pkt->size;
+    av_packet_unref(_pkt);
+    return true;
 }
 #define SZT(x) sizeof(x)/sizeof(diaMenuEntry )
-#define BITRATE(x) {x,QT_TRANSLATE_NOOP("lavcodec",#x)}
+#define BITRATE(x) {x,QT_TRANSLATE_NOOP("lavcodec",#x),NULL}
 
 /**
     \fn configure

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h Changed

@@ -19,26 +19,34 @@
 class AUDMEncoder_Lavcodec : public ADM_AudioEncoder
 {
   protected:
-     typedef enum 
-            {
-                asInt16,asFloat,asFloatPlanar
-            }ADM_outputFlavor;
-  protected:
+
+typedef enum {
+    asInt16,
+    asFloat,
+    asFloatPlanar,
+    unsupported
+} ADM_outputFlavor;
+
+typedef enum {
+    normal,
+    flushing,
+    flushed
+} ADM_encoderState;
+
     void                *_context;
+    AVFrame             *_frame;
+    AVPacket            *_pkt;
     uint32_t             _chunk;
     bool                 _globalHeader;
     ADM_outputFlavor     outputFlavor;
+    ADM_encoderState     encoderState;
     float                *planarBuffer;
     int                  planarBufferSize;
+    CHANNEL_TYPE        channelMapping[8];
+
     float               *i2p(int count);
-    bool                encodeBlock(int count, uint8_t *dest,int &encoded);
-    bool                encodeBlockSimple(int count, uint8_t *dest,int &encoded);
-    bool                encodeBlockMultiChannels(int count, uint8_t *dest,int &encoded);
-    bool                lastBlock(AVPacket *p,int &encoded);
+    bool                fillFrame(int count);
     bool                computeChannelLayout(void);
-    CHANNEL_TYPE        channelMapping[8];
-    bool                needChannelRemapping;
-    AVFrame             *_frame;
     void                printError(const char *s,int er);
 
   public:

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/opus/audioencoder_opus.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/twolame/audioencoder_twolame.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asf.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Asf/ADM_asfHeaders.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include "ADM_default.h"
 #include "ADM_Video.h"
+#include "fourcc.h"
 #include "ADM_mkv.h"
 #include "ADM_codecType.h"
 #include "mkv_tags.h"
@@ -63,6 +64,15 @@
   return bestMatch;
 }
 
+static bool isProRes(uint32_t fcc)
+{
+    return fourCC::check(fcc,(uint8_t *)"apco") ||
+           fourCC::check(fcc,(uint8_t *)"apcs") ||
+           fourCC::check(fcc,(uint8_t *)"apcn") ||
+           fourCC::check(fcc,(uint8_t *)"apch") ||
+           fourCC::check(fcc,(uint8_t *)"ap4h") ||
+           fourCC::check(fcc,(uint8_t *)"ap4x");
+}
 
 /**
     \fn open
@@ -179,7 +189,10 @@
         return 0;
     }
 
-    if(!isH264Compatible(_videostream.fccHandler) && !isMpeg4Compatible(_videostream.fccHandler) && !isMpeg12Compatible(_videostream.fccHandler))
+    if(!isH264Compatible(_videostream.fccHandler) &&
+       !isH265Compatible(_videostream.fccHandler) &&
+       !isMpeg4Compatible(_videostream.fccHandler) &&
+       !isMpeg12Compatible(_videostream.fccHandler))
     {
         updateFlagsWithCue();
     }
@@ -190,6 +203,9 @@
   ADM_assert(_parser->open(name));
   _filename=ADM_strdup(name);
 
+  if(isProRes(_videostream.fccHandler))
+        updateProResFourCC();
+
   // Now dump some infos about the track
     for(int i=0;i<1+_nbAudioTrack;i++)
         ADM_info("Track %" PRIu32" has an index size of %d entries\n",i,_tracks[i].index.size());
@@ -420,19 +436,27 @@
   int first=0;
   while(  track->index[first].Pts==ADM_NO_PTS && first<nb) first++; // we should have some at least
   uint64_t zero= track->index[first].Pts;
+  for(int i=0;i<32;i++)
+  {
+    if(first+i >= nb) break;
+    uint64_t pts = track->index[first+i].Pts;
+    if(pts == ADM_NO_PTS) continue;
+    if(pts < zero) zero = pts;
+  }
+  uint64_t minimumPts32 = zero;
   {
     double dmultiple=zero+half;
     dmultiple*=den;
     dmultiple/=(1000000.*(double)num);
     zero=((uint64_t)dmultiple*1000000*num)/den;
-    track->index[first].Pts=zero;
   }
   ADM_info("Num=%d Den=%d half=%d zero=%d first=%d\n",num,den,half,(int)zero,first);
-  for(int i=first+1;i<nb;i++)
+  for(int i=first;i<nb;i++)
   {
     uint64_t pts=track->index[i].Pts;
-    if(pts<zero) continue;
-    pts-=zero;
+    if(pts == ADM_NO_PTS) continue;
+    if(pts < minimumPts32) continue;
+    pts -= minimumPts32;
     double dmultiple=(pts+half);
     dmultiple*=den;
     dmultiple/=(1000000.*(double)num);
@@ -567,6 +591,15 @@
             first++; // we should have some at least
         }
         uint64_t zero= track->index[first].Pts;
+        for(int i=0;i<32;i++)
+        {
+            if(first+i >= nb)
+                break;
+            uint64_t pts = track->index[first+i].Pts;
+            if(pts == ADM_NO_PTS)
+                continue;
+            if(pts < zero) zero = pts;
+        }
         ADM_info("Num=%d Den=%d zero=%d first=%d\n",num,den,(int)zero,first);
         int valid=0;
         for(int i=first;i<nb;i++)
@@ -577,7 +610,7 @@
                 _framesNoPts.push_back(i);
                 continue;
             }
-            if(pts<zero) // early B-frames
+            if(pts<zero) // bogus timing
             {
                 _framesNoPts.push_back(i);
                 continue;
@@ -1030,7 +1063,6 @@
 {
   if(frame>=_tracks[0].index.size()) return 0;
   *flags=_tracks[0].index[frame].flags;
-  if(!frame) *flags=AVI_KEY_FRAME | (*flags & AVI_STRUCTURE_TYPE_MASK);
   return 1;
 }
 /**
@@ -1051,6 +1083,16 @@
     if(!limit) return 0;
     return _tracks[0].duration;
 }
+/**
+    \fn getVideoTrackSize
+
+*/
+uint64_t mkvHeader::getVideoTrackSize(void)
+{
+    uint32_t limit=_tracks[0].index.size();
+    if(!limit) return 0;
+    return _tracks[0]._sizeInBytes;
+}
 
 /**
     \fn getFrameSize
@@ -1086,6 +1128,23 @@
   }
   img->dataLength=readAndRepeat(0,img->data, sz-3);
   ADM_assert(img->dataLength <= ADM_COMPRESSED_MAX_DATA_LENGTH);
+  // ProRes frames may have their container atom stripped, in this case we need to recreate it.
+  if(isProRes(_videostream.fccHandler) && !fourCC::check(img->data + 4, (uint8_t *)"icpf"))
+  {
+        sz = img->dataLength;
+        img->dataLength += 8;
+        ADM_assert(img->dataLength <= ADM_COMPRESSED_MAX_DATA_LENGTH);
+        memmove(img->data + 8, img->data, sz);
+        uint8_t *p = img->data;
+        *p++ = (sz>>24)&0xff;
+        *p++ = (sz>>16)&0xff;
+        *p++ = (sz>>8)&0xff;
+        *p++ = sz&0xff;
+        *p++ = 'i'; // 0x69;
+        *p++ = 'c'; // 0x63;
+        *p++ = 'p'; // 0x70;
+        *p   = 'f'; // 0x66;
+  }
   img->flags=dx->flags;
   img->demuxerDts=dx->Dts;
   img->demuxerPts=dx->Pts;
@@ -1335,5 +1394,129 @@
    ADM_warning("Big packet detected : %d kBytes \n",max>>10);
    return max;
 }
+
+/**
+ * \fn updateProResFourCC
+ * \brief Guess FourCC based on bitrate and ProRes frame flags.
+ *        Derived from libavcodec ProRes encoder by Konstantin Shishkov.
+ */
+void mkvHeader::updateProResFourCC(void)
+{
+#define NUM_MB_LIMITS 4
+    const uint32_t prores_mb_limits[NUM_MB_LIMITS] = {
+        1620, // up to 720x576
+        2700, // up to 960x720
+        6075, // up to 1440x1080
+        9216  // up to 2048x1152
+    };
+
+    typedef struct {
+        const char *fourcc;
+        uint32_t bitrate[4];
+    } profileDesc;
+
+#define NUM_PROFILES 6
+#define FIRST_4444_PROFILE 4
+    const profileDesc profTab[NUM_PROFILES] = {
+        {
+            "apc0", /* proxy */
+            { 300, 242, 220, 194 }
+        },
+        {
+            "apcs", /* light */
+            { 720, 560, 490, 440 }
+        },
+        {
+            "apcn", /* standard */
+            { 1050, 808, 710, 632 }
+        },
+        {
+            "apch", /* high quality */
+            { 1566, 1216, 1070, 950 }
+        },
+        {
+            "ap4h", /* 4444 */
+            { 2350, 1828, 1600, 1425 }
+        },
+        {
+            "ap4x", /* 4444 XQ */
+            { 3525, 2742, 2400, 2137 }
+        }
+    };
+
+    ADM_assert(_parser);
+    mkvTrak *t = &(_tracks[0]);
+    ADM_assert(t->index.size());
+
+#define MBALIGN(x) (((x+15)&(~15)) >> 4)
+    uint32_t mb = MBALIGN(_mainaviheader.dwWidth);
+    mb *= MBALIGN(_mainaviheader.dwHeight);
+
+    int level;
+    for(level=0; level < NUM_MB_LIMITS; level++)
+    {
+        if(prores_mb_limits[level] >= mb)
+            break;
+    }
+    if(level >= NUM_MB_LIMITS)
+    {
+        level = NUM_MB_LIMITS - 1;
+        ADM_warning("# of macroblocks %" PRIu32" exceeds max %d\n",mb,prores_mb_limits[level]);
+    }
+    // Get ProRes frame flags from the first image
+    mkvIndex *ix = &(t->index[0]);
+    if(ix->size < 44) // 8 frame container + 28 frame header + 8 picture header
+    {
+        ADM_warning("Invalid frame data length %u for ProRes\n",ix->size);
+        return; // invalid data
+    }
+    _parser->seek(ix->pos+3);
+#define PRORES_PROBESIZE 36
+    uint8_t buf[PRORES_PROBESIZE];
+    uint32_t len = t->headerRepeatSize;
+    ADM_assert(len < PRORES_PROBESIZE);
+    len = PRORES_PROBESIZE - len;
+    len = readAndRepeat(0,buf,len);
+    if(len != PRORES_PROBESIZE)
+    {
+        ADM_warning("Read failure, wanted %u bytes, got %u\n",PRORES_PROBESIZE,len);
+        return;
+    }
+    uint32_t off = 12; // hdrSize (2) + version (2) + creatorID (4) + width (2) + height (2)
+    if(fourCC::check(buf + 4, (uint8_t *)"icpf"))
+        off += 8; // frame container
+
+    uint8_t flags = buf[off];
+
+    uint64_t bitsPerMb = t->_sizeInBytes << 3; // Size of ProRes headers is usually negligible.
+    bitsPerMb /= mb * t->index.size();
+
+    if((flags >> 6) & 1) // ProRes 4444
+    {
+        for(int i = FIRST_4444_PROFILE; i < NUM_PROFILES; i++)
+        {
+            if(profTab[i].bitrate[level] >= bitsPerMb)
+            {
+                _videostream.fccHandler = _video_bih.biCompression = fourCC::get((uint8_t *)profTab[i].fourcc);
+                return;
+            }
+        }
+        ADM_warning("Bits per macroblock value %" PRIu64" too high even for 4444 XQ?\n",bitsPerMb);
+        _videostream.fccHandler = _video_bih.biCompression = fourCC::get((uint8_t *)"ap4x");
+        return;
+    }
+    // ProRes 422
+    for(int i = 0; i < FIRST_4444_PROFILE; i++)
+    {
+        if(profTab[i].bitrate[level] >= bitsPerMb)
+        {
+            _videostream.fccHandler = _video_bih.biCompression = fourCC::get((uint8_t *)profTab[i].fourcc);
+            return;
+        }
+    }
+    ADM_warning("Bits per macroblock value %" PRIu64" too high even for HQ?\n",bitsPerMb);
+    _videostream.fccHandler = _video_bih.biCompression = fourCC::get((uint8_t *)"apch");
+}
+
 //****************************************
 //EOF

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.h Changed

@@ -68,6 +68,7 @@
         _defaultFrameDuration=0;
         language=ADM_UNKNOWN_LANGUAGE;
         _needBuffering=0;
+        _secondField=false;
   }
   /* Index in mkv */
   uint32_t  streamIndex;
@@ -90,10 +91,11 @@
   uint8_t    headerRepeat[MKV_MAX_REPEAT_HEADER_SIZE];
   mkvListOfIndex  index;
 
-  uint32_t  _sizeInBytes; // Approximate size in bytes of that stream
+  uint64_t  _sizeInBytes; // Approximate size in bytes of that stream
   uint32_t  _defaultFrameDuration; // Duration of ONE frame in us!
   std::string language;
   int       _needBuffering;
+  bool      _secondField; // Used to clear keyframe flag from the second field
 };
 
 #define MKV_MAX_LACES 101 // ?
@@ -253,6 +255,7 @@
 
     bool                    ComputeDeltaAndCheckBFrames(uint32_t *minDeltaX, uint32_t *maxDeltaX, bool *bFramePresent);
     bool                    updateFlagsWithCue(void); // in case we can trust it, update KEY_FRAME_FLAGS
+    void                    updateProResFourCC(void);
     bool                    dumpVideoIndex(int maxIndex);
     bool                    goBeforeAtomAtPosition(ADM_ebml_file *parser, uint64_t position,uint64_t &outputLen,
                                                 MKV_ELEM_ID searchedId,const char *txt);
@@ -299,6 +302,7 @@
     virtual uint64_t getTime(uint32_t frameNum);
 
     virtual uint64_t getVideoDuration(void);
+    virtual uint64_t getVideoTrackSize(void);
     virtual	uint8_t	 getExtraHeaderData(uint32_t *len, uint8_t **data);
 
 virtual   bool       getPtsDts(uint32_t frame,uint64_t *pts,uint64_t *dts);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

@@ -26,6 +26,8 @@
 
 #include "mkv_tags.h"
 #include "ADM_aacinfo.h"
+#include "ADM_iso639.h"
+
 class entryDesc
 {
   public:
@@ -37,6 +39,7 @@
           uint32_t w,h,fps;
           uint32_t fq,chan,bpp;
           uint32_t colflags,colrange,colprim,coltc,colmcoeff;
+          ADM_HDR_Info hdrInfo;
           uint32_t defaultDuration;
           float    trackScale;
           uint8_t *extraData;
@@ -48,7 +51,7 @@
           uint8_t    headerRepeat[MKV_MAX_REPEAT_HEADER_SIZE];
           entryDesc()
           {
-              codecId=language=std::string("");
+              language="und";
               trackNo=0;
               trackType=0;
               extraDataLen=0;
@@ -206,6 +209,7 @@
         _videoColPrimaries=entry.colprim;
         _videoColTransferCharacteristic=entry.coltc;
         _videoColMatrixCoefficients=entry.colmcoeff;
+        _videoColHDRInfo = entry.hdrInfo;
 
 #define AV1_EXTRADATA_OFFSET 4
 
@@ -397,10 +401,12 @@
    uint64_t id,len;
   ADM_MKV_TYPE type;
   const char *ss;
+  bool ietfLanguageTagFound = false;
 
   while(!father.finished())
   {
-      father.readElemId(&id,&len);
+      if(!father.readElemId(&id,&len))
+        continue;
       if(!ADM_searchMkvTag( (MKV_ELEM_ID)id,&ss,&type))
       {
         printf("[MKV/entryWalk] Tag 0x%" PRIx64" not found (len %" PRIu64")\n",id,len);
@@ -446,6 +452,152 @@
             entry->colflags |= ADM_COL_FLAG_PRIMARIES_SET;
             ADM_info("Primaries: %u\n",entry->colprim);
             break;
+        case  MKV_VIDEO_COLOUR_MAX_CLL:
+            {
+                uint32_t val = father.readUnsignedInt(len);
+                ADM_info("MaxCLL: %u\n",val);
+                entry->hdrInfo.maxCLL = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_MAX_FALL:
+            {
+                uint32_t val = father.readUnsignedInt(len);
+                ADM_info("MaxFALL: %u\n",val);
+                entry->hdrInfo.maxFALL = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_RED_X:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("Red X out of range\n");
+                    break;
+                }
+                ADM_info("Red X: %f\n",val);
+                entry->hdrInfo.primaries[0][0] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_RED_Y:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("Red Y out of range\n");
+                    break;
+                }
+                ADM_info("Red Y: %f\n",val);
+                entry->hdrInfo.primaries[0][1] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_GREEN_X:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("Green X out of range\n");
+                    break;
+                }
+                ADM_info("Green X: %f\n",val);
+                entry->hdrInfo.primaries[1][0] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_GREEN_Y:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("Green Y out of range\n");
+                    break;
+                }
+                ADM_info("Green Y: %f\n",val);
+                entry->hdrInfo.primaries[1][1] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_BLUE_X:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("Blue X out of range\n");
+                    break;
+                }
+                ADM_info("Blue X: %f\n",val);
+                entry->hdrInfo.primaries[2][0] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_BLUE_Y:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("Blue Y out of range\n");
+                    break;
+                }
+                ADM_info("Blue Y: %f\n",val);
+                entry->hdrInfo.primaries[2][1] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_WHITE_X:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("White point X out of range\n");
+                    break;
+                }
+                ADM_info("White point X: %f\n",val);
+                entry->hdrInfo.whitePoint[0] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_WHITE_Y:
+            {
+                double val = father.readFloat(len);
+                if(val < 0. || val > 1.) // invalid data
+                {
+                    ADM_warning("White point Y out of range\n");
+                    break;
+                }
+                ADM_info("White point Y: %f\n",val);
+                entry->hdrInfo.whitePoint[1] = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_MAX_LUM:
+            {
+                double val = father.readFloat(len);
+                if(val < 0.) // invalid data
+                {
+                    ADM_warning("Max. luminance out of range\n");
+                    break;
+                }
+                ADM_info("Max. luminance: %f\n",val);
+                entry->hdrInfo.maxLuminance = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
+        case  MKV_VIDEO_COLOUR_MIN_LUM:
+            {
+                double val = father.readFloat(len);
+                if(val < 0.) // invalid data
+                {
+                    ADM_warning("Min. luminance out of range\n");
+                    break;
+                }
+                ADM_info("Min. luminance: %f\n",val);
+                entry->hdrInfo.minLuminance = val;
+            }
+            entry->colflags |= ADM_COL_FLAG_HDR_INFO_SET;
+            break;
 
         case  MKV_DISPLAY_HEIGHT: ADM_info("Display Height:%d\n",(int)father.readUnsignedInt(len));break;
         case  MKV_DISPLAY_WIDTH: ADM_info("Display Width:%d\n",(int)father.readUnsignedInt(len));break;
@@ -469,13 +621,16 @@
         case  MKV_AUDIO_SETTINGS:
         case  MKV_VIDEO_SETTINGS:
         case  MKV_VIDEO_COLOUR:
+        case  MKV_VIDEO_COLOUR_MASTERING_META:
         case  MKV_CONTENT_ONE_ENCODING:
         case  MKV_CONTENT_ENCODINGS:
         case  MKV_CONTENT_COMPRESSION:
                   entryWalk(&father,len,entry);
                   break;
         case MKV_LANGUAGE:
+        case MKV_LANGUAGE_IETF:
                 {
+                 if(ietfLanguageTagFound) break;
                  char s[100];
                  s[99]=0;
                  father.readString(s,len);
@@ -490,8 +645,21 @@
                  }else
                  {
                      ADM_info("Found language  = %s\n",s);
+                     if(id == MKV_LANGUAGE_IETF)
+                     {
+                         s[2] = 0; // hack, we don't support BCP 47 yet, so we strip it down to ISO-639-1
+                         if(!strcmp(s,"un")) break;
+                         const ADM_iso639_t *langTable = ADM_getLanguageList();
+                         int ix = ADM_getIndexForIso639(s);
+                         if(ix < 0 || ix >= ADM_getLanguageListSize())
+                             break; // maybe we have got valid ISO-639-2 and could use it
+                         ADM_info("Deriving language code from BCP 47: %s --> %s\n",s,langTable[ix].iso639_2);
+                         entry->language = langTable[ix].iso639_2;
+                         ietfLanguageTagFound = true;
+                         break;
+                     }
                  }
-                 entry->language=std::string(s);
+                 entry->language = s;
                 }
             break;
         case MKV_CODEC_ID:
@@ -499,8 +667,7 @@
             uint8_t *codec=new uint8_t[len+1];
                   father.readBin(codec,len);
                   codec[len]=0;
-                  std::string codecAsString=std::string((char *)codec);
-                  entry->codecId=codecAsString;
+                  entry->codecId = (char *)codec;
                   entry->fcc=ADM_mkvCodecToFourcc((char *)codec);
                   
                   delete [] codec;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

@@ -13,6 +13,7 @@
  ***************************************************************************/
 #include "ADM_cpp.h"
 #include <math.h>
+#include <climits>
 
 #include "ADM_default.h"
 #include "ADM_Video.h"
@@ -183,6 +184,7 @@
 {
     if(isMpeg4Compatible(fcc) || isVC1Compatible(fcc)) return true;
     if(isH264Compatible(fcc)) return true;
+    if(isH265Compatible(fcc)) return true;
     if(isMpeg12Compatible(fcc)) return true;
     return false;
 
@@ -205,6 +207,7 @@
     ix.Pts=timecodeMS*_timeBase;
     //printf("Track=%d, timecode=%d timeBase=%d, Pts=%d\n",track,(int)timecodeMS,(int)_timeBase,ix.Pts);
     uint32_t rpt=_tracks[0].headerRepeatSize;
+    uint32_t frameNo = Track->index.size();
 
     // expand buffer if needed
     if(size>readBufferSize)
@@ -249,7 +252,7 @@
                 memcpy(_tracks[0].paramCache,&timeIncBits,u32);
             }else
             {
-                ADM_warning("No VOP at index entry %u, corrupted data? Size: %d\n",Track->index.size(),rpt+size-3);
+                ADM_warning("No VOP at index entry %u, corrupted data? Size: %d\n",frameNo,rpt+size-3);
             }
             ix.flags=vops[0].type;
 
@@ -314,7 +317,7 @@
                         MATCH(refFrames)
                         if(!match)
                         {
-                            ADM_warning("Codec parameters change on the fly at frame %u, expect problems.\n",Track->index.size());
+                            ADM_warning("Codec parameters change on the fly at frame %u, expect problems.\n",frameNo);
                             // Nevertheless, update the cached info
                             memcpy(_tracks[0].infoCache, &info2, sz);
                         }
@@ -327,33 +330,73 @@
                     _tracks[0].paramCacheSize=inBandSpsLen;
                 }
             }
+            bool r = false;
             if(AnnexB)
-                extractH264FrameType_startCode(readBuffer, rpt+size-3, &flags, NULL, info, &_H264Recovery);
+                r = extractH264FrameType_startCode(readBuffer, rpt+size-3, &flags, NULL, info, &_H264Recovery);
             else
-                extractH264FrameType(readBuffer, rpt+size-3, nalSize, &flags, NULL, info, &_H264Recovery);
-            if(flags & AVI_KEY_FRAME)
+                r = extractH264FrameType(readBuffer, rpt+size-3, nalSize, &flags, NULL, info, &_H264Recovery);
+            if(r)
             {
-                printf("[MKV/H264] Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+                if(flags & AVI_KEY_FRAME)
+                {
+                    if(flags & AVI_FIELD_STRUCTURE)
+                    {
+                        if(Track->_secondField)
+                        {
+                            printf("[MKV/H264] Clearing keyframe flag from second field at index entry %" PRIu32"\n",frameNo);
+                            flags &= ~AVI_KEY_FRAME;
+                        }
+                        Track->_secondField = !Track->_secondField;
+                    }
+                    setFlag(frameNo,flags);
+                    if(flags & AVI_KEY_FRAME)
+                        printf("[MKV/H264] Frame %" PRIu32" is a keyframe\n",frameNo);
+                }else
+                    Track->_secondField = false;
+                ix.flags=flags;
+                if(Track->index.size()) ix.Dts=ADM_NO_PTS;
             }
-            ix.flags=flags;
-            if(Track->index.size()) ix.Dts=ADM_NO_PTS;
-
-        }/*else if(isH265Compatible(_videostream.fccHandler))
+        }else if(isH265Compatible(_videostream.fccHandler))
         {
             uint32_t flags=AVI_KEY_FRAME;
 
             if(rpt)
                 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);
             parser->readBin(readBuffer+rpt,size-3);
-            extractH265FrameType(2,readBuffer,rpt+size-3,&flags); // Nal size is not used in that case
-            if(flags & AVI_KEY_FRAME)
+
+            // Deal with Matroska files containing Annex-B type of HEVC stream
+            bool AnnexB=false;
+            if(!_tracks[0].extraDataLen && rpt+size > 3 && !readBuffer[0] && !readBuffer[1])
             {
-                printf("[MKV/H265] Frame %" PRIu32" is a keyframe\n",(uint32_t)Track->index.size());
+                uint32_t mark=(readBuffer[2] << 8) + readBuffer[3];
+                if(mark == 1 || (mark > 0xFF && mark < 0x200 && rpt+size-3 != mark+4))
+                    AnnexB=true;
             }
-            ix.flags=flags;
-            if(Track->index.size()) ix.Dts=ADM_NO_PTS;
 
-        }*/else if(isMpeg12Compatible(_videostream.fccHandler))
+            uint32_t nalSize=0;
+            if(_tracks[0].extraDataLen)
+                nalSize = ADM_getNalSizeH265(_tracks[0].extraData, _tracks[0].extraDataLen);
+
+            ADM_SPSinfoH265 info; // TODO: check for inband VPS/PPS/SPS changing on the fly
+            int poc = INT_MIN;
+
+            bool r = false;
+            if(AnnexB)
+                r = extractH265FrameType_startCode(readBuffer, rpt+size-3, &info, &flags, &poc);
+            else
+                r = extractH265FrameType(readBuffer, rpt+size-3, nalSize, &info, &flags, &poc);
+
+            if(r)
+            {
+                if(flags & AVI_KEY_FRAME)
+                {
+                    printf("[MKV/H265] Frame %" PRIu32" is a keyframe",(uint32_t)Track->index.size());
+                    printf("%s\n",(flags & AVI_IDR_FRAME)? " (IDR)" : " (non-IDR)");
+                }
+                ix.flags=flags;
+                if(Track->index.size()) ix.Dts=ADM_NO_PTS;
+            }
+        }else if(isMpeg12Compatible(_videostream.fccHandler))
         {
             if(rpt)
                 memcpy(readBuffer,_tracks[0].headerRepeat,rpt);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvTrackType.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/mkv_tagenum.h Changed

@@ -83,6 +83,20 @@
   MKTAG(MKV_VIDEO_COLOUR_RANGE,0x55B9,ADM_MKV_TYPE_UINTEGER),
   MKTAG(MKV_VIDEO_COLOUR_TRANSFER,0x55BA,ADM_MKV_TYPE_UINTEGER),
   MKTAG(MKV_VIDEO_COLOUR_PRIMARIES,0x55BB,ADM_MKV_TYPE_UINTEGER),
+  MKTAG(MKV_VIDEO_COLOUR_MAX_CLL,0x55BC,ADM_MKV_TYPE_UINTEGER),
+  MKTAG(MKV_VIDEO_COLOUR_MAX_FALL,0x55BD,ADM_MKV_TYPE_UINTEGER),
+
+  MKTAG(MKV_VIDEO_COLOUR_MASTERING_META,0x55D0,ADM_MKV_TYPE_CONTAINER),
+  MKTAG(MKV_VIDEO_COLOUR_RED_X,0x55D1,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_RED_Y,0x55D2,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_GREEN_X,0x55D3,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_GREEN_Y,0x55D4,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_BLUE_X,0x55D5,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_BLUE_Y,0x55D6,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_WHITE_X,0x55D7,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_WHITE_Y,0x55D8,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_MAX_LUM,0x55D9,ADM_MKV_TYPE_FLOAT),
+  MKTAG(MKV_VIDEO_COLOUR_MIN_LUM,0x55DA,ADM_MKV_TYPE_FLOAT),
 
   MKTAG(MKV_AUDIO_SETTINGS,0xE1,ADM_MKV_TYPE_CONTAINER),
   MKTAG(MKV_AUDIO_FREQUENCY,0xB5,ADM_MKV_TYPE_FLOAT),
@@ -131,6 +145,7 @@
    MKTAG(MKV_MAX_BLOCK_ADD_ID,0x55EE,ADM_MKV_TYPE_UINTEGER),
    MKTAG(MKV_CODEC_DECODE_ALL,0xAA,ADM_MKV_TYPE_UINTEGER),
    MKTAG(MKV_LANGUAGE,0x22B59C,ADM_MKV_TYPE_STRING),
+   MKTAG(MKV_LANGUAGE_IETF,0x22B59D,ADM_MKV_TYPE_STRING),
 
    MKTAG(MKV_DISPLAY_WIDTH,0x54B0,ADM_MKV_TYPE_UINTEGER),
    MKTAG(MKV_DISPLAY_HEIGHT,0x54BA,ADM_MKV_TYPE_UINTEGER),

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp Changed

@@ -56,6 +56,7 @@
 
 #include <string.h>
 #include <math.h>
+#include <climits>
 
 #include "ADM_default.h"
 #include "ADM_Video.h"
@@ -94,6 +95,7 @@
     memset(&_rdWav,0,sizeof(_rdWav));
     delay=0;
     totalDataSize=0;
+    language = ADM_UNKNOWN_LANGUAGE;
 }
 MP4Track::~MP4Track()
 {
@@ -139,6 +141,13 @@
     return _movieDuration*1000LL; //VDEO.index[VDEO.nbIndex-1].time;
 
 }
+/**
+    \fn getVideoTrackSize
+*/
+uint64_t                   MP4Header::getVideoTrackSize(void)
+{
+    return _tracks[0].totalDataSize;
+}
 
 #ifdef DERIVE_TB_FROM_MINIMUM_DELTA
 /**
@@ -496,6 +505,7 @@
                 img.data=bfer;
                 uint32_t i,fields=0,nb=VDEO.nbIndex;
                 uint64_t processed=0;
+                bool secondField = false;
                 DIA_processingBase *work=createProcessing(QT_TRANSLATE_NOOP("mp4demuxer","Decoding frame type"),nb);
                 for(i=0;i<nb;i++)
                 {
@@ -561,6 +571,16 @@
                     {
                         if(flags & AVI_FIELD_STRUCTURE)
                         {
+                            if(flags & AVI_KEY_FRAME)
+                            {
+                                if(secondField)
+                                {
+                                    printf("Removing keyframe flag from second field at frame %u\n",i);
+                                    flags &= ~AVI_KEY_FRAME;
+                                }
+                                secondField = !secondField;
+                            }else
+                                secondField = false;
                             if(!fields)
                                 printf("First field at frame %u\n",i);
                             fields++;
@@ -585,6 +605,69 @@
                 else
                     ADM_info("Probably a frame encoded H.264 stream.\n");
             }
+        }else if(isH265Compatible(_videostream.fccHandler) && VDEO.extraDataSize)
+        { // Get frame type from HEVC slice headers
+            ADM_SPSinfoH265 info;
+            if(extractSPSInfoH265(VDEO.extraData,VDEO.extraDataSize,&info))
+            {
+                uint32_t nalSize = ADM_getNalSizeH265(VDEO.extraData,VDEO.extraDataSize);
+                uint8_t *bfer = new uint8_t[MAX_FRAME_LENGTH];
+                ADMCompressedImage img;
+                img.data = bfer;
+                int poc = INT_MIN;
+                uint32_t i, nb = VDEO.nbIndex, mismatched = 0;
+                uint64_t processed = 0;
+                DIA_processingBase *work = createProcessing(QT_TRANSLATE_NOOP("mp4demuxer","Decoding frame type"),nb);
+                for(i=0;i<nb;i++)
+                {
+                    if(work && work->update(1,processed++))
+                        break; // cancelling frame type decoding is non-fatal
+                    if(!getFrame(i,&img))
+                    {
+                        ADM_warning("Could not get frame %u while decoding HEVC frame type.\n",i);
+                        continue;
+                    }
+                    // TODO: Check for VPS/PPS/SPS changing on-the-fly. We are in trouble if this happens.
+                    uint32_t flags;
+                    if(extractH265FrameType(img.data,img.dataLength,nalSize,&info,&flags,&poc))
+                    {
+                        // Report disagreement with stss.
+                        uint32_t originalFlags = 0;
+                        if(getFlags(i,&originalFlags))
+                        {
+#define MAX_KEYFRAME_MISMATCH_WARNINGS 50
+                            if((flags & AVI_KEY_FRAME) && !(originalFlags & AVI_KEY_FRAME))
+                            {
+                                if(mismatched == MAX_KEYFRAME_MISMATCH_WARNINGS)
+                                    ADM_warning("Max. number of warnings (%u) reached, suppressing further messages.\n",mismatched++);
+                                else if(mismatched < MAX_KEYFRAME_MISMATCH_WARNINGS)
+                                {
+                                    ADM_warning("Frame %d not marked as keyframe in stss, fixing.\n",i);
+                                    mismatched++;
+                                }
+                            }
+                            if((originalFlags & AVI_KEY_FRAME) && !(flags & AVI_KEY_FRAME))
+                            {
+                                if(mismatched == MAX_KEYFRAME_MISMATCH_WARNINGS)
+                                    ADM_warning("Max. number of warnings (%u) reached, suppressing further messages.\n",mismatched++);
+                                else if(mismatched < MAX_KEYFRAME_MISMATCH_WARNINGS)
+                                {
+                                    ADM_warning("Frame %d wrongly marked as keyframe in stss, removing flag.\n",i);
+                                    mismatched++;
+                                }
+                            }
+                        }
+                        setFlag(i,flags);
+                    }else
+                    {
+                        poc = INT_MIN;
+                    }
+                }
+                if(work) delete work;
+                work=NULL;
+                delete [] bfer;
+                bfer=NULL;
+            }
         }
         /*
          * Veryfy DTS<=PTS
@@ -731,7 +814,9 @@
                 break;
             }
             audioAccess[audio]=new ADM_mp4AudioAccess(name,&(_tracks[1+audio]));
-            audioStream[audio]=ADM_audioCreateStream(&(_tracks[1+audio]._rdWav), audioAccess[audio]);
+            ADM_audioStream *as = ADM_audioCreateStream(&(_tracks[1+audio]._rdWav), audioAccess[audio]);
+            as->setLanguage(_tracks[1+audio].language);
+            audioStream[audio] = as;
         }
         fseeko(_fd,0,SEEK_SET);
         uint64_t duration1=_movieDuration*1000LL;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

@@ -27,8 +27,13 @@
 #include "ADM_videoInfoExtractor.h"
 #include "ADM_mp4Tree.h"
 #include "ADM_vidMisc.h"
+#include "ADM_iso639.h"
 #include "ADM_aacinfo.h"
 
+extern "C" {
+#include "libavutil/pixfmt.h"
+}
+
 #if 1
 #define aprintf(...) {}
 #else
@@ -48,6 +53,179 @@
     Tag_DecSpecificInfo   =0x05
 }MP4_Tag;
 
+/**
+    \fn langCodeToIso639
+    \brief Stolen from libavcodec/isom.c, original code by François Revol and quink-black.
+*/
+static std::string langCodeToIso639(uint16_t code)
+{
+    int i;
+    const char macLangTab[][4] =
+    {
+        "eng",    /*   0 English */
+        "fra",    /*   1 French */
+        "ger",    /*   2 German */
+        "ita",    /*   3 Italian */
+        "dut",    /*   4 Dutch */
+        "sve",    /*   5 Swedish */
+        "spa",    /*   6 Spanish */
+        "dan",    /*   7 Danish */
+        "por",    /*   8 Portuguese */
+        "nor",    /*   9 Norwegian */
+        "heb",    /*  10 Hebrew */
+        "jpn",    /*  11 Japanese */
+        "ara",    /*  12 Arabic */
+        "fin",    /*  13 Finnish */
+        "gre",    /*  14 Greek */
+        "ice",    /*  15 Icelandic */
+        "mlt",    /*  16 Maltese */
+        "tur",    /*  17 Turkish */
+        "hr ",    /*  18 Croatian */
+        "chi",    /*  19 Traditional Chinese */
+        "urd",    /*  20 Urdu */
+        "hin",    /*  21 Hindi */
+        "tha",    /*  22 Thai */
+        "kor",    /*  23 Korean */
+        "lit",    /*  24 Lithuanian */
+        "pol",    /*  25 Polish */
+        "hun",    /*  26 Hungarian */
+        "est",    /*  27 Estonian */
+        "lav",    /*  28 Latvian */
+           "",    /*  29 Sami */
+        "fo ",    /*  30 Faroese */
+           "",    /*  31 Farsi */
+        "rus",    /*  32 Russian */
+        "chi",    /*  33 Simplified Chinese */
+           "",    /*  34 Flemish */
+        "iri",    /*  35 Irish */
+        "alb",    /*  36 Albanian */
+        "ron",    /*  37 Romanian */
+        "ces",    /*  38 Czech */
+        "slk",    /*  39 Slovak */
+        "slv",    /*  40 Slovenian */
+        "yid",    /*  41 Yiddish */
+        "sr ",    /*  42 Serbian */
+        "mac",    /*  43 Macedonian */
+        "bul",    /*  44 Bulgarian */
+        "ukr",    /*  45 Ukrainian */
+        "bel",    /*  46 Belarusian */
+        "uzb",    /*  47 Uzbek */
+        "kaz",    /*  48 Kazakh */
+        "aze",    /*  49 Azerbaijani */
+        "aze",    /*  50 AzerbaijanAr */
+        "arm",    /*  51 Armenian */
+        "geo",    /*  52 Georgian */
+        "mol",    /*  53 Moldavian */
+        "kir",    /*  54 Kirghiz */
+        "tgk",    /*  55 Tajiki */
+        "tuk",    /*  56 Turkmen */
+        "mon",    /*  57 Mongolian */
+           "",    /*  58 MongolianCyr */
+        "pus",    /*  59 Pashto */
+        "kur",    /*  60 Kurdish */
+        "kas",    /*  61 Kashmiri */
+        "snd",    /*  62 Sindhi */
+        "tib",    /*  63 Tibetan */
+        "nep",    /*  64 Nepali */
+        "san",    /*  65 Sanskrit */
+        "mar",    /*  66 Marathi */
+        "ben",    /*  67 Bengali */
+        "asm",    /*  68 Assamese */
+        "guj",    /*  69 Gujarati */
+        "pa ",    /*  70 Punjabi */
+        "ori",    /*  71 Oriya */
+        "mal",    /*  72 Malayalam */
+        "kan",    /*  73 Kannada */
+        "tam",    /*  74 Tamil */
+        "tel",    /*  75 Telugu */
+           "",    /*  76 Sinhala */
+        "bur",    /*  77 Burmese */
+        "khm",    /*  78 Khmer */
+        "lao",    /*  79 Lao */
+        "vie",    /*  80 Vietnamese */
+        "ind",    /*  81 Indonesian */
+        "tgl",    /*  82 Tagalog */
+        "may",    /*  83 MalayRoman */
+        "may",    /*  84 MalayArabic */
+        "amh",    /*  85 Amharic */
+        "tir",    /*  86 Galla */
+        "orm",    /*  87 Oromo */
+        "som",    /*  88 Somali */
+        "swa",    /*  89 Swahili */
+           "",    /*  90 Kinyarwanda */
+        "run",    /*  91 Rundi */
+           "",    /*  92 Nyanja */
+        "mlg",    /*  93 Malagasy */
+        "epo",    /*  94 Esperanto */
+           "",    /*  95  */
+           "",    /*  96  */
+           "",    /*  97  */
+           "",    /*  98  */
+           "",    /*  99  */
+           "",    /* 100  */
+           "",    /* 101  */
+           "",    /* 102  */
+           "",    /* 103  */
+           "",    /* 104  */
+           "",    /* 105  */
+           "",    /* 106  */
+           "",    /* 107  */
+           "",    /* 108  */
+           "",    /* 109  */
+           "",    /* 110  */
+           "",    /* 111  */
+           "",    /* 112  */
+           "",    /* 113  */
+           "",    /* 114  */
+           "",    /* 115  */
+           "",    /* 116  */
+           "",    /* 117  */
+           "",    /* 118  */
+           "",    /* 119  */
+           "",    /* 120  */
+           "",    /* 121  */
+           "",    /* 122  */
+           "",    /* 123  */
+           "",    /* 124  */
+           "",    /* 125  */
+           "",    /* 126  */
+           "",    /* 127  */
+        "wel",    /* 128 Welsh */
+        "baq",    /* 129 Basque */
+        "cat",    /* 130 Catalan */
+        "lat",    /* 131 Latin */
+        "que",    /* 132 Quechua */
+        "grn",    /* 133 Guarani */
+        "aym",    /* 134 Aymara */
+        "tat",    /* 135 Tatar */
+        "uig",    /* 136 Uighur */
+        "dzo",    /* 137 Dzongkha */
+        "jav",    /* 138 JavaneseRom */
+    };
+
+    char out[4] = {0};
+    if(code >= 0x400 && code != 0x7fff) // packed ISO
+    {
+        for(i = 2; i >= 0; i--)
+        {
+            out[i] = 0x60 + (code & 0x1f);
+            code >>= 5;
+        }
+        return std::string(out);
+    }
+    // else Macintosh Language Codes are used
+    uint32_t nb = sizeof(macLangTab) / sizeof(macLangTab[0]);
+    if(code >= nb)
+        return ADM_UNKNOWN_LANGUAGE;
+    const char *lang = macLangTab[code];
+    if(!lang[0]) return ADM_UNKNOWN_LANGUAGE;
+    int ix = ADM_getIndexForIso639(lang);
+    if(ix < 0) return ADM_UNKNOWN_LANGUAGE;
+    const ADM_iso639_t *list = ADM_getLanguageList();
+    lang = list[ix].iso639_2;
+    return std::string(lang);
+}
+
 //extern char* ms2timedisplay(uint32_t ms);
 
 /**
@@ -246,8 +424,9 @@
         DUMPX(defaultFlags)
         _trexData[nbTrex++]=trx;
         son.skipAtom();
-        return 1;
     }
+    if(nbTrex)
+        return 1;
     ADM_info("trex box not found.\n");
     return 0;
 }
@@ -345,6 +524,7 @@
     uint32_t trackScale=_videoScale;
     uint64_t trackDuration=0;
     *trackType=TRACK_OTHER;
+    std::string language = ADM_UNKNOWN_LANGUAGE;
     uint8_t r=0;
 
     ADM_info("<<Parsing Mdia>>\n");
@@ -385,6 +565,9 @@
                 aprintf( "MDHD, duration in mdhd: %u (scaled ms)\n", duration);
                 trackDuration = duration;
                 //printf("MDHD, Track duration: %s, trackScale: %u\n", ms2timedisplay((1000 * duration) / trackScale), trackScale);
+                uint16_t langcode = son.read16();
+                language = langCodeToIso639(langcode);
+                printf("[mdhd] Language: %s (code: %d)\n",language.c_str(),langcode);
 
                 break;
             }
@@ -417,13 +600,21 @@
                         _videoScale=trackScale;
                         _tracks[0].scale=_videoScale;
                         _tracks[0].id=*trackId;
+                        _tracks[0].language = language;
                         break;
                     case MKFCCR('s','o','u','n'): // 'soun'
-                        _tracks[1+nbAudioTrack].delay=_currentDelay;
-                        _tracks[1+nbAudioTrack].startOffset=_currentStartOffset;
-                        _tracks[1+nbAudioTrack].id=*trackId;
+                        if(nbAudioTrack + 1 >= _3GP_MAX_TRACKS)
+                        {
+                            ADM_warning("hdlr audio found, but the max # of audio tracks %" PRIu32" already reached, skipping.\n",nbAudioTrack);
+                            break;
+                        }
+                        nbAudioTrack++;
+                        _tracks[nbAudioTrack].delay=_currentDelay;
+                        _tracks[nbAudioTrack].startOffset=_currentStartOffset;
+                        _tracks[nbAudioTrack].language = language;
+                        _tracks[nbAudioTrack].id=*trackId;
                         if(!*trackId)
-                            ADM_warning("Invalid track ID for audio track %d\n",1+nbAudioTrack);
+                            ADM_warning("Invalid track ID for audio track %d\n",nbAudioTrack);
                         *trackType=TRACK_AUDIO;
                         ADM_info("hdlr audio found \n ");
                         break;
@@ -754,7 +945,7 @@
                 son.read32(); // flags & version
                 int nbEntries=son.read32();
                 int left;
-                aprintf("[STSD]Found %d entries\n",nbEntries);
+                ADM_info("[STSD] Number of entries: %d\n",nbEntries);
                 for(int i=0;i<nbEntries;i++)
                 {
                     int entrySize=son.read32();
@@ -794,7 +985,7 @@
                             left-=4;
 
                             printf("[STSD] FrameCount :%u\n",son.read16());
-                            left-=4;
+                            left-=2;
 
                             // Codec name
                             uint32_t u32=son.read();
@@ -809,7 +1000,7 @@
                             {
                                 son.read32();
                                 left-=4; // Depth & color Id
-                            }else left=0;
+                            }
 
                             printf("LEFT:%d\n",left);
 
@@ -913,6 +1104,10 @@
                                     commonPart(MJPG);
                                     break;
 
+                                case MKFCCR('p','n','g',' '): // png
+                                    _videostream.fccHandler = _video_bih.biCompression = fourCC::get((uint8_t *)"PNG ");
+                                    break;
+
                                 case MKFCCR('A','V','d','n'): // DNxHD
                                     commonPart(AVdn);
                                     break;
@@ -936,6 +1131,10 @@
                                 case MKFCCR('a','p','4','h'): // ProRes 4444
                                     commonPart(ap4h);
                                     break;
+
+                                case MKFCCR('a','p','4','x'): // ProRes 4444 XQ
+                                    commonPart(ap4x);
+                                    break;
 //
                                 case MKFCCR('h','e','v','1'): // hev1 / hevc
                                 case MKFCCR('h','v','c','1'): // hev1 / hevc
@@ -963,6 +1162,7 @@
                                 }
 //
                                 case MKFCCR('a','v','c','1'): // avc1
+                                case MKFCCR('a','v','c','3'): // avc3
                                 {
                                     commonPart(H264);
                                     // There is a avcC atom just after
@@ -1075,6 +1275,59 @@
                                     left=0;
                                     break;
 
+                                case MKFCCR('v','p','0','9'): // VP9
+                                    _videostream.fccHandler = _video_bih.biCompression = fourCC::get((uint8_t *)"VP9 ");
+                                    while(!son.isDone())
+                                    {
+                                        adm_atom vpc(&son);
+                                        if(vpc.getFCC() != MKFCCR('v','p','c','C'))
+                                        {
+                                            vpc.skipAtom();
+                                            continue;
+                                        }
+                                        int64_t len = vpc.getRemainingSize();
+#define VPCC_SIZE 12
+                                        if(len != VPCC_SIZE)
+                                            ADM_warning("Unexpected vpcC size %" PRId64" instead of %u\n",len,VPCC_SIZE);
+                                        else
+                                        {
+                                            uint8_t *tmp = new uint8_t[VPCC_SIZE];
+                                            if(!vpc.readPayload(tmp,VPCC_SIZE))
+                                            {
+                                                delete [] tmp;
+                                                tmp = NULL;
+                                                ADM_warning("Cannot read vpcC.\n");
+                                                vpc.skipAtom();
+                                                continue;
+                                            }
+
+                                            ADM_info("Raw vpcC:\n");
+                                            mixDump(tmp,VPCC_SIZE);
+
+                                            uint8_t *p = tmp;
+                                            uint8_t version = *p++;
+                                            if(version != 1)
+                                                ADM_warning("Unsupported vpcC version, expected 1, got %u\n",version);
+                                            else
+                                            {
+                                                p += 3+1+1; // flags, profile and level
+                                                _videoColRange = (*p++ & 1) ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
+                                                _videoColPrimaries = *p++;
+                                                _videoColTransferCharacteristic = *p++;
+                                                _videoColMatrixCoefficients = *p;
+                                                _videoColFlags = ADM_COL_FLAG_RANGE_SET | ADM_COL_FLAG_PRIMARIES_SET | ADM_COL_FLAG_TRANSFER_SET | ADM_COL_FLAG_MATRIX_COEFF_SET;
+                                                ADM_info("Color properties from vpcC:\n\trange:\t\t%u\n\tprimaries:\t%u\n\ttransfer:\t%u\n\tmcoeff:\t\t%u\n",
+                                                    _videoColRange, _videoColPrimaries, _videoColTransferCharacteristic, _videoColMatrixCoefficients);
+                                            }
+                                            delete [] tmp;
+                                            tmp = NULL;
+                                            vpc.skipAtom();
+                                        }
+                                    }
+                                    son.skipAtom();
+                                    left = 0;
+                                    break;
+
                                 default:
                                     if(left>10)
                                     {
@@ -1084,13 +1337,13 @@
                                     }
                                     break;
                             } // entryName
-
                             break;
-                        } // trackType
+                        } // TRACK_VIDEO
 
                         case TRACK_AUDIO:
                         {
-                            uint32_t channels,bpp,encoding,fq,packSize;
+                            uint32_t channels,bpp,fq,packSize;
+                            uint32_t lpcmFlags = 0;
 
                             // Put some defaults
                             ADIO.encoding=WAV_UNKNOWN;
@@ -1105,6 +1358,11 @@
 
                             int atomVersion=son.read16(); // version
                             left-=2;
+                            if(atomVersion > 2)
+                            {
+                                ADM_warning("[stsd] Unsupported audio sample description version %d, skipping track.\n",atomVersion);
+                                break;
+                            }
                             printf("[STSD]Revision       :%d\n",atomVersion);
                             son.skipBytes(2); // Revision level
                             left-=2;
@@ -1112,25 +1370,41 @@
                             printf("[STSD]Vendor         : %s\n",fourCC::tostringBE(son.read32()));
                             left-=4;
 
-                            ADIO.channels=channels=son.read16(); // Number of channels
+                            channels = son.read16(); // Number of channels when version < 2
                             left-=2;
-                            printf("[STSD]Channels       :%d\n",ADIO.channels);
-                            ADIO.bitspersample=bpp=son.read16(); // Sample Size
+                            if(atomVersion < 2)
+                            {
+                                printf("[STSD]Channels       :%d\n",channels);
+                                ADIO.channels = channels;
+                            }else if(channels != 3)
+                                ADM_warning("[stsd] Audio sample description version 2, but always3 = %u\n",channels);
+
+                            bpp = son.read16(); // Sample Size
                             left-=2;
                             printf("[STSD]Bit per sample :%d\n",bpp);
+                            if(atomVersion < 2)
+                                ADIO.bitspersample = bpp;
 
-                            encoding=son.read16(); // Compression ID
+                            son.read16(); // Compression ID
                             left-=2;
-                            printf("[STSD]Encoding       :%d\n",encoding);
 
-                            packSize=son.read16(); // Packet Size
+                            son.read16(); // Packet Size
                             left-=2;
-                            printf("[STSD]Packet size    :%d\n",packSize);
 
-                            fq=ADIO.frequency=son.read16();
-                            printf("[STSD]Fq:%u\n",fq);
-                            if(ADIO.frequency<6000) ADIO.frequency=48000;
-                            printf("[STSD]Fq       :%d\n",ADIO.frequency); // Sample rate
+                            fq = son.read16();
+                            if(atomVersion < 2)
+                            {
+                                printf("[STSD]Fq:%u\n",fq);
+                                if(fq != trackScale)
+                                    ADM_warning("[stsd] Sampling rate in audio sample description doesn't match track scale!\n");
+                                if(fq < MIN_SAMPLING_RATE)
+                                {
+                                    ADM_warning("[stsd] Sampling rate below minimum supported, making something up.\n");
+                                    fq = 48000;
+                                }
+                                ADIO.frequency = fq;
+                                printf("[STSD]Fq       :%d\n",ADIO.frequency); // Sample rate
+                            }
                             son.skipBytes(2); // Fixed point
                             left-=4;
                             printf("Bytes left : %d\n",left);
@@ -1161,16 +1435,19 @@
                                 }
                                 case 2:
                                 {
-                                    printf("v2.0 = %d\n",son.read32());
-                                    printf("v2.1 = %d\n",son.read32());
-                                    printf("v2.2 = %d\n",son.read32());
-#define MARK(x) {uint32_t v=son.read32(); printf(#x " => %d\n",v);x=v;}                                          
+                                    printf("v2.0 sizeOfStructOnly = %u\n",son.read32());
+                                    union { uint64_t i; double d; } freq64;
+                                    freq64.i = son.read64();
+                                    ADIO.frequency = fq = (((uint64_t)freq64.d) & 0xFFFFFFFF);
+#define MARK(x) {uint32_t v=son.read32(); printf(#x " => %d\n",v);x=v;}
                                     MARK(channels);
                                     printf("0x7f000 = 0x%x\n",son.read32());
                                     MARK(bpp);
-                                    printf("LPCM flags= %d\n",son.read32());
+                                    lpcmFlags = son.read32();
+                                    printf("LPCM flags= %d\n",lpcmFlags);
                                     printf("byte per frame = %d\n",son.read32());
                                     printf("sample per frame = %d\n",son.read32());
+                                    ADIO.bitspersample=bpp;
                                     ADIO.channels=channels;
                                     info.bytePerPacket=bpp/8;
                                     info.bytePerFrame=info.bytePerPacket*ADIO.channels;
@@ -1179,7 +1456,7 @@
                                     break;
                                 }
                             } // atomVersion
-                            printf("[STSD] chan:%u bpp:%u encoding:%u fq:%u (left %u)\n",channels,bpp,encoding,fq,left);
+                            printf("[STSD] chan:%u bpp:%u fq:%u (left %u)\n",channels,bpp,fq,left);
 #define audioCodec(x) ADIO.encoding=WAV_##x;
                             switch(entryName)
                             {
@@ -1194,7 +1471,7 @@
                                     break;
                                 case MKFCCR('l','p','c','m'):
                                     ADIO.byterate=ADIO.frequency*ADIO.bitspersample*ADIO.channels/8;
-                                    audioCodec(PCM);
+                                    ADIO.encoding = (lpcmFlags & 2)? WAV_LPCM : WAV_PCM;
 
                                     break;
                                 case MKFCCR('t','w','o','s'):
@@ -1262,9 +1539,9 @@
                                         audioCodec(OPUS)
                                     }
                                     sz=son.getRemainingSize();
-                                    _tracks[1+nbAudioTrack].extraDataSize=sz;
-                                    _tracks[1+nbAudioTrack].extraData=new uint8_t[sz];
-                                    son.readPayload(_tracks[1+nbAudioTrack].extraData,sz);
+                                    _tracks[nbAudioTrack].extraDataSize=sz;
+                                    _tracks[nbAudioTrack].extraData=new uint8_t[sz];
+                                    son.readPayload(_tracks[nbAudioTrack].extraData,sz);
                                     left=0;
 
                                     break;
@@ -1372,7 +1649,7 @@
                             } // entryName
 
                             // all audio part read for current track, if it is AAC and we have extrdata, check the channels...
-                            refineAudio(&(ADIO),_tracks[1+nbAudioTrack].extraDataSize,_tracks[1+nbAudioTrack].extraData);
+                            refineAudio(&(ADIO),_tracks[nbAudioTrack].extraDataSize,_tracks[nbAudioTrack].extraData);
                             break;
                         } // TRACK_AUDIO
                         default:
@@ -1463,15 +1740,14 @@
               info.SzIndentical=info.SzIndentical*ADIO.channels;
             }
 #endif
-            if(nbAudioTrack>=_3GP_MAX_TRACKS-1)
+            if(nbAudioTrack + 1 > _3GP_MAX_TRACKS)
             {
                 ADM_warning("Maximum number of tracks reached, cannot add audio track.\n");
                 r=1;
                 break;
             }
-            r=indexify(&(_tracks[1+nbAudioTrack]),trackScale,&info,1,&nbo);
+            r=indexify(&(_tracks[nbAudioTrack]),trackScale,&info,1,&nbo);
             ADM_info("Indexed audio, nb blocks:%u\n",nbo);
-            nbAudioTrack++;
             _tracks[nbAudioTrack].scale=trackScale;
             if(r)
             {
@@ -1486,7 +1762,6 @@
                     delete [] _tracks[nbAudioTrack].index;
                     _tracks[nbAudioTrack].index=NULL;
                 }
-                nbAudioTrack--;
             }
             r=1; // don't fail on audio
             break;
@@ -1595,15 +1870,15 @@
                         break;
                     case TRACK_AUDIO:
                         printf("Esds for audio\n");
-                        _tracks[1+nbAudioTrack].extraDataSize=l;
-                        _tracks[1+nbAudioTrack].extraData=new uint8_t[l];
-                        if(fread(_tracks[1+nbAudioTrack].extraData,
-                            _tracks[1+nbAudioTrack].extraDataSize,1,_fd)<1)
+                        _tracks[nbAudioTrack].extraDataSize=l;
+                        _tracks[nbAudioTrack].extraData=new uint8_t[l];
+                        if(fread(_tracks[nbAudioTrack].extraData,
+                            _tracks[nbAudioTrack].extraDataSize,1,_fd)<1)
                         {
                             ADM_warning("Error reading audio extradata from file.\n");
-                            delete [] _tracks[1+nbAudioTrack].extraData;
-                            _tracks[1+nbAudioTrack].extraData=NULL;
-                            _tracks[1+nbAudioTrack].extraDataSize=0;
+                            delete [] _tracks[nbAudioTrack].extraData;
+                            _tracks[nbAudioTrack].extraData=NULL;
+                            _tracks[nbAudioTrack].extraDataSize=0;
                         }else
                         {
                             ADM_info("%d bytes of audio extradata successfully read from file.\n",l);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_ps.h Changed

@@ -111,65 +111,62 @@
 /**
     \class psHeader
     \brief mpeg ps demuxer
-
 */
-class psHeader         :public vidHeader
+class psHeader : public vidHeader
 {
   protected:
-    bool    fieldEncoded;
-    bool    readVideo(indexFile *index);
-    bool    readAudio(indexFile *index,const char *name);
-    bool    readIndex(indexFile *index);
-    bool    readScrReset(indexFile *index);
-
-    bool    processVideoIndex(char *buffer);
-    bool    processAudioIndex(char *buffer);
-
-    BVector <dmxFrame *> ListOfFrames;      
-    fileParser      parser;
-    uint32_t       lastFrame;
-    psPacketLinear *psPacket;
-    uint64_t        timeConvert(uint64_t x);
-    bool            updatePtsDts(void);
-protected:
-    ListOfScr                       listOfScrGap;
-    BVector <ADM_psTrackDescriptor *>listOfAudioTracks;
-  public:
+    bool                fieldEncoded;
+    uint32_t            lastFrame;
+    uint64_t            videoTrackSize;
+    uint64_t            videoDuration;
+    fileParser          parser;
+    psPacketLinear      *psPacket;
 
+    BVector <dmxFrame *> ListOfFrames;
+    BVector <ADM_psTrackDescriptor *> listOfAudioTracks;
+    ListOfScr           listOfScrGap;
 
-    virtual   void          Dump(void);
+    bool                readVideo(indexFile *index);
+    bool                readAudio(indexFile *index, const char *name);
+    bool                readIndex(indexFile *index);
+    bool                readScrReset(indexFile *index);
 
-            psHeader( void ) ;
-   virtual  ~psHeader(  ) ;
-// AVI io
-    virtual uint8_t  open(const char *name);
-    virtual uint8_t  close(void) ;
-  //__________________________
-  //  Info
-  //__________________________
+    bool                processVideoIndex(char *buffer);
+    bool                processAudioIndex(char *buffer);
+
+    uint64_t            timeConvert(uint64_t x);
+    bool                updatePtsDts(void);
 
+  public:
+                        psHeader();
+    virtual             ~psHeader();
+
+    virtual void        Dump(void);
+
+  // AVI io
+    virtual uint8_t     open(const char *name);
+    virtual uint8_t     close(void);
   //__________________________
   //  Audio
   //__________________________
-virtual 	WAVHeader              *getAudioInfo(uint32_t i )  ;
-virtual 	uint8_t                 getAudioStream(uint32_t i,ADM_audioStream  **audio);
-virtual     uint8_t                 getNbAudioStreams(void);
-// Frames
+    virtual WAVHeader   *getAudioInfo(uint32_t i);
+    virtual uint8_t     getAudioStream(uint32_t i, ADM_audioStream **audio);
+    virtual uint8_t     getNbAudioStreams(void);
+  // Frames
   //__________________________
   //  video
   //__________________________
 
-    virtual uint8_t  setFlag(uint32_t frame,uint32_t flags);
-    virtual uint32_t getFlags(uint32_t frame,uint32_t *flags);
-    virtual uint8_t  getFrame(uint32_t framenum,ADMCompressedImage *img);
-    virtual uint64_t getTime(uint32_t frame);
-            uint8_t  getExtraHeaderData(uint32_t *len, uint8_t **data);
-    virtual uint64_t getVideoDuration(void);
-    virtual uint8_t  getFrameSize(uint32_t frame,uint32_t *size) ;
-virtual   bool       getPtsDts(uint32_t frame,uint64_t *pts,uint64_t *dts);
-virtual   bool       setPtsDts(uint32_t frame,uint64_t pts,uint64_t dts);
-
+    virtual uint8_t     setFlag(uint32_t frame, uint32_t flags);
+    virtual uint32_t    getFlags(uint32_t frame, uint32_t *flags);
+    virtual uint8_t     getFrame(uint32_t framenum, ADMCompressedImage *img);
+    virtual uint64_t    getTime(uint32_t frame);
+            uint8_t     getExtraHeaderData(uint32_t *len, uint8_t **data);
+
+    virtual uint64_t    getVideoDuration(void);
+    virtual uint64_t    getVideoTrackSize(void) { return videoTrackSize; }
+    virtual uint8_t     getFrameSize(uint32_t frame, uint32_t *size);
+    virtual bool        getPtsDts(uint32_t frame, uint64_t *pts, uint64_t *dts);
+    virtual bool        setPtsDts(uint32_t frame, uint64_t pts, uint64_t dts);
 };
 #endif
-
-

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegPS/ADM_psReadIndex.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_ts.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp Changed

@@ -80,7 +80,8 @@
     uint32_t len;
     TS_PSIpacketInfo psi;
     listOfTsTracks   list;
-    std::vector <uint32_t> listOfPmt;
+    struct pmt { uint32_t pid; uint64_t lastOffset; };
+    std::vector <pmt> listOfPmt;
     ADM_TS_TRACK *tracks=NULL;
     *outTracks=NULL;
     *nbTracks=0;
@@ -112,7 +113,12 @@
             len-=4;
             printf("[TsDemuxer] Pat : Prg:%d Pid: 0x%04x\n",prg,pid);
             if(prg) // if prg==0, it is network Pid, dont need it
-                listOfPmt.push_back(pid);
+            {
+                pmt p;
+                p.pid = pid;
+                p.lastOffset = offset;
+                listOfPmt.push_back(p);
+            }
         }
         start=list.size();
         int size=listOfPmt.size();
@@ -122,12 +128,24 @@
             for(int i=0;i<size;i++) // First PMT is PCR lock ?
             {
                 printf("<<< PMT : %d/%d>>>\n",i,size);
-                uint32_t pid=listOfPmt[i];
-                t->setPos(offset); // Seek back to the position where we started to look for PAT
+                uint32_t pid = listOfPmt[i].pid;
+                t->setPos(listOfPmt[i].lastOffset);
                 if(false==TS_scanPmt(t,pid,&list))
                     continue;
                 if(list.empty())
                     continue;
+                offset = t->getPos();
+                // Update stored offsets if different PMTs share the same pid.
+                for(int z=i+1;z<size;z++)
+                {
+                    if(pid == listOfPmt[z].pid)
+                    {
+                        pmt p;
+                        p.pid = pid;
+                        p.lastOffset = offset;
+                        listOfPmt[z] = p;
+                    }
+                }
                 // Search the video track...
                 for(int j=start;j<list.size();j++)
                 {
@@ -150,7 +168,20 @@
                         break;
                     }
                 }
-                if(videoIndex!=-1) break;
+                if(videoIndex!=-1)
+                {
+                    t->setPos(offset);
+                    TSpacketInfo pkt;
+                    printf("[TS_scanForPrograms] Checking track %d as video track candidate\n",videoIndex);
+                    if(false == t->getNextPacket_NoHeader(list[videoIndex].trackPid,&pkt,false))
+                    {
+                        printf("[TS_scanForPrograms] No packets matching video track pid 0x%x found, skipping PMT\n",list[videoIndex].trackPid);
+                        videoIndex = -1;
+                        continue;
+                    }
+                    printf("[TS_scanForPrograms] Using track %d as video track\n",videoIndex);
+                    break;
+                }
             }
         }
         if(videoIndex==-1)
@@ -253,7 +284,7 @@
         len=psi.payloadSize;
         // We should be protected by CRC here
         int packLen=len;
-        printf("[TsDemuxer] PCR 0x%x, len=%d\n",(r[0]<<8)+r[1],packLen);
+        printf("[TsDemuxer] PCR 0x%x, len=%d\n",((r[0]<<8)+r[1])&0x1fff,packLen);
         r+=2;  
         int programInfoLength=(r[0]<<8)+r[1];
         programInfoLength&=0x3ff;
@@ -280,6 +311,7 @@
             pid&=0x1fff;
             uint8_t *base=r+5;
             r+=size+5;
+            if(packLen < size+5) break;
             packLen-=5+size;
             printf("[PMT]          Type=0x%x pid=%x size=%d\n",type,pid,size);
             const char *str;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp Changed

@@ -199,10 +199,11 @@
 }
 
 /**
-    \fn getNextPsiPacket
-    \brief Take a raw packet of type pid & remove the header
+    \fn getNextPacket_NoHeader
+    \brief Get a raw packet with given pid & remove the header.
+    @param first: Make sure a payload unit starts in this packet, skip data preceding it.
 */
-bool tsPacket::getNextPacket_NoHeader(uint32_t pid,TSpacketInfo *pkt,bool psi)
+bool tsPacket::getNextPacket_NoHeader(uint32_t pid,TSpacketInfo *pkt,bool first)
 {
     uint8_t scratch[188+4];
     int count=0;
@@ -250,10 +251,22 @@
     start=scratch+3;
     end=scratch+TS_PACKET_LEN-1;
 
-    if((fieldControl & 2)|| psi) // Adaptation layer
+    if(fieldControl & 2) // Adaptation layer
     {
-        int payloadSize=*start++;
-        start+=payloadSize;
+        int adaptationFieldLength = *start++;
+        start += adaptationFieldLength;
+        if(start >= end)
+        {
+#ifdef TS_DEBUG2
+            printf("[getNextPacket_NoHeader] Adaptation field length %d out of bounds!\n",adaptationFieldLength);
+#endif
+            goto nextPack;
+        }
+    }
+    if(first && pkt->payloadStart) // skip to the start of new payload
+    {
+        int payloadOffset = *start++;
+        start += payloadOffset;
     }
     int size=(int)(end-start);
     if(size<=0)  
@@ -279,9 +292,34 @@
 {
     return true;
 }
+
+#define PSI_TABLE_HEADER_SIZE 3
+#define PSI_TABLE_SYNTAX_SIZE 5
+#define PSI_CHECKSUM_SIZE 4
+
+/**
+    \fn verifyPsiChecksum
+    @param  data: Pointer to PSI table ID.
+    @param  len:  Size of payload starting with PSI table ID including CRC32 at its end.
+*/
+static bool verifyPsiChecksum(uint8_t *data, uint32_t len)
+{
+    if(len <= PSI_TABLE_HEADER_SIZE + PSI_TABLE_SYNTAX_SIZE + PSI_CHECKSUM_SIZE)
+        return false;
+    len -= PSI_CHECKSUM_SIZE;
+    uint8_t *c = data + len;
+    uint32_t crc1 = mpegTsCRC(data,len);
+    uint32_t crc2 = (c[0]<<24)+(c[1]<<16)+(c[2]<<8)+c[3];
+    if(crc1 == crc2)
+        return true;
+
+    ADM_warning("Bad checksum : %04x vs %04x\n",crc1,crc2);
+    return false;
+}
+
 /**
-    \fn getNextPsiPacket
-    \brief Take a raw packet of type pid & remove the header (PSI)
+    \fn getNextPSI
+    \brief Assemble PSI table data from raw packets with given pid, remove header and checksum.
 */
 #ifdef VERBOSE_PSI
 #define DUMMY(x,n) {dummy=bits.get(n);printf("[TS]: "#x" =0x%x %d\n",dummy,dummy);}
@@ -290,83 +328,131 @@
 #endif
 bool tsPacket::getNextPSI(uint32_t pid,TS_PSIpacketInfo *psi)
 {
+    const int hdr = PSI_TABLE_HEADER_SIZE + PSI_TABLE_SYNTAX_SIZE;
     int multiPacketPsi=0;
     int nbRetries=0;
     uint64_t startOffset=0;
+    uint32_t remaining,sectionLength=0;
+    uint32_t transportStreamId=0;
+    uint32_t dummy;
     TSpacketInfo pkt;
+    uint8_t *ptr = psi->payload;
 nextPack2:
     if(nbRetries && pkt.startAt-startOffset>(1<<25)) // max. 32 MiB
     {
         ADM_warning("Giving up after %d retries, consumed %" PRId64" bytes\n",nbRetries,pkt.startAt-startOffset);
         return false;
     }
-    if(false==getNextPacket_NoHeader(pid,&pkt,true)) return false;    
+    if(false == getNextPacket_NoHeader(pid,&pkt,!multiPacketPsi))
+        return false;
     if(!nbRetries)
         startOffset=pkt.startAt;
     nbRetries++;
-    uint32_t sectionLength=0;
-    uint32_t transportStreamId=0;
-    uint32_t dummy;
-    
-    getBits bits(pkt.payloadSize,pkt.payload);
 
-    DUMMY(tableId,8);
-    int section_syntax_indicator=bits.get(1);
+    if(!multiPacketPsi && !pkt.payloadStart)
+        goto nextPack2;
+
+    if(!multiPacketPsi)
+    {
+        if(pkt.payloadSize < hdr)
+        {
+            ADM_warning("PSI packet size %" PRIu32" too small, need at least %d bytes.\n",pkt.payloadSize,hdr);
+            goto nextPack2;
+        }
+        // getBits needs AV_INPUT_BUFFER_PADDING_SIZE bytes past the end of payload
+        // zeroed out to be safe against overreads.
+        uint8_t paddedBuffer[TS_PACKET_LEN + 64];
+        memcpy(paddedBuffer, pkt.payload, pkt.payloadSize);
+        memset(paddedBuffer + pkt.payloadSize, 0, 64);
+        getBits bits(pkt.payloadSize, paddedBuffer);
+
+        DUMMY(tableId,8);
+        int section_syntax_indicator=bits.get(1);
+
+        if(!section_syntax_indicator)
+        {
 #ifdef VERBOSE_PSI
-    if(!section_syntax_indicator)
-        ADM_warning("Syntax section indicator not set\n");
+            ADM_warning("Syntax section indicator not set\n");
 #endif
-    if(bits.get(1)) // Private bit
-    {
-        ADM_warning("Section syntax is set to private\n");
-        goto nextPack2;
-    }
-    bits.get(2); // 2 Reserved bits
-    sectionLength=bits.get(12); // Section Length
+            goto nextPack2;
+        }
+
+        if(bits.get(1)) // Private bit
+        {
+            ADM_warning("Section syntax is set to private\n");
+            goto nextPack2;
+        }
+        int reserved = bits.get(2); // 2 Reserved bits
+        if(reserved!=3)
+            printf("[getNextPSI] Invalid data: reserved bits = %d, should be 3\n",reserved);
+        int unused = bits.get(2); // 2 unused bits
+        if(unused)
+            printf("[getNextPSI] Invalid data: unused bits = %d, should be 0\n",unused);
+        sectionLength = bits.get(10); // Section Length
+        if(sectionLength <= PSI_TABLE_SYNTAX_SIZE + PSI_CHECKSUM_SIZE ||
+           sectionLength > 0x3FF - PSI_TABLE_HEADER_SIZE)
+        {
+            printf("[getNextPSI] Invalid section length: %d\n",sectionLength);
+            goto nextPack2;
+        }
 #if 1
-    if(sectionLength+3>pkt.payloadSize) 
-    {
-        if(!multiPacketPsi)
-            ADM_warning("[MpegTs] Multi Packet PSI ? sectionLength=%d, len=%d\n",sectionLength,pkt.payloadSize);
-        multiPacketPsi++;
-        goto nextPack2;
-    }
-    if(multiPacketPsi>1)
-        ADM_warning("Multi packet PSI warning repeated %d times\n",multiPacketPsi);
-    multiPacketPsi=0;
+        if(sectionLength + PSI_TABLE_HEADER_SIZE > pkt.payloadSize)
+        {
+            if(!multiPacketPsi)
+                ADM_warning("[MpegTs] Multi Packet PSI ? sectionLength=%d, len=%d\n",sectionLength,pkt.payloadSize);
+            multiPacketPsi++;
+        }
 #endif
-    transportStreamId=bits.get(16);// transportStreamId
+        transportStreamId=bits.get(16);// transportStreamId
 #ifdef VERBOSE_PSI
-    printf("[MpegTs] Section length    =%d\n",sectionLength);
-    printf("[MpegTs] transportStreamId =%d\n",transportStreamId);
+        printf("[MpegTs] Section length    =%d\n",sectionLength);
+        printf("[MpegTs] transportStreamId =%d\n",transportStreamId);
 #endif
-    bits.skip(2);                  // ignored
-    DUMMY(VersionNumber,5);         // Version number
-    DUMMY(CurrentNext,1);           // Current Next indicator
-    psi->count=bits.get(8);           // Section number
-    psi->countMax=bits.get(8);        // Section last number
+        bits.skip(2); // ignored
+        DUMMY(VersionNumber,5); // Version number
+        DUMMY(CurrentNext,1); // Current Next indicator
+        psi->count=bits.get(8); // Section number
+        psi->countMax=bits.get(8); // Section last number
 #ifdef VERBOSE_PSI
-    printf("[MpegTs] Count=%d CountMax=%d\n",psi->count,psi->countMax);
+        printf("[MpegTs] Count=%d CountMax=%d\n",psi->count,psi->countMax);
 #endif
-    if(psi->count!=psi->countMax) return false; // we dont handle split psi at the moment
+        if(psi->count!=psi->countMax) return false; // we dont handle split psi at the moment
 
-    uint8_t *c=pkt.payload+sectionLength-4+3;
+        remaining = sectionLength + PSI_TABLE_HEADER_SIZE;
+    }
 
-// Verify CRC
-    uint32_t crc1=mpegTsCRC(pkt.payload,sectionLength-4+3);
-    uint32_t crc2=(c[0]<<24)+(c[1]<<16)+(c[2]<<8)+c[3];
-    if(crc1!=crc2)
+    if(!multiPacketPsi)
     {
-        printf("[MpegTs] getNextPSI bad checksum :%04x vs %04x\n",crc1,crc2);
-        goto nextPack2;
+        int payloadsize = sectionLength + PSI_TABLE_HEADER_SIZE;
+        if(false == verifyPsiChecksum(pkt.payload, payloadsize))
+            goto nextPack2;
+        payloadsize -= hdr + PSI_CHECKSUM_SIZE;
+        psi->payloadSize=payloadsize;
+        memcpy(psi->payload,pkt.payload+hdr,payloadsize);
+        return true;
     }
 
+    // TODO: check continuity
+
+    // Copy packet payload
+    while(true)
+    {
+        int chunk = (pkt.payloadSize > remaining)? remaining : pkt.payloadSize;
+        memcpy(ptr, pkt.payload, chunk); // we keep PSI table header here
+        ptr += chunk;
+        remaining -= chunk;
+        if(remaining < 1) break;
+        goto nextPack2;
+    }
+    // Verify PSI table checksum.
+    if(false == verifyPsiChecksum(psi->payload, sectionLength + PSI_TABLE_HEADER_SIZE))
+    {
+        multiPacketPsi = 0;
+        goto nextPack2;
+    }
+    psi->payloadSize = sectionLength - PSI_TABLE_SYNTAX_SIZE + PSI_CHECKSUM_SIZE;
+    memmove(psi->payload, psi->payload + hdr, sectionLength - PSI_TABLE_SYNTAX_SIZE + PSI_CHECKSUM_SIZE);
 
-    int hdr=(8+16+16+8+8+8)/8;
-    int payloadsize=sectionLength-4-5; // Remove checksum & header
-    if(payloadsize<4) goto nextPack2;
-    psi->payloadSize=payloadsize;
-    memcpy(psi->payload,pkt.payload+hdr,psi->payloadSize);
     return true;
 }
 /**

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/NativeAvisynth/ADM_nativeAvs.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/NativeAvisynth/ADM_nativeAvs.cpp Changed

@@ -1,7 +1,7 @@
 /** *************************************************************************
     \file       ADM_nativeAv.cpp
     \brief      Native AVISynth demuxer
-                contains code derived from Avs2YUV by Loren Merritt
+                contains code derived from Avs2YUV by Loren Merritt
     copyright            : (C) 2019 by mean
     email                : fixounet@free.fr
  ***************************************************************************/
@@ -42,29 +42,29 @@
 */
 static bool tryColdInit(void)
 {
-    DLLFUNC *CreateScriptEnvironment = NULL;    
-    ADM_info("Loading Avisynth.dll \n");
-    HMODULE instance = LoadLibrary("avisynth.dll");
-    if (!instance)
-    {
-        ADM_warning("Cannot load avisynth dll\n");
-        return false;
-    }
-    ADM_info("Avisynth.dll loaded\n");
-    CreateScriptEnvironment = (DLLFUNC *)GetProcAddress(instance, "CreateScriptEnvironment");
-    if (!CreateScriptEnvironment)
-    {
-        ADM_warning("failed to load CreateScriptEnvironment()\n");
-        return false;
-    }
-    try
-    {
-        env = CreateScriptEnvironment(AVISYNTH_INTERFACE_VERSION);
-        if (!env)
-        {
-            ADM_warning("Create Env failed\n");
-            return false;
-        }
+    DLLFUNC *CreateScriptEnvironment = NULL;    
+    ADM_info("Loading Avisynth.dll \n");
+    HMODULE instance = LoadLibrary("avisynth.dll");
+    if (!instance)
+    {
+        ADM_warning("Cannot load avisynth dll\n");
+        return false;
+    }
+    ADM_info("Avisynth.dll loaded\n");
+    CreateScriptEnvironment = (DLLFUNC *)GetProcAddress(instance, "CreateScriptEnvironment");
+    if (!CreateScriptEnvironment)
+    {
+        ADM_warning("failed to load CreateScriptEnvironment()\n");
+        return false;
+    }
+    try
+    {
+        env = CreateScriptEnvironment(AVISYNTH_INTERFACE_VERSION);
+        if (!env)
+        {
+            ADM_warning("Create Env failed\n");
+            return false;
+        }
         AVS_linkage = env->GetAVSLinkage();
     }
     catch (AvisynthError err)
@@ -77,7 +77,7 @@
 /**
 */
 static bool coldInit(void)
-{
+{
     if (!tried)
     {
         tried = true;
@@ -210,12 +210,12 @@
         
         if(inf.IsYV12())
         {
-            colorSpace=ADM_COLOR_YV12;
+            pixfrmt=ADM_PIXFRMT_YV12;
             _videostream.fccHandler = fourCC::get((uint8_t *) "YV12");
         }else
             if(inf.IsYUY2())
             {
-                colorSpace=ADM_COLOR_YUV422;
+                pixfrmt=ADM_PIXFRMT_YUV422;
                 _videostream.fccHandler = fourCC::get((uint8_t *) "YUY2");
             }
             else
@@ -243,8 +243,8 @@
                         {
                                 switch (sampleType)
                                 {
-                                    case SAMPLE_INT16: audioInfo.encoding = WAV_PCM; break;
-                                    case SAMPLE_FLOAT: audioInfo.encoding = WAV_PCM_FLOAT; break;
+                                    case SAMPLE_INT16: audioInfo.encoding = WAV_PCM; audioInfo.bitspersample = 16; break;
+                                    case SAMPLE_FLOAT: audioInfo.encoding = WAV_PCM_FLOAT; audioInfo.bitspersample = 32; break;
                                     default:
                                         return false;
                                 }
@@ -367,10 +367,10 @@
     uint8_t *source;
     uint8_t *dst;
     int     sourcePitch;	
-    switch(colorSpace)
+    switch(pixfrmt)
    {
     
-    case ADM_COLOR_YV12:
+    case ADM_PIXFRMT_YV12:
         {
             // Y
             source= (uint8_t *)Aframe->GetReadPtr(AVS_PLANAR_Y);
@@ -392,7 +392,7 @@
             
         }
         break;
-    case ADM_COLOR_YUV422:
+    case ADM_PIXFRMT_YUV422:
         {
             source= (uint8_t *)Aframe->GetReadPtr();
             sourcePitch = Aframe->GetPitch();

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/NativeAvisynth/ADM_nativeAvs.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/NativeAvisynth/ADM_nativeAvs.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/NativeAvisynth/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/NativeAvisynth/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_regular.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_odml_regular.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp Changed

@@ -24,6 +24,7 @@
 #include "ADM_odml_audio.h"
 #include "ADM_coreUtils.h"
 #include "ADM_codecType.h"
+#include "ADM_videoInfoExtractor.h"
 #ifdef ADM_DEBUG
 	#define OPENDML_VERBOSE
     #define aprintf printf
@@ -121,7 +122,26 @@
 uint64_t  OpenDMLHeader::getVideoDuration(void)
 {
     if(!_videostream.dwLength) return 0;
-    return _idx[_videostream.dwLength-1].dts+frameToUs(1); 
+    int i, last = _videostream.dwLength-1;
+    uint64_t total = _idx[last].dts;
+    // Initially, we may not have valid PTS, but the editor might
+    // have set at least some of them.
+    uint64_t maxPts = ADM_NO_PTS;
+#define MAX_REORDER (32)
+    for(i = last; i > ((last > MAX_REORDER)? last - MAX_REORDER : 0); i--)
+    {
+        uint64_t pts = _idx[i].pts;
+        if(pts && pts != ADM_NO_PTS)
+        {
+            if(maxPts == ADM_NO_PTS || pts > maxPts)
+                maxPts = pts;
+        }
+    }
+#undef MAX_REORDER
+    if(maxPts != ADM_NO_PTS && maxPts > total)
+        total = maxPts;
+    total += frameToUs(1);
+    return total;
 }
 
 OpenDMLHeader::~OpenDMLHeader()
@@ -188,6 +208,7 @@
 	memset(&_regularIndex,0,sizeof(_regularIndex));
 	_videoExtraData=NULL;
 	_videoExtraLen=0;
+	_videoTrackLen=0;
 	_reordered=0;
 	_recHack=0;
     // Audio
@@ -526,6 +547,7 @@
                   }
                 else
                 _videostream.fccHandler=_video_bih.biCompression;
+                checkVideoWidthHeight(); // Try to get width and height from codec, the container may lie.
                 printf("\nOpenDML file successfully read..\n");
                 if(ret==1) 
                 {
@@ -970,3 +992,85 @@
     return true;
 
 }
+/**
+    \fn checkVideoWidthHeight
+    \brief Try to get video width and height from codec
+*/
+bool OpenDMLHeader::checkVideoWidthHeight(void)
+{
+    if(!isH264Compatible(_videostream.fccHandler))
+    {
+        ADM_info("Not H.264, not checking width and height.\n");
+        return true; // we care only for H.264 at the moment
+    }
+
+    ADM_SPSInfo sps;
+    memset(&sps,0,sizeof(sps));
+
+    if(!_videoExtraLen)
+    {
+        ADM_warning("No extradata, AnnexB type stream?\n");
+        uint32_t datasize = _idx[0].size;
+        if(datasize < 5)
+        {
+            ADM_warning("First frame too small, only %u bytes??\n",datasize);
+            return false;
+        }
+        if(datasize > ADM_COMPRESSED_MAX_DATA_LENGTH)
+        {
+            ADM_warning("First frame too large: %u bytes.\n",datasize);
+            return false;
+        }
+        fseeko(_fd,_idx[0].offset,SEEK_SET);
+        notStackAllocator buffer(datasize);
+        if(!fread(buffer.data, datasize, 1, _fd))
+        {
+            fseeko(_fd,0,SEEK_SET);
+            ADM_error("Cannot read the first frame!\n");
+            return false;
+        }
+        fseeko(_fd,0,SEEK_SET);
+
+        uint64_t marker = 0;
+        for(int i = 0; i < 5; i++)
+            marker = (marker << 8) + buffer.data[i];
+        if(marker != 1 && (marker >> 8) != 1)
+        {
+            ADM_warning("Not AnnexB H.264 stream and no extradata, cannot check.\n");
+            return false;
+        }
+
+        uint8_t spsBuf[MAX_H264_SPS_SIZE];
+
+        uint32_t inBandSpsLen = getRawH264SPS_startCode(buffer.data, datasize, spsBuf, MAX_H264_SPS_SIZE);
+
+        if(!inBandSpsLen)
+        {
+            ADM_warning("Could not extract raw SPS from the first frame.\n");
+            return false;
+        }
+        if(!extractSPSInfoFromData(spsBuf,inBandSpsLen,&sps))
+        {
+            ADM_warning("Could not decode H.264 SPS found in the first frame.\n");
+            return false;
+        }
+    }else if(!extractSPSInfo(_videoExtraData,_videoExtraLen,&sps))
+    {
+        ADM_warning("Could not decode H.264 extradata.\n");
+        return false;
+    }
+    if(!sps.width || !sps.height)
+    {
+        ADM_warning("Got invalid dimensions from SPS, cannot verify video width and height.\n");
+        return false;
+    }
+
+    if(_mainaviheader.dwWidth != sps.width)
+        ADM_warning("Width mismatch, container says %u, codec %u, trusting codec\n",_mainaviheader.dwWidth,sps.width);
+    _video_bih.biWidth = _mainaviheader.dwWidth = sps.width;
+    if(_mainaviheader.dwHeight != sps.height)
+        ADM_warning("Height mismatch, container says %u, codec %u, trusting codec\n",_mainaviheader.dwHeight,sps.height);
+    _video_bih.biHeight = _mainaviheader.dwHeight = sps.height;
+
+    return true;
+}

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.h Changed

@@ -63,6 +63,7 @@
 protected:
        				
 	  uint64_t			_fileSize;
+          uint64_t                      _videoTrackLen;
 	  FILE 				*_fd;
 	  odmlIndex 		*_idx;
 	  odmlAudioTrack                *_audioTracks;
@@ -120,6 +121,7 @@
           uint8_t                       mpegReorder(void);
 	  uint8_t			unpackPacked( void );	
           bool                          removeEmptyFrames (void);
+          bool                          checkVideoWidthHeight(void);
 public:
 	  
 virtual   void 				Dump(void) ;
@@ -153,6 +155,7 @@
 virtual	    uint8_t	getExtraHeaderData(uint32_t *len, uint8_t **data);
 virtual     uint64_t    getTime(uint32_t frameNum);
 virtual     uint64_t    getVideoDuration(void);
+virtual     uint64_t    getVideoTrackSize(void) { return _videoTrackLen; }
 virtual     bool        providePts(void) {return ptsAvailable;};
 bool                    getPtsDts(uint32_t frame,uint64_t *pts,uint64_t *dts);
 bool                    setPtsDts(uint32_t frame,uint64_t pts,uint64_t dts);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/Pictures/ADM_pics.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt Changed

@@ -1,8 +1,11 @@
 ##########################################
 # Config
 ##########################################
-ADD_DEFINITIONS("-std=c++11")
-
+IF(ENABLE_QT6)
+    ADD_DEFINITIONS("-std=c++17")
+ELSE(ENABLE_QT6)
+    ADD_DEFINITIONS("-std=c++11")
+ENDIF(ENABLE_QT6)
 ADD_DEFINITIONS(${VAPOURSYNTHSCRIPT_CFLAGS})
 #
 IF(MSVC)
@@ -12,7 +15,7 @@
 ADD_DEFINITIONS(-DADM_UI_TYPE_BUILD=ADM_UI_QT4)
 SET(CONFIG_HEADER_TYPE ADM_BUILD_QT4)
 SET(UI_SUFFIX qt4)
-include_directories(./ ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(./ ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE(admWindRes)
 ###########################################
 # Executable
@@ -53,9 +56,11 @@
 ###########################################
 TARGET_LINK_LIBRARIES(vsProxy_gui_${QT_EXTENSION} ADM_core6 ADM_coreSocket6 ADM_coreUtils6)
 TARGET_LINK_LIBRARIES(vsProxy_gui_${QT_EXTENSION} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
-TARGET_LINK_LIBRARIES(vsProxy_gui_${QT_EXTENSION} ${PTHREAD_LIBRARIES})
 TARGET_LINK_LIBRARIES(vsProxy_gui_${QT_EXTENSION} ${LIBS_TO_LINK} )
 
+include(admCheckThreads)
+ADM_LINK_THREAD(vsProxy_gui_${QT_EXTENSION})
+
 IF (MINGW)
 	target_link_libraries(vsProxy_gui_${QT_EXTENSION} -lwsock32 winmm -mwindows )
 	target_link_libraries(vsProxy_gui_${QT_EXTENSION} ${LIBS_TO_LINK} "-lm -lstdc++")

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerAvi/muxerAviConfig.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerDummy/ADM_dummy.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerFlv/muxerFlv.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkv.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMkv/muxerMkvConfig.cpp Changed

@@ -26,71 +26,71 @@
 #endif
 {
     diaMenuEntry aspect[]={
-        {STANDARD,"4:3"},
-        {WIDE,"16:9"},
-        {UNI,"18:9"},
-        {CINEMA,"64:27"},
-        {OTHER,QT_TRANSLATE_NOOP("mkvmuxer","Derived from display width")}
+        {STANDARD,"4:3",NULL},
+        {WIDE,"16:9",NULL},
+        {UNI,"18:9",NULL},
+        {CINEMA,"64:27",NULL},
+        {OTHER,QT_TRANSLATE_NOOP("mkvmuxer","Derived from display width"),NULL}
     };
 // see https://www.matroska.org/technical/elements.html and libavutil/pixfmt.h
     diaMenuEntry meMatrixCoeff[]={
-        {AVCOL_SPC_RGB,                 QT_TRANSLATE_NOOP("mkvmuxer","0: sRGB")},
-        {AVCOL_SPC_BT709,               QT_TRANSLATE_NOOP("mkvmuxer","1: ITU-R BT.709")},
-        {AVCOL_SPC_UNSPECIFIED,         QT_TRANSLATE_NOOP("mkvmuxer","2: Unspecified")},
-        {AVCOL_SPC_RESERVED,            QT_TRANSLATE_NOOP("mkvmuxer","3: Reserved")},
-        {AVCOL_SPC_FCC,                 QT_TRANSLATE_NOOP("mkvmuxer","4: US FCC 73.682")},
-        {AVCOL_SPC_BT470BG,             QT_TRANSLATE_NOOP("mkvmuxer","5: ITU-R BT.470BG")},
-        {AVCOL_SPC_SMPTE170M,           QT_TRANSLATE_NOOP("mkvmuxer","6: SMPTE 170M")},
-        {AVCOL_SPC_SMPTE240M,           QT_TRANSLATE_NOOP("mkvmuxer","7: SMPTE 240M")},
-        {AVCOL_SPC_YCGCO,               QT_TRANSLATE_NOOP("mkvmuxer","8: YCoCg")},
-        {AVCOL_SPC_BT2020_NCL,          QT_TRANSLATE_NOOP("mkvmuxer","9: BT2020 Non-constant Luminance")},
-        {AVCOL_SPC_BT2020_CL,           QT_TRANSLATE_NOOP("mkvmuxer","10: BT2020 Constant Luminance")},
-        {AVCOL_SPC_SMPTE2085,           QT_TRANSLATE_NOOP("mkvmuxer","11: SMPTE ST 2085")},
-        {AVCOL_SPC_CHROMA_DERIVED_NCL,  QT_TRANSLATE_NOOP("mkvmuxer","12: Chroma-derived Non-constant Luminance")},
-        {AVCOL_SPC_CHROMA_DERIVED_CL,   QT_TRANSLATE_NOOP("mkvmuxer","13: Chroma-derived Constant Luminance")},
-        {AVCOL_SPC_ICTCP,               QT_TRANSLATE_NOOP("mkvmuxer","14: ITU-R BT.2100-0")}
+        {AVCOL_SPC_RGB,                 QT_TRANSLATE_NOOP("mkvmuxer","0: sRGB"), NULL},
+        {AVCOL_SPC_BT709,               QT_TRANSLATE_NOOP("mkvmuxer","1: ITU-R BT.709"), NULL},
+        {AVCOL_SPC_UNSPECIFIED,         QT_TRANSLATE_NOOP("mkvmuxer","2: Unspecified"), NULL},
+        {AVCOL_SPC_RESERVED,            QT_TRANSLATE_NOOP("mkvmuxer","3: Reserved"), NULL},
+        {AVCOL_SPC_FCC,                 QT_TRANSLATE_NOOP("mkvmuxer","4: US FCC 73.682"), NULL},
+        {AVCOL_SPC_BT470BG,             QT_TRANSLATE_NOOP("mkvmuxer","5: ITU-R BT.470BG"), NULL},
+        {AVCOL_SPC_SMPTE170M,           QT_TRANSLATE_NOOP("mkvmuxer","6: SMPTE 170M"), NULL},
+        {AVCOL_SPC_SMPTE240M,           QT_TRANSLATE_NOOP("mkvmuxer","7: SMPTE 240M"), NULL},
+        {AVCOL_SPC_YCGCO,               QT_TRANSLATE_NOOP("mkvmuxer","8: YCoCg"), NULL},
+        {AVCOL_SPC_BT2020_NCL,          QT_TRANSLATE_NOOP("mkvmuxer","9: BT2020 Non-constant Luminance"), NULL},
+        {AVCOL_SPC_BT2020_CL,           QT_TRANSLATE_NOOP("mkvmuxer","10: BT2020 Constant Luminance"), NULL},
+        {AVCOL_SPC_SMPTE2085,           QT_TRANSLATE_NOOP("mkvmuxer","11: SMPTE ST 2085"), NULL},
+        {AVCOL_SPC_CHROMA_DERIVED_NCL,  QT_TRANSLATE_NOOP("mkvmuxer","12: Chroma-derived Non-constant Luminance"), NULL},
+        {AVCOL_SPC_CHROMA_DERIVED_CL,   QT_TRANSLATE_NOOP("mkvmuxer","13: Chroma-derived Constant Luminance"), NULL},
+        {AVCOL_SPC_ICTCP,               QT_TRANSLATE_NOOP("mkvmuxer","14: ITU-R BT.2100-0"), NULL}
     };
     diaMenuEntry meRange[]={
-        {AVCOL_RANGE_UNSPECIFIED,       QT_TRANSLATE_NOOP("mkvmuxer","0: Unspecified")},
-        {AVCOL_RANGE_MPEG,              QT_TRANSLATE_NOOP("mkvmuxer","1: Limited")},
-        {AVCOL_RANGE_JPEG,              QT_TRANSLATE_NOOP("mkvmuxer","2: Full")}
+        {AVCOL_RANGE_UNSPECIFIED,       QT_TRANSLATE_NOOP("mkvmuxer","0: Unspecified"), NULL},
+        {AVCOL_RANGE_MPEG,              QT_TRANSLATE_NOOP("mkvmuxer","1: Limited"), NULL},
+        {AVCOL_RANGE_JPEG,              QT_TRANSLATE_NOOP("mkvmuxer","2: Full"), NULL}
     };
     diaMenuEntry meTransfer[]={
-        {AVCOL_TRC_RESERVED0,           QT_TRANSLATE_NOOP("mkvmuxer","0: Reserved")},
-        {AVCOL_TRC_BT709,               QT_TRANSLATE_NOOP("mkvmuxer","1: ITU-R BT.709")},
-        {AVCOL_TRC_UNSPECIFIED,         QT_TRANSLATE_NOOP("mkvmuxer","2: Unspecified")},
-        {AVCOL_TRC_RESERVED,            QT_TRANSLATE_NOOP("mkvmuxer","3: Reserved")},
-        {AVCOL_TRC_GAMMA22,             QT_TRANSLATE_NOOP("mkvmuxer","4: Gamma 2.2 curve - BT.470M")},
-        {AVCOL_TRC_GAMMA28,             QT_TRANSLATE_NOOP("mkvmuxer","5: Gamma 2.8 curve - BT.470BG")},
-        {AVCOL_TRC_SMPTE170M,           QT_TRANSLATE_NOOP("mkvmuxer","6: SMPTE 170M")},
-        {AVCOL_TRC_SMPTE240M,           QT_TRANSLATE_NOOP("mkvmuxer","7: SMPTE 240M")},
-        {AVCOL_TRC_LINEAR,              QT_TRANSLATE_NOOP("mkvmuxer","8: Linear")},
-        {AVCOL_TRC_LOG,                 QT_TRANSLATE_NOOP("mkvmuxer","9: Logarithmic (100:1 range)")},
-        {AVCOL_TRC_LOG_SQRT,            QT_TRANSLATE_NOOP("mkvmuxer","10: Logarithmic (100 * Sqrt(10) : 1 range)")},
-        {AVCOL_TRC_IEC61966_2_4,        QT_TRANSLATE_NOOP("mkvmuxer","11: IEC 61966-2-4")},
-        {AVCOL_TRC_BT1361_ECG,          QT_TRANSLATE_NOOP("mkvmuxer","12: ITU-R BT.1361 Extended Colour Gamut")},
-        {AVCOL_TRC_IEC61966_2_1,        QT_TRANSLATE_NOOP("mkvmuxer","13: IEC 61966-2-1")},
-        {AVCOL_TRC_BT2020_10,           QT_TRANSLATE_NOOP("mkvmuxer","14: ITU-R BT.2020 10 bit")},
-        {AVCOL_TRC_BT2020_12,           QT_TRANSLATE_NOOP("mkvmuxer","15: ITU-R BT.2020 12 bit")},
-        {AVCOL_TRC_SMPTE2084,           QT_TRANSLATE_NOOP("mkvmuxer","16: ITU-R BT.2100 Perceptual Quantization")},
-        {AVCOL_TRC_SMPTE428,            QT_TRANSLATE_NOOP("mkvmuxer","17: SMPTE ST 428-1")},
-        {AVCOL_TRC_ARIB_STD_B67,        QT_TRANSLATE_NOOP("mkvmuxer","18: ARIB STD-B67 (HLG)")}
+        {AVCOL_TRC_RESERVED0,           QT_TRANSLATE_NOOP("mkvmuxer","0: Reserved"), NULL},
+        {AVCOL_TRC_BT709,               QT_TRANSLATE_NOOP("mkvmuxer","1: ITU-R BT.709"), NULL},
+        {AVCOL_TRC_UNSPECIFIED,         QT_TRANSLATE_NOOP("mkvmuxer","2: Unspecified"), NULL},
+        {AVCOL_TRC_RESERVED,            QT_TRANSLATE_NOOP("mkvmuxer","3: Reserved"), NULL},
+        {AVCOL_TRC_GAMMA22,             QT_TRANSLATE_NOOP("mkvmuxer","4: Gamma 2.2 curve - BT.470M"), NULL},
+        {AVCOL_TRC_GAMMA28,             QT_TRANSLATE_NOOP("mkvmuxer","5: Gamma 2.8 curve - BT.470BG"), NULL},
+        {AVCOL_TRC_SMPTE170M,           QT_TRANSLATE_NOOP("mkvmuxer","6: SMPTE 170M"), NULL},
+        {AVCOL_TRC_SMPTE240M,           QT_TRANSLATE_NOOP("mkvmuxer","7: SMPTE 240M"), NULL},
+        {AVCOL_TRC_LINEAR,              QT_TRANSLATE_NOOP("mkvmuxer","8: Linear"), NULL},
+        {AVCOL_TRC_LOG,                 QT_TRANSLATE_NOOP("mkvmuxer","9: Logarithmic (100:1 range)"), NULL},
+        {AVCOL_TRC_LOG_SQRT,            QT_TRANSLATE_NOOP("mkvmuxer","10: Logarithmic (100 * Sqrt(10) : 1 range)"), NULL},
+        {AVCOL_TRC_IEC61966_2_4,        QT_TRANSLATE_NOOP("mkvmuxer","11: IEC 61966-2-4"), NULL},
+        {AVCOL_TRC_BT1361_ECG,          QT_TRANSLATE_NOOP("mkvmuxer","12: ITU-R BT.1361 Extended Colour Gamut"), NULL},
+        {AVCOL_TRC_IEC61966_2_1,        QT_TRANSLATE_NOOP("mkvmuxer","13: IEC 61966-2-1"), NULL},
+        {AVCOL_TRC_BT2020_10,           QT_TRANSLATE_NOOP("mkvmuxer","14: ITU-R BT.2020 10 bit"), NULL},
+        {AVCOL_TRC_BT2020_12,           QT_TRANSLATE_NOOP("mkvmuxer","15: ITU-R BT.2020 12 bit"), NULL},
+        {AVCOL_TRC_SMPTE2084,           QT_TRANSLATE_NOOP("mkvmuxer","16: ITU-R BT.2100 Perceptual Quantization"), NULL},
+        {AVCOL_TRC_SMPTE428,            QT_TRANSLATE_NOOP("mkvmuxer","17: SMPTE ST 428-1"), NULL},
+        {AVCOL_TRC_ARIB_STD_B67,        QT_TRANSLATE_NOOP("mkvmuxer","18: ARIB STD-B67 (HLG)"), NULL}
     };
     diaMenuEntry mePrimaries[]={
-        {AVCOL_PRI_RESERVED0,           QT_TRANSLATE_NOOP("mkvmuxer","0: Reserved")},
-        {AVCOL_PRI_BT709,               QT_TRANSLATE_NOOP("mkvmuxer","1: ITU-R BT.709")},
-        {AVCOL_PRI_UNSPECIFIED,         QT_TRANSLATE_NOOP("mkvmuxer","2: Unspecified")},
-        {AVCOL_PRI_RESERVED,            QT_TRANSLATE_NOOP("mkvmuxer","3: Reserved")},
-        {AVCOL_PRI_BT470M,              QT_TRANSLATE_NOOP("mkvmuxer","4: ITU-R BT.470M")},
-        {AVCOL_PRI_BT470BG,             QT_TRANSLATE_NOOP("mkvmuxer","5: ITU-R BT.470BG - BT.601 625")},
-        {AVCOL_PRI_SMPTE170M,           QT_TRANSLATE_NOOP("mkvmuxer","6: ITU-R BT.601 525 - SMPTE 170M")},
-        {AVCOL_PRI_SMPTE240M,           QT_TRANSLATE_NOOP("mkvmuxer","7: SMPTE 240M")},
-        {AVCOL_PRI_FILM,                QT_TRANSLATE_NOOP("mkvmuxer","8: Film")},
-        {AVCOL_PRI_BT2020,              QT_TRANSLATE_NOOP("mkvmuxer","9: ITU-R BT.2020")},
-        {AVCOL_PRI_SMPTE428,            QT_TRANSLATE_NOOP("mkvmuxer","10: SMPTE ST 428-1")},
-        {AVCOL_PRI_SMPTE431,            QT_TRANSLATE_NOOP("mkvmuxer","11: SMPTE RP 431-2")},
-        {AVCOL_PRI_SMPTE432,            QT_TRANSLATE_NOOP("mkvmuxer","12: SMPTE EG 432-2")},
-        {AVCOL_PRI_JEDEC_P22,           QT_TRANSLATE_NOOP("mkvmuxer","22: JEDEC P22 phosphors")}
+        {AVCOL_PRI_RESERVED0,           QT_TRANSLATE_NOOP("mkvmuxer","0: Reserved"), NULL},
+        {AVCOL_PRI_BT709,               QT_TRANSLATE_NOOP("mkvmuxer","1: ITU-R BT.709"), NULL},
+        {AVCOL_PRI_UNSPECIFIED,         QT_TRANSLATE_NOOP("mkvmuxer","2: Unspecified"), NULL},
+        {AVCOL_PRI_RESERVED,            QT_TRANSLATE_NOOP("mkvmuxer","3: Reserved"), NULL},
+        {AVCOL_PRI_BT470M,              QT_TRANSLATE_NOOP("mkvmuxer","4: ITU-R BT.470M"), NULL},
+        {AVCOL_PRI_BT470BG,             QT_TRANSLATE_NOOP("mkvmuxer","5: ITU-R BT.470BG - BT.601 625"), NULL},
+        {AVCOL_PRI_SMPTE170M,           QT_TRANSLATE_NOOP("mkvmuxer","6: ITU-R BT.601 525 - SMPTE 170M"), NULL},
+        {AVCOL_PRI_SMPTE240M,           QT_TRANSLATE_NOOP("mkvmuxer","7: SMPTE 240M"), NULL},
+        {AVCOL_PRI_FILM,                QT_TRANSLATE_NOOP("mkvmuxer","8: Film"), NULL},
+        {AVCOL_PRI_BT2020,              QT_TRANSLATE_NOOP("mkvmuxer","9: ITU-R BT.2020"), NULL},
+        {AVCOL_PRI_SMPTE428,            QT_TRANSLATE_NOOP("mkvmuxer","10: SMPTE ST 428-1"), NULL},
+        {AVCOL_PRI_SMPTE431,            QT_TRANSLATE_NOOP("mkvmuxer","11: SMPTE RP 431-2"), NULL},
+        {AVCOL_PRI_SMPTE432,            QT_TRANSLATE_NOOP("mkvmuxer","12: SMPTE EG 432-2"), NULL},
+        {AVCOL_PRI_JEDEC_P22,           QT_TRANSLATE_NOOP("mkvmuxer","22: JEDEC P22 phosphors"), NULL}
     };
 
     mkv_muxer *cfg = &muxerConfig;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp Changed

@@ -98,6 +98,7 @@
         FCC_IS_NOT("apcs") &&
         FCC_IS_NOT("apco") &&
         FCC_IS_NOT("ap4h") &&
+        FCC_IS_NOT("ap4x") &&
 #else
         !isMpeg12Compatible(fcc) && // poorly supported by players in MOV, reject
 #endif
@@ -247,7 +248,13 @@
             video_st->sample_aspect_ratio.den=den;
             ADM_info("Forcing pixel aspect ratio of %d:%d\n",den,num);
         }
-
+#ifdef MUXER_IS_MOV
+        for(int i = 0; i < nbAudioTrack; i++)
+        { // In MOV muxing mode, libavformat doesn't accept the standard ISO-639-2 code for German.
+            if(!strcmp("deu",a[i]->getLanguage().c_str()))
+                a[i]->setLanguage("ger"); // lavf wants it this way, are any other languages affected?
+        }
+#endif
         if(initAudio(nbAudioTrack,a)==false)
         {
             printf("[MP4] Failed to init audio\n");
@@ -334,6 +341,7 @@
         vStream=s;
         aStreams=a;
         nbAStreams=nbAudioTrack;
+        setOutputFileName(file);
         initialized=true;
         return true;
 }
@@ -359,6 +367,8 @@
 bool MOVCLASS::close(void)
 {
     printf("[MP4] Closing\n");
+    if(muxerConfig.optimize == MP4_MUXER_OPT_FASTSTART)
+        encoding->setPhase(ADM_ENC_PHASE_OTHER,QT_TRANSLATE_NOOP("mp4muxer","Optimizing..."));
     return closeMuxer();
 }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4Config.cpp Changed

@@ -34,17 +34,17 @@
         bool force   = muxerConfig.forceAspectRatio;
 
 #ifndef MUXER_IS_MOV
-        diaMenuEntry format[]={{MP4_MUXER_MP4,"MP4"},{MP4_MUXER_PSP,"PSP"}};
+        diaMenuEntry format[]={{MP4_MUXER_MP4,"MP4"},{MP4_MUXER_PSP,"PSP"},NULL};
         diaElemMenu  menuFormat(&fmt,QT_TRANSLATE_NOOP("mp4muxer","Muxing Format"),2,format,"");
         diaMenuEntry streamOpt[]={
-            {MP4_MUXER_OPT_NONE,QT_TRANSLATE_NOOP("mp4muxer","No optimization")},
-            {MP4_MUXER_OPT_FASTSTART,QT_TRANSLATE_NOOP("mp4muxer","Move index to the beginning of the file")},
-            {MP4_MUXER_OPT_FRAGMENT,QT_TRANSLATE_NOOP("mp4muxer","Use fragmentation")}
+            {MP4_MUXER_OPT_NONE,QT_TRANSLATE_NOOP("mp4muxer","No optimization"),NULL},
+            {MP4_MUXER_OPT_FASTSTART,QT_TRANSLATE_NOOP("mp4muxer","Move index to the beginning of the file"),NULL},
+            {MP4_MUXER_OPT_FRAGMENT,QT_TRANSLATE_NOOP("mp4muxer","Use fragmentation"),NULL}
         };
 #else
         diaMenuEntry streamOpt[]={
-            {MP4_MUXER_OPT_NONE,QT_TRANSLATE_NOOP("mp4muxer","No optimization")},
-            {MP4_MUXER_OPT_FASTSTART,QT_TRANSLATE_NOOP("mp4muxer","Move index to the beginning of the file")}
+            {MP4_MUXER_OPT_NONE,QT_TRANSLATE_NOOP("mp4muxer","No optimization"),NULL},
+            {MP4_MUXER_OPT_FASTSTART,QT_TRANSLATE_NOOP("mp4muxer","Move index to the beginning of the file"),NULL}
         };
 
 #endif
@@ -59,33 +59,33 @@
         diaElemMenu  menuOptimize(&opt,QT_TRANSLATE_NOOP("mp4muxer","Optimize for Streaming"),NB_OPTIMIZE,streamOpt,"");
         diaElemToggle forceAR(&force,QT_TRANSLATE_NOOP("mp4muxer","Force aspect ratio"));
         diaMenuEntry aspect[]={
-            {STANDARD,"4:3"},
-            {WIDE,"16:9"},
-            {UNI,"18:9"},
-            {CINEMA,"64:27"},
-            {CUSTOM,QT_TRANSLATE_NOOP("mp4muxer","Derived from display width")}
+            {STANDARD,"4:3",NULL},
+            {WIDE,"16:9",NULL},
+            {UNI,"18:9",NULL},
+            {CINEMA,"64:27",NULL},
+            {CUSTOM,QT_TRANSLATE_NOOP("mp4muxer","Derived from display width"),NULL}
         };
         diaElemMenu  menuAspect(&dar,QT_TRANSLATE_NOOP("mp4muxer","Aspect Ratio (DAR)"),5,aspect,"");
         diaElemUInteger dWidth(&diw,QT_TRANSLATE_NOOP("mp4muxer","Display Width"),16,65535);
         forceAR.link(1,&menuAspect);
         menuAspect.link(aspect+4,1,&dWidth);
         diaMenuEntry rotation[]={
-            {MP4_MUXER_ROTATE_0,QT_TRANSLATE_NOOP("mp4muxer","Do not rotate")},
-            {MP4_MUXER_ROTATE_90,QT_TRANSLATE_NOOP("mp4muxer","90°")},
-            {MP4_MUXER_ROTATE_180,QT_TRANSLATE_NOOP("mp4muxer","180°")},
-            {MP4_MUXER_ROTATE_270,QT_TRANSLATE_NOOP("mp4muxer","270°")}
+            {MP4_MUXER_ROTATE_0,QT_TRANSLATE_NOOP("mp4muxer","Do not rotate"),NULL},
+            {MP4_MUXER_ROTATE_90,QT_TRANSLATE_NOOP("mp4muxer","90°"),NULL},
+            {MP4_MUXER_ROTATE_180,QT_TRANSLATE_NOOP("mp4muxer","180°"),NULL},
+            {MP4_MUXER_ROTATE_270,QT_TRANSLATE_NOOP("mp4muxer","270°"),NULL}
         };
         diaElemMenu menuRotation(&rot,QT_TRANSLATE_NOOP("mp4muxer","Rotate video"),4,rotation,"");
 
         diaMenuEntry clockFrequencies[]={
-            {MP4_MUXER_CLOCK_FREQ_AUTO,QT_TRANSLATE_NOOP("mp4muxer","Auto")},
-            {MP4_MUXER_CLOCK_FREQ_24KHZ,QT_TRANSLATE_NOOP("mp4muxer","24 kHz")},
-            {MP4_MUXER_CLOCK_FREQ_25KHZ,QT_TRANSLATE_NOOP("mp4muxer","25 kHz")},
-            {MP4_MUXER_CLOCK_FREQ_30KHZ,QT_TRANSLATE_NOOP("mp4muxer","30 kHz")},
-            {MP4_MUXER_CLOCK_FREQ_50KHZ,QT_TRANSLATE_NOOP("mp4muxer","50 kHz")},
-            {MP4_MUXER_CLOCK_FREQ_60KHZ,QT_TRANSLATE_NOOP("mp4muxer","60 kHz")},
-            {MP4_MUXER_CLOCK_FREQ_90KHZ,QT_TRANSLATE_NOOP("mp4muxer","90 kHz")},
-            {MP4_MUXER_CLOCK_FREQ_180KHZ,QT_TRANSLATE_NOOP("mp4muxer","180 kHz")},
+            {MP4_MUXER_CLOCK_FREQ_AUTO,QT_TRANSLATE_NOOP("mp4muxer","Auto"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_24KHZ,QT_TRANSLATE_NOOP("mp4muxer","24 kHz"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_25KHZ,QT_TRANSLATE_NOOP("mp4muxer","25 kHz"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_30KHZ,QT_TRANSLATE_NOOP("mp4muxer","30 kHz"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_50KHZ,QT_TRANSLATE_NOOP("mp4muxer","50 kHz"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_60KHZ,QT_TRANSLATE_NOOP("mp4muxer","60 kHz"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_90KHZ,QT_TRANSLATE_NOOP("mp4muxer","90 kHz"),NULL},
+            {MP4_MUXER_CLOCK_FREQ_180KHZ,QT_TRANSLATE_NOOP("mp4muxer","180 kHz"),NULL}
         };
         diaElemMenu menuClock(&clk,QT_TRANSLATE_NOOP("mp4muxer","Time scale"),8,clockFrequencies,NULL);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerRaw/muxerRaw.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPS.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSConfig.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTS.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/qtScript/src/QtScriptWriter.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/qtScript/src/QtScriptWriter.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/qtScript/src/QtScriptWriter.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/qtScript/src/QtScriptWriter.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp Changed

@@ -144,6 +144,81 @@
 
     return 0;
 }
+
+/**
+    \fn pyPrintFrameInfo
+*/
+int pyPrintFrameInfo(IEditor *editor, int framenumber)
+{
+    uint32_t flags;
+    uint64_t pts, dts;
+
+    if (editor->getVideoPtsDts(framenumber, &flags, &pts, &dts))
+    {
+        int64_t delta = 0;
+        if (pts != ADM_NO_PTS && dts != ADM_NO_PTS)
+            delta = (int64_t)pts - (int64_t)dts;
+        const char *frameType;
+        switch ((flags & AVI_FRAME_TYPE_MASK) &~ AVI_NON_REF_FRAME)
+        {
+            case AVI_KEY_FRAME:
+                frameType = "I";
+                break;
+            case AVI_P_FRAME:
+                frameType = "P";
+                break;
+            case AVI_B_FRAME:
+                frameType = "B";
+                break;
+            default:
+                frameType = "?";
+                break;
+        }
+        const char *structureType;
+        switch (flags & AVI_STRUCTURE_TYPE_MASK)
+        {
+            case AVI_FIELD_STRUCTURE+AVI_TOP_FIELD:
+                structureType = "T";
+                break;
+            case AVI_FIELD_STRUCTURE+AVI_BOTTOM_FIELD:
+                structureType = "B";
+                break;
+            case AVI_FRAME_STRUCTURE:
+                structureType = "F";
+                break;
+            default:
+                structureType = "?";
+                break;
+        }
+
+        uint64_t offset = 0;
+        {
+            _SEGMENT *seg = editor->getSegment(0);
+            if(seg)
+                offset = seg->_refStartTimeUs;
+        }
+
+        printf("Frame %05d",(int)framenumber);
+        printf(" Flags %04x (%s/%s)",(int)flags,frameType,structureType);
+        printf(" DTS %s",ADM_us2plain(dts));
+        printf(" PTS %s",ADM_us2plain(pts));
+
+        if(offset)
+        {
+            if(pts == ADM_NO_PTS)
+                printf(" / %s",ADM_us2plain(pts));
+            else if(pts >= offset)
+                printf(" / %s",ADM_us2plain(pts-offset));
+            else
+                printf(" /-%s",ADM_us2plain(offset-pts));
+        }
+
+        printf(" Size: %u\n",editor->getFrameSize(framenumber));
+    }
+
+    return 0;
+}
+
 /**
     \fn pyGetPts
 */

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonScriptWriter.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/adm_gen.cpp Changed

@@ -42,6 +42,21 @@
   int r = editor->setPostProc(p0, p1, p2);
   return tp_number(r);
 }
+// setHDRConfig -> int editor->setHDRConfig(int double double)
+static tp_obj zzpy_setHDRConfig(TP)
+{
+  tp_obj self = tp_getraw(tp);
+  IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
+  IEditor *editor = engine->editor();
+  TinyParams pm(tp);
+  void *me = (void *)pm.asThis(&self, ADM_PYID_AVIDEMUX);
+
+  int p0 = pm.asInt();
+  double p1 = pm.asDouble();
+  double p2 = pm.asDouble();
+  int r = editor->setHDRConfig(p0, p1, p2);
+  return tp_number(r);
+}
 // audioGetResample -> int pyGetResample(IEditor int)
 static tp_obj zzpy_audioGetResample(TP)
 {
@@ -685,6 +700,10 @@
   {
     return tp_method(vm, self, zzpy_setPostProc);
   }
+  if (!strcmp(key, "setHDRConfig"))
+  {
+    return tp_method(vm, self, zzpy_setHDRConfig);
+  }
   if (!strcmp(key, "audioGetResample"))
   {
     return tp_method(vm, self, zzpy_audioGetResample);
@@ -907,6 +926,7 @@
   engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "videoCodecSetProfile(str,str)\n");
   engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "audioBitrate(IEditor,int)\n");
   engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "setPostProc(int,int,int)\n");
+  engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "setHDRConfig(int,double,double)\n");
   engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "audioGetResample(IEditor,int)\n");
   engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "getPARWidth(void)\n");
   engine->callEventHandlers(IScriptEngine::Information, NULL, -1, "savePng(str)\n");

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/adm.admPyClass -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/adm.admPyClass Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/editor.admPyClass -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/editor.admPyClass Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoDecoder/aom/ADM_aomDec.cpp Changed

@@ -18,6 +18,11 @@
 #include "aom/aom_decoder.h"
 #include "aom/aomdx.h"
 #define AX ((aom_codec_ctx_t *)cookie)
+
+static ADM_colorPrimaries mapColPriFromAom(aom_color_primaries_t color_primaries);
+static ADM_colorTrC mapColTrcFromAom(aom_transfer_characteristics_t color_trc);
+static ADM_colorSpace mapColSpcFromAom(aom_matrix_coefficients_t colorspace);
+
 /**
     \fn ctor
 */
@@ -99,7 +104,7 @@
         ADM_info("Draining AOM decoder, %s.\n", img? "delayed picture received" : "no delayed pictures left");
     if(img)
     {
-        ADM_colorspace color = ADM_COLOR_YV12;
+        ADM_pixelFormat pixfrmt = ADM_PIXFRMT_YV12;
         switch(img->fmt)
         {
             case AOM_IMG_FMT_I420:
@@ -109,20 +114,20 @@
             case AOM_IMG_FMT_I42016:
                 if(img->bit_depth == 10)
                 {
-                    color = ADM_COLOR_YUV420_10BITS;
+                    pixfrmt = ADM_PIXFRMT_YUV420_10BITS;
                     break;
                 }
                 ADM_warning("Unsupported bit depth %u for AOM_IMG_FMT_I42016 image format.\n",img->bit_depth);
                 return false;
             default:
-                ADM_warning("Unsupported colorspace 0x%x, bit depth: %u\n",(int)img->fmt,img->bit_depth);
+                ADM_warning("Unsupported pixel format 0x%x, bit depth: %u\n",(int)img->fmt,img->bit_depth);
                 return false;
         }
         ADMImageRef *r=out->castToRef();
         if(r)
         {
             int u=1,v=2;
-            if(color != ADM_COLOR_YV12)
+            if(pixfrmt != ADM_PIXFRMT_YV12)
             {
                 u = 2;
                 v = 1;
@@ -133,13 +138,133 @@
             r->_planeStride[0]=img->stride[0];
             r->_planeStride[v]=img->stride[1];
             r->_planeStride[u]=img->stride[2];
-            r->_colorspace=color;
+            r->_pixfrmt=pixfrmt;
+            r->_range = (img->range == AOM_CR_FULL_RANGE)? ADM_COL_RANGE_JPEG : ADM_COL_RANGE_MPEG;
+            r->_colorPrim = mapColPriFromAom(img->cp);
+            r->_colorTrc = mapColTrcFromAom(img->tc);
+            r->_colorSpace = mapColSpcFromAom(img->mc);
+
             r->Pts=in->demuxerPts;
             r->flags=in->flags;
+            // make sure the output is not marked as a hw image
+            int count = 0;
+            while(r->refType != ADM_HW_NONE && count < 32 /* arbitrary limit */)
+            {
+                r->hwDecRefCount();
+                count++;
+            }
             return true;
         }
         ADM_warning("AV1 decoder accepts ref image only.\n");
     }
     return false;
 }
+
+ADM_colorPrimaries mapColPriFromAom(aom_color_primaries_t color_primaries)
+{
+    switch(color_primaries)
+    {
+        case AOM_CICP_CP_BT_709:
+            return ADM_COL_PRI_BT709;
+        case AOM_CICP_CP_BT_470_M:
+            return ADM_COL_PRI_BT470M;
+        case AOM_CICP_CP_BT_470_B_G:
+            return ADM_COL_PRI_BT470BG;
+        case AOM_CICP_CP_BT_601:
+            return ADM_COL_PRI_SMPTE170M;
+        case AOM_CICP_CP_SMPTE_240:
+            return ADM_COL_PRI_SMPTE240M;
+        case AOM_CICP_CP_GENERIC_FILM:
+            return ADM_COL_PRI_FILM;
+        case AOM_CICP_CP_BT_2020:
+            return ADM_COL_PRI_BT2020;
+        case AOM_CICP_CP_XYZ:
+            return ADM_COL_PRI_SMPTE428;
+        case AOM_CICP_CP_SMPTE_431:
+            return ADM_COL_PRI_SMPTE431;
+        case AOM_CICP_CP_SMPTE_432:
+            return ADM_COL_PRI_SMPTE432;
+        case AOM_CICP_CP_EBU_3213:
+            return ADM_COL_PRI_EBU3213;
+        default:
+            return ADM_COL_PRI_UNSPECIFIED;
+    }
+}
+
+ADM_colorTrC mapColTrcFromAom(aom_transfer_characteristics_t color_trc)
+{
+    switch(color_trc)
+    {
+        case AOM_CICP_TC_BT_709:
+            return ADM_COL_TRC_BT709;
+        case AOM_CICP_TC_BT_470_M:
+            return ADM_COL_TRC_GAMMA22;
+        case AOM_CICP_TC_BT_470_B_G:
+            return ADM_COL_TRC_GAMMA28;
+        case AOM_CICP_TC_BT_601:
+            return ADM_COL_TRC_SMPTE170M;
+        case AOM_CICP_TC_SMPTE_240:
+            return ADM_COL_TRC_SMPTE240M;
+        case AOM_CICP_TC_LINEAR:
+            return ADM_COL_TRC_LINEAR;
+        case AOM_CICP_TC_LOG_100:
+            return ADM_COL_TRC_LOG;
+        case AOM_CICP_TC_LOG_100_SQRT10:
+            return ADM_COL_TRC_LOG_SQRT;
+        case AOM_CICP_TC_IEC_61966:
+            return ADM_COL_TRC_IEC61966_2_4;
+        case AOM_CICP_TC_BT_1361:
+            return ADM_COL_TRC_BT1361_ECG;
+        case AOM_CICP_TC_SRGB:
+            return ADM_COL_TRC_IEC61966_2_1;
+        case AOM_CICP_TC_BT_2020_10_BIT:
+            return ADM_COL_TRC_BT2020_10;
+        case AOM_CICP_TC_BT_2020_12_BIT:
+            return ADM_COL_TRC_BT2020_12;
+        case AOM_CICP_TC_SMPTE_2084:
+            return ADM_COL_TRC_SMPTE2084;
+        case AOM_CICP_TC_SMPTE_428:
+            return ADM_COL_TRC_SMPTE428;
+        case AOM_CICP_TC_HLG:
+            return ADM_COL_TRC_ARIB_STD_B67;
+        default:
+            return ADM_COL_TRC_UNSPECIFIED;
+    }
+}
+
+ADM_colorSpace mapColSpcFromAom(aom_matrix_coefficients_t colorspace)
+{
+    switch(colorspace)
+    {
+        case AOM_CICP_MC_IDENTITY:
+            return ADM_COL_SPC_sRGB;
+        case AOM_CICP_MC_BT_709:
+            return ADM_COL_SPC_BT709;
+        case AOM_CICP_MC_FCC:
+            return ADM_COL_SPC_FCC;
+        case AOM_CICP_MC_BT_470_B_G:
+            return ADM_COL_SPC_BT470BG;
+        case AOM_CICP_MC_BT_601:
+            return ADM_COL_SPC_SMPTE170M;
+        case AOM_CICP_MC_SMPTE_240:
+            return ADM_COL_SPC_SMPTE240M;
+        case AOM_CICP_MC_SMPTE_YCGCO:
+            return ADM_COL_SPC_YCGCO;
+        case AOM_CICP_MC_BT_2020_NCL:
+            return ADM_COL_SPC_BT2020_NCL;
+        case AOM_CICP_MC_BT_2020_CL:
+            return ADM_COL_SPC_BT2020_CL;
+        case AOM_CICP_MC_SMPTE_2085:
+            return ADM_COL_SPC_SMPTE2085;
+        case AOM_CICP_MC_CHROMAT_NCL:
+            return ADM_COL_SPC_CHROMA_DERIVED_NCL;
+        case AOM_CICP_MC_CHROMAT_CL:
+            return ADM_COL_SPC_CHROMA_DERIVED_CL;
+        case AOM_CICP_MC_ICTCP:
+            return ADM_COL_SPC_ICTCP;
+        default:
+            return ADM_COL_SPC_UNSPECIFIED;
+    }
+}
+
 // EOF

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.cpp Changed

@@ -46,6 +46,9 @@
 */
 bool ADM_ffMpeg2Encoder::configureContext(void)
 {
+    presetContext(&Settings);
+    _context->rc_max_rate = Mp2Settings.lavcSettings.maxBitrate * 1000;
+
     switch(Settings.params.mode)
     {
       case COMPRESS_2PASS:
@@ -62,12 +65,13 @@
             _context->bit_rate = 0;
             break;
       case COMPRESS_CBR:
-              _context->bit_rate=Settings.params.bitrate*1000; // kb->b;
+            _context->bit_rate =
+            _context->rc_max_rate =
+            _context->rc_min_rate = Settings.params.bitrate*1000; // kb->b;
             break;
      default:
             return false;
     }
-    presetContext(&Settings);
     if(Settings.lavcSettings.interlaced)
         _context->flags |= (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME);
     if(!Settings.lavcSettings.widescreen)
@@ -120,11 +124,9 @@
     _context->rc_buffer_size=Mp2Settings.lavcSettings.bufferSize*8*1024;
     //_context->rc_buffer_size_header=Mp2Settings.lavcSettings.bufferSize*8*1024; // needs patched avcodec.h
     _context->rc_initial_buffer_occupancy=_context->rc_buffer_size;
-    _context->rc_max_rate=Mp2Settings.lavcSettings.maxBitrate*1000;
     _context->bit_rate_tolerance=Mp2Settings.lavcSettings.vratetol*1000;
     //_context->rc_max_rate_header=Mp2Settings.lavcSettings.maxBitrate*1000; // needs patched avcodec.h
     // /Override some parameters specific to this codec
-    
     return true;
 }
 
@@ -158,22 +160,27 @@
 bool         ADM_ffMpeg2Encoder::encode (ADMBitstream * out)
 {
 int sz,q;
-int gotData;
 int r;
 again:
     sz=0;
     if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
     {
         r=encodeWrapper(NULL,out);
+
+        if(encoderState == ADM_ENCODER_STATE_FLUSHED)
+        {
+            ADM_info("[ffMpeg2] End of stream.\n");
+            return false;
+        }
         if(r<0)
         {
             ADM_warning("[ffMpeg2] Error %d encoding video\n",r);
             return false;
         }
         sz=r;
+        if(!sz) return false;
         ADM_info("[ffMpeg2] Popping delayed bframes (%d)\n",sz);
         goto link;
-        return false;
     }
     q=image->_Qp;
     
@@ -214,6 +221,12 @@
     _frame->interlaced_frame=Settings.lavcSettings.interlaced;
     _frame->top_field_first=!Settings.lavcSettings.bff;
     r=encodeWrapper(_frame,out);
+
+    if(encoderState == ADM_ENCODER_STATE_FLUSHED)
+    {
+        ADM_info("[ffMpeg2] End of stream.\n");
+        return false;
+    }
     if(r<0)
     {
         ADM_warning("[ffMpeg2] Error %d encoding video\n",r);
@@ -248,37 +261,37 @@
 
 diaMenuEntry  arE[]=
 {
-    {0,QT_TRANSLATE_NOOP("ffmpeg2","Normal (4:3)")},
-    {1,QT_TRANSLATE_NOOP("ffmpeg2","Wide (16:9)")}
+    {0,QT_TRANSLATE_NOOP("ffmpeg2","Normal (4:3)"),NULL},
+    {1,QT_TRANSLATE_NOOP("ffmpeg2","Wide (16:9)"),NULL}
 };
       
 diaMenuEntry  matrixE[]=
 {
-    {MPEG2_MATRIX_DEFAULT,QT_TRANSLATE_NOOP("ffmpeg2","Default")},
-    {MPEG2_MATRIX_TMPGENC,QT_TRANSLATE_NOOP("ffmpeg2","Tmpgenc")},
-    {MPEG2_MATRIX_ANIME,QT_TRANSLATE_NOOP("ffmpeg2","Animes")},
-    {MPEG2_MATRIX_KVCD,QT_TRANSLATE_NOOP("ffmpeg2","KVCD")},
+    {MPEG2_MATRIX_DEFAULT,QT_TRANSLATE_NOOP("ffmpeg2","Default"),NULL},
+    {MPEG2_MATRIX_TMPGENC,QT_TRANSLATE_NOOP("ffmpeg2","Tmpgenc"),NULL},
+    {MPEG2_MATRIX_ANIME,QT_TRANSLATE_NOOP("ffmpeg2","Animes"),NULL},
+    {MPEG2_MATRIX_KVCD,QT_TRANSLATE_NOOP("ffmpeg2","KVCD"),NULL}
 };
       
 diaMenuEntry rdE[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg2","MB comparison")},
-  {1,QT_TRANSLATE_NOOP("ffmpeg2","Fewest bits (vhq)")},
-  {2,QT_TRANSLATE_NOOP("ffmpeg2","Rate distortion")}
+  {0,QT_TRANSLATE_NOOP("ffmpeg2","MB comparison"),NULL},
+  {1,QT_TRANSLATE_NOOP("ffmpeg2","Fewest bits (vhq)"),NULL},
+  {2,QT_TRANSLATE_NOOP("ffmpeg2","Rate distortion"),NULL}
 };     
 diaMenuEntry threads[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg2","One thread")},
-  {2,QT_TRANSLATE_NOOP("ffmpeg2","Two threads)")},
-  {3,QT_TRANSLATE_NOOP("ffmpeg2","Three threads")},
-  {99,QT_TRANSLATE_NOOP("ffmpeg2","Auto (#cpu)")}
+  {0,QT_TRANSLATE_NOOP("ffmpeg2","One thread"),NULL},
+  {2,QT_TRANSLATE_NOOP("ffmpeg2","Two threads"),NULL},
+  {3,QT_TRANSLATE_NOOP("ffmpeg2","Three threads"),NULL},
+  {99,QT_TRANSLATE_NOOP("ffmpeg2","Auto (#cpu)"),NULL}
 };     
    
 diaMenuEntry interE[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg2","Progressive")},
-  {1,QT_TRANSLATE_NOOP("ffmpeg2","Interlaced")},
+  {0,QT_TRANSLATE_NOOP("ffmpeg2","Progressive"),NULL},
+  {1,QT_TRANSLATE_NOOP("ffmpeg2","Interlaced"),NULL}
 };     
 diaMenuEntry foE[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg2","Top Field First")},
-  {1,QT_TRANSLATE_NOOP("ffmpeg2","Bottom Field First")},
+  {0,QT_TRANSLATE_NOOP("ffmpeg2","Top Field First"),NULL},
+  {1,QT_TRANSLATE_NOOP("ffmpeg2","Bottom Field First"),NULL}
 };     
 
         mpeg2_encoder *conf=&Mp2Settings;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.cpp Changed

@@ -100,21 +100,27 @@
 */
 bool         ADM_ffMpeg4Encoder::encode (ADMBitstream * out)
 {
-int sz,q,r,gotData;
+int sz,q,r;
 again:
     sz=0;
     if(false==preEncode()) // Pop - out the frames stored in the queue due to B-frames
     {
         r=encodeWrapper(NULL,out);
+
+        if(encoderState == ADM_ENCODER_STATE_FLUSHED)
+        {
+            ADM_info("[ffMpeg4] End of stream.\n");
+            return false;
+        }
         if(r<0)
         {
             ADM_warning("[ffMpeg4] Error %d encoding video\n",r);
             return false;
         }
         sz=r;
+        if(!sz) return false;
         printf("[ffmpeg4] Popping delayed bframes (%d)\n",sz);
         goto link;
-        return false;
     }
     q=image->_Qp;
 
@@ -153,6 +159,11 @@
 
     _frame->reordered_opaque=image->Pts;
     r=encodeWrapper(_frame,out);
+    if(encoderState == ADM_ENCODER_STATE_FLUSHED)
+    {
+        ADM_info("[ffMpeg4] End of stream.\n");
+        return false;
+    }
     if(r<0)
     {
         ADM_warning("[ffMpeg4] Error %d encoding video\n",r);
@@ -184,20 +195,20 @@
 bool         ffMpeg4Configure(void)
 {
 diaMenuEntry qzE[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg4","H.263")},
-  {1,QT_TRANSLATE_NOOP("ffmpeg4","MPEG")}
+  {0,QT_TRANSLATE_NOOP("ffmpeg4","H.263"),NULL},
+  {1,QT_TRANSLATE_NOOP("ffmpeg4","MPEG"),NULL}
 };
 
 diaMenuEntry rdE[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg4","MB comparison")},
-  {1,QT_TRANSLATE_NOOP("ffmpeg4","Fewest bits (vhq)")},
-  {2,QT_TRANSLATE_NOOP("ffmpeg4","Rate distortion")}
+  {0,QT_TRANSLATE_NOOP("ffmpeg4","MB comparison"),NULL},
+  {1,QT_TRANSLATE_NOOP("ffmpeg4","Fewest bits (vhq)"),NULL},
+  {2,QT_TRANSLATE_NOOP("ffmpeg4","Rate distortion"),NULL}
 };
 diaMenuEntry threads[]={
-  {0,QT_TRANSLATE_NOOP("ffmpeg4","One thread")},
-  {2,QT_TRANSLATE_NOOP("ffmpeg4","Two threads)")},
-  {3,QT_TRANSLATE_NOOP("ffmpeg4","Three threads")},
-  {99,QT_TRANSLATE_NOOP("ffmpeg4","Auto (#cpu)")}
+  {0,QT_TRANSLATE_NOOP("ffmpeg4","One thread"),NULL},
+  {2,QT_TRANSLATE_NOOP("ffmpeg4","Two threads"),NULL},
+  {3,QT_TRANSLATE_NOOP("ffmpeg4","Three threads"),NULL},
+  {99,QT_TRANSLATE_NOOP("ffmpeg4","Auto (#cpu)"),NULL}
 };

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp Changed

@@ -228,7 +228,7 @@
 {
     uint64_t delay=0;
     if(NvEncSettings.bframes)
-        delay=frameIncrement*2;
+        delay = frameIncrement * ((NvEncSettings.b_ref_mode == NV_FF_BFRAME_REF_DISABLED)? 2 : 3); // untested with NV_FF_BFRAME_REF_EACH
     return delay;
 }
 
@@ -323,44 +323,44 @@
 bool ffNvEncConfigure(void)
 {
     diaMenuEntry meRcMode[]={
-        {NV_FF_RC_AUTO,QT_TRANSLATE_NOOP("ffnvenc","Controlled by Preset")},
-        {NV_FF_RC_CONSTQP,QT_TRANSLATE_NOOP("ffnvenc","Constant Quantizer")},
-        {NV_FF_RC_CBR,QT_TRANSLATE_NOOP("ffnvenc","Constant Bitrate")},
-        {NV_FF_RC_VBR,QT_TRANSLATE_NOOP("ffnvenc","Variable Bitrate")}
+        {NV_FF_RC_AUTO,QT_TRANSLATE_NOOP("ffnvenc","Controlled by Preset"),NULL},
+        {NV_FF_RC_CONSTQP,QT_TRANSLATE_NOOP("ffnvenc","Constant Quantizer"),NULL},
+        {NV_FF_RC_CBR,QT_TRANSLATE_NOOP("ffnvenc","Constant Bitrate"),NULL},
+        {NV_FF_RC_VBR,QT_TRANSLATE_NOOP("ffnvenc","Variable Bitrate"),NULL}
     };
 
     diaMenuEntry mePreset[]={
-        {NV_FF_PRESET_DEFAULT,QT_TRANSLATE_NOOP("ffnvenc","Default")},
-        {NV_FF_PRESET_SLOW,QT_TRANSLATE_NOOP("ffnvenc","Slow")},
-        {NV_FF_PRESET_MEDIUM,QT_TRANSLATE_NOOP("ffnvenc","Medium")},
-        {NV_FF_PRESET_MEDIUM,QT_TRANSLATE_NOOP("ffnvenc","Fast")},
-        {NV_FF_PRESET_HP,QT_TRANSLATE_NOOP("ffnvenc","High Performance")},
-        {NV_FF_PRESET_HQ,QT_TRANSLATE_NOOP("ffnvenc","High Quality")},
-        {NV_FF_PRESET_BD,QT_TRANSLATE_NOOP("ffnvenc","BluRay")},
-        {NV_FF_PRESET_LL,QT_TRANSLATE_NOOP("ffnvenc","Low Latency")},
-        {NV_FF_PRESET_LLHP,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HP)")},
-        {NV_FF_PRESET_LLHQ,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HQ)")},
-        {NV_FF_PRESET_LOSSLESS,QT_TRANSLATE_NOOP("ffnvenc","Lossless")},
-        {NV_FF_PRESET_LOSSLESSHP,QT_TRANSLATE_NOOP("ffnvenc","Lossless (HP)")}
+        {NV_FF_PRESET_DEFAULT,QT_TRANSLATE_NOOP("ffnvenc","Default"),NULL},
+        {NV_FF_PRESET_SLOW,QT_TRANSLATE_NOOP("ffnvenc","Slow"),NULL},
+        {NV_FF_PRESET_MEDIUM,QT_TRANSLATE_NOOP("ffnvenc","Medium"),NULL},
+        {NV_FF_PRESET_MEDIUM,QT_TRANSLATE_NOOP("ffnvenc","Fast"),NULL},
+        {NV_FF_PRESET_HP,QT_TRANSLATE_NOOP("ffnvenc","High Performance"),NULL},
+        {NV_FF_PRESET_HQ,QT_TRANSLATE_NOOP("ffnvenc","High Quality"),NULL},
+        {NV_FF_PRESET_BD,QT_TRANSLATE_NOOP("ffnvenc","BluRay"),NULL},
+        {NV_FF_PRESET_LL,QT_TRANSLATE_NOOP("ffnvenc","Low Latency"),NULL},
+        {NV_FF_PRESET_LLHP,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HP)"),NULL},
+        {NV_FF_PRESET_LLHQ,QT_TRANSLATE_NOOP("ffnvenc","Low Latency (HQ)"),NULL},
+        {NV_FF_PRESET_LOSSLESS,QT_TRANSLATE_NOOP("ffnvenc","Lossless"),NULL},
+        {NV_FF_PRESET_LOSSLESSHP,QT_TRANSLATE_NOOP("ffnvenc","Lossless (HP)"),NULL}
     };
 
     diaMenuEntry meProfile[]={
 #ifdef H265_ENCODER
-        {NV_FF_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffnvenc","Main")},
-        {NV_FF_PROFILE_MAIN10,QT_TRANSLATE_NOOP("ffnvenc","Main10")}
+        {NV_FF_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffnvenc","Main"),NULL},
+        {NV_FF_PROFILE_MAIN10,QT_TRANSLATE_NOOP("ffnvenc","Main10"),NULL},
 #else
-        {NV_FF_PROFILE_BASELINE,QT_TRANSLATE_NOOP("ffnvenc","Baseline")},
-        {NV_FF_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffnvenc","Main")},
-        {NV_FF_PROFILE_HIGH,QT_TRANSLATE_NOOP("ffnvenc","High")}
+        {NV_FF_PROFILE_BASELINE,QT_TRANSLATE_NOOP("ffnvenc","Baseline"),NULL},
+        {NV_FF_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffnvenc","Main"),NULL},
+        {NV_FF_PROFILE_HIGH,QT_TRANSLATE_NOOP("ffnvenc","High"),NULL}
 #endif
     };
 
     diaMenuEntry meBframeRef[]={
-        {NV_FF_BFRAME_REF_DISABLED,QT_TRANSLATE_NOOP("ffnvenc","Disabled")},
+        {NV_FF_BFRAME_REF_DISABLED,QT_TRANSLATE_NOOP("ffnvenc","Disabled"),NULL},
 #ifdef H265_ENCODER
-        {NV_FF_BFRAME_REF_EACH,QT_TRANSLATE_NOOP("ffnvenc","Each")},
+        {NV_FF_BFRAME_REF_EACH,QT_TRANSLATE_NOOP("ffnvenc","Each"),NULL},
 #endif
-        {NV_FF_BFRAME_REF_MIDDLE,QT_TRANSLATE_NOOP("ffnvenc","Middle")}
+        {NV_FF_BFRAME_REF_MIDDLE,QT_TRANSLATE_NOOP("ffnvenc","Middle"),NULL}
     };
 
     ffnvenc_encoder *conf=&NvEncSettings;
@@ -376,7 +376,7 @@
     diaElemUInteger bitrate(PX(bitrate),QT_TRANSLATE_NOOP("ffnvenc","Bitrate (kbps):"),1,50000);
     diaElemUInteger maxBitrate(PX(max_bitrate),QT_TRANSLATE_NOOP("ffnvenc","Max Bitrate (kbps):"),1,50000);
 
-    diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffnvenc","GOP Size:"),8,1000);
+    diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffnvenc","GOP Size:"),0,1000);
     diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffnvenc","Maximum Consecutive B-Frames:"),0,4);
 
     diaElemUInteger lookAhead(PX(lookahead),QT_TRANSLATE_NOOP("ffnvenc","Lookahead:"),0,NV_MX_LOOKAHEAD);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVTEnc/ADM_ffVTEnc.cpp Changed

@@ -40,13 +40,13 @@
 {
     switch(VTEncSettings.profile)
     {
-#define SAY(x,y) case FF_VT_PROFILE_##x: ADM_assert(!av_opt_set(_context->priv_data,"profile",y,0)); break;
+#define SAY(x,y) case FF_VT_PROFILE_##x: av_dict_set(&_options,"profile",y,0); break;
         SAY(BASELINE,"baseline")
         SAY(MAIN,"main")
         SAY(HIGH,"high")
         default:break;
 #undef SAY
-    };
+    }
 
     _context->bit_rate=VTEncSettings.bitrate*1000;
     _context->rc_max_rate=VTEncSettings.max_bitrate*1000;
@@ -64,14 +64,10 @@
 {
     if(false== ADM_coreVideoEncoderFFmpeg::setupByName("h264_videotoolbox"))
     {
-        ADM_info("[FFmpeg] Encoder setup failed\n");
+        ADM_warning("Cannot set up h264_videotoolbox encoder.\n");
         return false;
     }
-
-    ADM_info("[FFmpeg] Setup OK\n");
-
-    int w = getWidth();
-    int h = getHeight();
+    ADM_info("h264_videotoolbox encoder set up successfully.\n");
     return true;
 }
 
@@ -105,14 +101,16 @@
     if(false==preEncode()) // Pop out the frames stored in the queue due to B-frames
     {
         sz=encodeWrapper(NULL,out);
-        if (sz<= 0)
+
+        if (sz == 0)
+            return false;
+        if (sz < 0)
         {
             ADM_info("[ffvtenc] Error %d encoding video\n",sz);
             return false;
         }
         ADM_info("[ffvtenc] Popping delayed bframes (%d)\n",sz);
         goto link;
-        return false;
     }
     q = image->_Qp;
 
@@ -156,9 +154,9 @@
     ffvtenc *conf=&VTEncSettings;
 
     diaMenuEntry vtProfile[]={
-        {FF_VT_PROFILE_BASELINE,QT_TRANSLATE_NOOP("ffvtenc","Baseline")},
-        {FF_VT_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffvtenc","Main")},
-        {FF_VT_PROFILE_HIGH,QT_TRANSLATE_NOOP("ffvtenc","High")}
+        {FF_VT_PROFILE_BASELINE,QT_TRANSLATE_NOOP("ffvtenc","Baseline"),NULL},
+        {FF_VT_PROFILE_MAIN,QT_TRANSLATE_NOOP("ffvtenc","Main"),NULL},
+        {FF_VT_PROFILE_HIGH,QT_TRANSLATE_NOOP("ffvtenc","High"),NULL}
 };
 
 #define PX(x) &(conf->x)

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp Changed

@@ -342,15 +342,15 @@
     ffvaenc_encoder *conf=&VaEncSettings;
 
     diaMenuEntry h264Profile[]={
-        {FF_PROFILE_H264_CONSTRAINED_BASELINE,QT_TRANSLATE_NOOP("ffVAEncH264","Baseline")},
-        {FF_PROFILE_H264_MAIN,QT_TRANSLATE_NOOP("ffVAEncH264","Main")},
-        {FF_PROFILE_H264_HIGH,QT_TRANSLATE_NOOP("ffVAEncH264","High")}
+        {FF_PROFILE_H264_CONSTRAINED_BASELINE,QT_TRANSLATE_NOOP("ffVAEncH264","Baseline"),NULL},
+        {FF_PROFILE_H264_MAIN,QT_TRANSLATE_NOOP("ffVAEncH264","Main"),NULL},
+        {FF_PROFILE_H264_HIGH,QT_TRANSLATE_NOOP("ffVAEncH264","High"),NULL}
     };
     diaMenuEntry rateControlMode[]={
-        {ADM_FFVAENC_RC_CRF,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Rate Factor")},
-        {ADM_FFVAENC_RC_CBR,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Bitrate")},
+        {ADM_FFVAENC_RC_CRF,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Rate Factor"),NULL},
+        {ADM_FFVAENC_RC_CBR,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Bitrate"),NULL},
 #ifdef USE_VBR
-        {ADM_FFVAENC_RC_VBR,QT_TRANSLATE_NOOP("ffVAEncH264","Variable Bitrate")}
+        {ADM_FFVAENC_RC_VBR,QT_TRANSLATE_NOOP("ffVAEncH264","Variable Bitrate"),NULL}
 #endif
     };

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffVaHEVC/ADM_ffVAEncHEVC.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.cpp Added

@@ -0,0 +1,168 @@
+/***************************************************************************
+                          \file ADM_ffv1Encoder.cpp
+                          \brief ffv1 lavcodec based 
+                             -------------------
+    
+    copyright            : (C) 2002/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 "ADM_ffv1Encoder.h"
+#include "DIA_factory.h"
+
+
+
+ffv1_encoder ffv1config = FFV1_CONF_DEFAULT;
+
+//
+/**
+        \fn ADM_ffv1Encoder
+*/
+ADM_ffv1Encoder::ADM_ffv1Encoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoderFFmpeg(src)
+{
+    printf("[ffv1Encoder] Creating.\n");
+    targetPixFrmt=ADM_PIXFRMT_YV12;
+}
+
+/**
+    \fn setup
+*/
+bool ADM_ffv1Encoder::setup(void)
+{
+    AVCodecID id=AV_CODEC_ID_FFV1;
+    av_dict_set_int(&_options, "level", 3, 0);
+    switch (ffv1config.coder)
+    {
+        case ADM_FFV1_CODER_GOLOMB:
+                av_dict_set(&_options, "coder", "rice", 0);
+            break;
+        case ADM_FFV1_CODER_RANGE:
+                av_dict_set(&_options, "coder", "range_def", 0);
+            break;
+        default:break;
+    }
+    switch (ffv1config.context)
+    {
+        case ADM_FFV1_CONTEXT_SMALL:
+                av_dict_set_int(&_options, "context", 0, 0);
+            break;
+        case ADM_FFV1_CONTEXT_LARGE:
+                av_dict_set_int(&_options, "context", 1, 0);
+            break;
+        default:break;
+    }
+    switch (ffv1config.threads)
+    {
+        case ADM_FFV1_THREADS_1:
+                av_dict_set_int(&_options, "threads", 1, 0);
+            break;
+        case ADM_FFV1_THREADS_2:
+                av_dict_set_int(&_options, "threads", 2, 0);
+            break;
+        case ADM_FFV1_THREADS_4:
+                av_dict_set_int(&_options, "threads", 4, 0);
+            break;
+        default:break;
+    }
+    av_dict_set_int(&_options, "slicecrc", (ffv1config.slicecrc ? 1:0), 0);
+
+    return ADM_coreVideoEncoderFFmpeg::setup(id);
+}
+
+
+/** 
+    \fn ~ADM_ffv1Encoder
+*/
+ADM_ffv1Encoder::~ADM_ffv1Encoder()
+{
+    printf("[ffv1Encoder] Destroying.\n");
+}
+/**
+    \fn getFourcc
+*/
+const char * ADM_ffv1Encoder::getFourcc(void)
+{
+    return "FFV1";
+
+}
+/**
+    \fn getExtraData
+
+*/
+bool ADM_ffv1Encoder::getExtraData(uint32_t *l,uint8_t **d)
+{
+    *l=_context->extradata_size;
+    *d=_context->extradata;
+    return true;
+};
+/**
+    \fn encode
+*/
+bool ADM_ffv1Encoder::encode (ADMBitstream * out)
+{
+    if(false==preEncode()) return false;
+
+    int r = encodeWrapper(_frame,out);
+    if(r<0)
+        return false; // encodeWrapper prints a human-readable error message from libavcodec
+
+    out->len=r;
+    out->pts=out->dts=image->Pts;
+    return true;
+}
+
+/**
+    \fn ffv1Configure
+    \brief Configuration UI for ffv1 encoder
+*/
+bool ffv1Configure(void)
+{
+    uint32_t coderM,contextM,threadsM;
+    bool slicecrc;
+    printf("[ffv1] Configure\n");
+    coderM=(uint32_t)ffv1config.coder;
+    contextM=(uint32_t)ffv1config.context;
+    threadsM=(uint32_t)ffv1config.threads;
+    slicecrc=ffv1config.slicecrc;
+
+    const diaMenuEntry coderMenus[2]={
+        {ADM_FFV1_CODER_GOLOMB,QT_TRANSLATE_NOOP("ffv1","Golomb-Rice"),NULL},
+        {ADM_FFV1_CODER_RANGE,QT_TRANSLATE_NOOP("ffv1","Range Coder"),NULL}
+    };
+    const diaMenuEntry contextMenus[2]={
+        {ADM_FFV1_CONTEXT_SMALL,QT_TRANSLATE_NOOP("ffv1","Small"),NULL},
+        {ADM_FFV1_CONTEXT_LARGE,QT_TRANSLATE_NOOP("ffv1","Large"),NULL}
+    };
+    const diaMenuEntry threadsMenus[3]={
+        {ADM_FFV1_THREADS_1,QT_TRANSLATE_NOOP("ffv1","1"),NULL},
+        {ADM_FFV1_THREADS_2,QT_TRANSLATE_NOOP("ffv1","2"),NULL},
+        {ADM_FFV1_THREADS_4,QT_TRANSLATE_NOOP("ffv1","4"),NULL}
+    };
+
+    diaElemMenu      cd(&coderM,  QT_TRANSLATE_NOOP("ffv1","Coder:"),2,coderMenus);
+    diaElemMenu      ct(&contextM,QT_TRANSLATE_NOOP("ffv1","Context:"),2,contextMenus);
+    diaElemMenu      th(&threadsM,QT_TRANSLATE_NOOP("ffv1","Threads:"),3,threadsMenus);
+    diaElemToggle    sc(&slicecrc,QT_TRANSLATE_NOOP("ffv1","Error correction/detection"));
+    diaElem *elems[4]={&cd, &ct, &th, &sc};
+
+    if( diaFactoryRun(QT_TRANSLATE_NOOP("ffv1","FFV1 Configuration"),4 ,elems))
+    {
+        ffv1config.coder=coderM;
+        ffv1config.context=contextM;
+        ffv1config.threads=threadsM;
+        ffv1config.slicecrc=slicecrc;
+        return false;
+    }
+    return true;
+}
+// EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ADM_ffv1Encoder.h Added

@@ -0,0 +1,68 @@
+/***************************************************************************
+                          \fn ADM_VideoEncoders
+                          \brief Internal handling of video encoders
+                             -------------------
+    
+    copyright            : (C) 2002/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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef ADM_ffv1_ENCODER_H
+#define ADM_ffv1_ENCODER_H
+#include "ADM_coreVideoEncoderFFmpeg.h"
+#include "ffv1_encoder.h"
+
+extern ffv1_encoder ffv1config;
+
+enum
+{
+    ADM_FFV1_CODER_GOLOMB = 0,
+    ADM_FFV1_CODER_RANGE,
+};
+
+enum
+{
+    ADM_FFV1_CONTEXT_SMALL = 0,
+    ADM_FFV1_CONTEXT_LARGE,
+};
+
+enum
+{
+    ADM_FFV1_THREADS_1 = 0,
+    ADM_FFV1_THREADS_2,
+    ADM_FFV1_THREADS_4,
+};
+
+
+#define FFV1_CONF_DEFAULT {0}
+
+/**
+        \class ADM_ffv1Encoder
+        \brief Dummy encoder that does nothing
+
+*/
+
+class ADM_ffv1Encoder : public ADM_coreVideoEncoderFFmpeg
+{
+protected:
+               int              plane;
+public:
+
+                           ADM_ffv1Encoder(ADM_coreVideoFilter *src,bool globalHeader);
+                           ~ADM_ffv1Encoder();
+virtual        bool        setup(void); 
+virtual        bool        encode (ADMBitstream * out);
+virtual const  char        *getFourcc(void);
+virtual        bool         getExtraData(uint32_t *l,uint8_t **d);
+};
+
+
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ffv1Plugin.cpp Added

@@ -0,0 +1,41 @@
+/***************************************************************************
+                          \fn     jpegPlugin
+                          \brief  Plugin for jpeg dummy encoder
+                             -------------------
+
+    copyright            : (C) 2002/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 "ADM_ffv1Encoder.h"
+#include "ADM_coreVideoEncoderInternal.h"
+#include "ffv1_encoder_desc.cpp"
+
+extern bool ffv1Configure(void);
+
+void resetConfigurationData()
+{
+    ffv1_encoder defaultConf = FFV1_CONF_DEFAULT;
+    memcpy(&ffv1config, &defaultConf, sizeof(ffv1_encoder));
+}
+
+ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffv1Encoder);
+ADM_DECLARE_VIDEO_ENCODER_MAIN("FFV1",
+                               "FFV1",
+                               "FFV1 (c) 2021 szlldm",
+                                ffv1Configure,
+                                ADM_UI_ALL,
+                                1,0,0,
+                                ffv1_encoder_param, // conf template
+                                &ffv1config,NULL,NULL // conf var
+);

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/ffv1/ffv1_encoder_json.cpp Added

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp Changed

@@ -29,9 +29,9 @@
 {
     printf("[huffEncoder] Creating.\n");
     if(huffType.encoderType==ADM_HUFF_YUV)
-        targetColorSpace=ADM_COLOR_YUV422P;
+        targetPixFrmt=ADM_PIXFRMT_YUV422P;
     else
-        targetColorSpace=ADM_COLOR_YV12;
+        targetPixFrmt=ADM_PIXFRMT_YV12;
 }
 /**
     \fn setup
@@ -98,19 +98,17 @@
     \fn huffConfigure
     \brief UI configuration for huff encoder
 */
-    
-static const diaMenuEntry colorMenus[2]=
-    {
-	{ADM_HUFF_YUV,QT_TRANSLATE_NOOP("huff","HUFFYUV")},
-	{ADM_FF_HUFF_YUV,QT_TRANSLATE_NOOP("huff","FF HUFFYUV")},
-};
-
 bool         huffConfigure(void)
 {
 uint32_t colorM;
     printf("[huff] Configure\n");
     colorM=(uint32_t)huffType.encoderType;
 
+    const diaMenuEntry colorMenus[2]={
+        {ADM_HUFF_YUV,QT_TRANSLATE_NOOP("huff","HUFFYUV"),NULL},
+        {ADM_FF_HUFF_YUV,QT_TRANSLATE_NOOP("huff","FF HUFFYUV"),NULL}
+    };
+
     diaElemMenu      c(&colorM,QT_TRANSLATE_NOOP("huff","Type:"),2,colorMenus);
     diaElem *elems[1]={&c};

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.cpp Changed

@@ -29,7 +29,7 @@
 ADM_jpegEncoder::ADM_jpegEncoder(ADM_coreVideoFilter *src,bool globalHeader) : ADM_coreVideoEncoderFFmpeg(src)
 {
     printf("[jpegEncoder] Creating.\n");
-    targetColorSpace=(ADM_colorspace)jpegConf.colorSpace;
+    targetPixFrmt=(ADM_pixelFormat)jpegConf.pixelFormat;
 }
 
 /**
@@ -85,28 +85,25 @@
     \fn jpegConfigure
     \brief UI configuration for jpeg encoder
 */
-static const diaMenuEntry colorMenus[2]=
-    {
-	{ADM_COLOR_YUV422P,QT_TRANSLATE_NOOP("jpeg","YUV422")},
-	{ADM_COLOR_YV12,QT_TRANSLATE_NOOP("jpeg","YUV420")},
-};
-/**
-    \fn jpegConfigure
-*/
 bool         jpegConfigure(void)
 {
-uint32_t colorM;
+uint32_t pixfrmtM;
     printf("[jpeg] Configure\n");
-    colorM=(uint32_t)jpegConf.colorSpace;
+    pixfrmtM=(uint32_t)jpegConf.pixelFormat;
+
+    const diaMenuEntry pixfrmtMenus[2]={
+        {ADM_PIXFRMT_YUV422P,QT_TRANSLATE_NOOP("jpeg","YUV422"),NULL},
+        {ADM_PIXFRMT_YV12,QT_TRANSLATE_NOOP("jpeg","YUV420"),NULL}
+    };
 
     diaElemUInteger  q(&(jpegConf.quantizer),QT_TRANSLATE_NOOP("jpeg","_Quantizer:"),2,31);
-    diaElemMenu      c(&colorM,QT_TRANSLATE_NOOP("jpeg","_ColorSpace:"),2,colorMenus);
+    diaElemMenu      c(&pixfrmtM,QT_TRANSLATE_NOOP("jpeg","_Pixel format:"),2,pixfrmtMenus);
 
     diaElem *elems[2]={&q,&c};
     
   if( diaFactoryRun(QT_TRANSLATE_NOOP("jpeg","Mjpeg Configuration"),2 ,elems))
   {
-    jpegConf.colorSpace=colorM;
+    jpegConf.pixelFormat=pixfrmtM;
     return false;
   }
   return true;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/ADM_jpegEncoder.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.conf Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_desc.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/jpeg/jpeg_encoder_json.cpp Added

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/vp9/ADM_vp9Dialog.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h Changed

@@ -27,7 +27,7 @@
 
 #define X264_DEFAULT_CONF \
 { \
-   true, /* bool UseAdvancedConfiguration */ \
+   false, /* bool UseAdvancedConfiguration */ \
    { /* General */ \
     { \
     COMPRESS_AQ, /* COMPRESSION_MODE  mode */ \
@@ -44,7 +44,7 @@
         0*ADM_ENC_CAP_SAME \
     }, \
     99, /* Threads : auto */ \
-    std::string(""), /* Preset */ \
+    std::string("medium"), /* Preset */ \
     std::string(""), /* Tuning */ \
     std::string("high"), /* Profile */ \
     false, /* Fast decode */ \
@@ -52,7 +52,16 @@
     true /* Fast first pass */ \
     }, \
     -1, /* Level */ \
-    {1,1}, /* Sar width/height */ \
+    { \
+        1,1, /* Sar width/height */ \
+        0, /* uint32_t overscan */ \
+        5, /* uint32_t vidformat = undefined */ \
+        false, /* fullrange */ \
+        2, /* colorprim */ \
+        2, /* transfer  */ \
+        2, /* colmatrix */ \
+        0 /* chroma location = left center */ \
+    }, \
     3, /* uint32_t MaxRefFrames */ \
     25, /* uint32_t MinIdr */ \
     250, /* uint32_t MaxIdr */ \

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp Changed

@@ -63,17 +63,17 @@
   if(!x264Settings.useAdvancedConfiguration)
   {
         std::string tune;
-        if(x264Settings.general.tuning != std::string("none"))
+        if(x264Settings.general.tuning != "none")
             tune = x264Settings.general.tuning;
         if(x264Settings.general.fast_decode)
         {
-            tune += std::string(",");
-            tune += std::string("fastdecode");
+            tune += ",";
+            tune += "fastdecode";
         }
         if(x264Settings.general.zero_latency)
         {
-            tune += std::string(",");
-            tune += std::string("zerolatency");
+            tune += ",";
+            tune += "zerolatency";
         }
         if(tune.empty())
             x264_param_default_preset(&param, x264Settings.general.preset.c_str(), NULL);
@@ -126,6 +126,13 @@
   #define MKPARAMB(x,y) {param.vui.x = x264Settings.vui.y ;aprintf("[x264] vui."#x" = %s\n",TrueFalse[param.vui.x&1]);}
   MKPARAM (i_sar_width,sar_width) 
   MKPARAM (i_sar_height,sar_height) 
+  MKPARAM (i_overscan,overscan)
+  MKPARAM (i_vidformat,vidformat)
+  MKPARAMB(b_fullrange,fullrange)
+  MKPARAM (i_colorprim,colorprim)
+  MKPARAM (i_transfer,transfer)
+  MKPARAM (i_colmatrix,colmatrix)
+  MKPARAM (i_chroma_loc,chroma_loc)
 
   // -------------- rate control------------
   switch(x264Settings.general.params.mode)
@@ -207,22 +214,34 @@
   else
       param.b_repeat_headers=1;
 
-  if(x264Settings.useAdvancedConfiguration)
-  {  
-
   #undef MKPARAM
   #undef MKPARAMF
   #undef MKPARAMB
   #define MKPARAM(x,y) {param.x = x264Settings.y;aprintf("[x264] "#x" = %d\n",param.x);}
   #define MKPARAMF(x,y) {param.x = (float)x264Settings.y; aprintf("[x264] "#x" = %.2f\n",param.x);}
   #define MKPARAMB(x,y) {param.x = x264Settings.y ;aprintf("[x264] "#x" = %s\n",TrueFalse[param.x&1]);}
+
+#ifdef SIMPLE_MODE_EX
+  MKPARAMB(b_interlaced,interlaced)
+  MKPARAMB(b_tff,tff)
+  MKPARAM(i_keyint_min,MinIdr)
+  MKPARAM(i_keyint_max,MaxIdr)
+  MKPARAM(i_scenecut_threshold,i_scenecut_threshold)
+  MKPARAMB(b_intra_refresh,intra_refresh)
+#endif
+
+  if(x264Settings.useAdvancedConfiguration)
+  {
     MKPARAM(i_frame_reference,MaxRefFrames);
-    MKPARAM(i_keyint_min,MinIdr);
-    MKPARAM(i_keyint_max,MaxIdr);
-    MKPARAM(i_scenecut_threshold,i_scenecut_threshold);
-    MKPARAMB(b_intra_refresh,intra_refresh);
+#ifndef SIMPLE_MODE_EX
+    MKPARAMB(b_interlaced,interlaced)
+    MKPARAMB(b_tff,tff)
+    MKPARAM(i_keyint_min,MinIdr)
+    MKPARAM(i_keyint_max,MaxIdr)
+    MKPARAM(i_scenecut_threshold,i_scenecut_threshold)
+    MKPARAMB(b_intra_refresh,intra_refresh)
+#endif
     MKPARAM(i_bframe,MaxBFrame);
-
     MKPARAM(i_bframe_adaptive,i_bframe_adaptive);
     MKPARAM(i_bframe_bias,i_bframe_bias);
     MKPARAM(i_bframe_pyramid,i_bframe_pyramid);
@@ -233,9 +252,7 @@
       MKPARAM(i_deblocking_filter_beta,i_deblocking_filter_beta);
     }
     MKPARAMB(b_cabac,cabac);
-    MKPARAMB(b_interlaced,interlaced);
     MKPARAMB(b_constrained_intra,constrained_intra);
-    MKPARAMB(b_tff,tff);
     MKPARAMB(b_fake_interlaced,fake_interlaced);
 
     // -------------- analyze------------
@@ -461,131 +478,131 @@
 */
 static void dumpx264Setup(x264_param_t *param)
 {
-#define PI(x) printf(#x"\t:%d\n",(int)param->x);
-    PI(cpu);
-    PI(i_threads);
-    PI(b_sliced_threads);
-    PI(b_deterministic);
-    PI(i_sync_lookahead);
-
-    PI(i_width); 
-    PI(i_height); 
-    PI(i_width); 
-    PI(i_level_idc); 
-    PI(i_frame_total);
-
-#define VI(x) printf(#x"\t:%d\n",(int)param->vui.x);
-
-    VI(i_sar_height);
-    VI(i_sar_width);
-    VI(i_overscan);
-    VI(i_vidformat);
-    VI(b_fullrange);
-    VI(i_colorprim);
-    VI(i_transfer);
-    VI(i_colmatrix);
-    VI(i_chroma_loc);
-
-    PI(i_fps_num);
-    PI(i_fps_den);
-
-    PI(i_timebase_num);
-    PI(i_timebase_den);
-    PI(b_vfr_input);
-        
-    PI(i_frame_reference);
-    PI(i_keyint_max);
-    PI(i_keyint_min);
-    PI(i_scenecut_threshold);
-    PI(b_intra_refresh);
-
-    PI(i_bframe);
-    PI(i_bframe_adaptive);
-    PI(i_bframe_bias);
-    PI(i_bframe_pyramid);
-
-    PI(b_deblocking_filter);
-    PI(i_deblocking_filter_alphac0);
-    PI(i_deblocking_filter_beta);
-
-    PI(b_cabac);
-    PI(i_cabac_init_idc);
-
-    PI(b_interlaced);
-    PI(b_tff);
-    PI(b_fake_interlaced);
-    PI(b_bluray_compat);
-    PI(b_constrained_intra);
-
-#define AI(x) printf(#x"\t:%d\n",(int)param->analyse.x);
-#define AF(x) printf(#x"\t:%f\n",(float)param->analyse.x);
+#define STR(x) #x
+#define MKSTRING(x) STR(x)
+#define PI(x) printf("%-24s : %d\n",MKSTRING(x),(int)param->x);
+    PI(cpu)
+    PI(i_threads)
+    PI(b_sliced_threads)
+    PI(b_deterministic)
+    PI(i_sync_lookahead)
+
+    PI(i_width)
+    PI(i_height)
+    PI(i_width)
+    PI(i_level_idc)
+    PI(i_frame_total)
+
+#define VI(x) printf("%-24s : %d\n",MKSTRING(x),(int)param->vui.x);
+    VI(i_sar_height)
+    VI(i_sar_width)
+    VI(i_overscan)
+    VI(i_vidformat)
+    VI(b_fullrange)
+    VI(i_colorprim)
+    VI(i_transfer)
+    VI(i_colmatrix)
+    VI(i_chroma_loc)
+
+    PI(i_fps_num)
+    PI(i_fps_den)
+
+    PI(i_timebase_num)
+    PI(i_timebase_den)
+    PI(b_vfr_input)
+
+    PI(i_frame_reference)
+    PI(i_keyint_max)
+    PI(i_keyint_min)
+    PI(i_scenecut_threshold)
+    PI(b_intra_refresh)
+
+    PI(i_bframe)
+    PI(i_bframe_adaptive)
+    PI(i_bframe_bias)
+    PI(i_bframe_pyramid)
+
+    PI(b_deblocking_filter)
+    PI(i_deblocking_filter_alphac0)
+    PI(i_deblocking_filter_beta)
+
+    PI(b_cabac)
+    PI(i_cabac_init_idc)
+
+    PI(b_interlaced)
+    PI(b_tff)
+    PI(b_fake_interlaced)
+    PI(b_bluray_compat)
+    PI(b_constrained_intra)
+
+#define AI(x) printf("%-24s : %d\n",MKSTRING(x),(int)param->analyse.x);
+#define AF(x) printf("%-24s : %f\n",MKSTRING(x),(float)param->analyse.x);
     printf("*************************************\n");
     printf("*********     Analyse       *********\n");
     printf("*************************************\n");
 
-    AI(intra);
-    AI(inter);
-
-    AI(b_transform_8x8);
-    AI(i_weighted_pred);
-    AI(b_weighted_bipred);
-    AI(i_chroma_qp_offset);
-    
-    AI(i_me_method);
-    AI(i_me_range);
-    AI(i_mv_range);
-    AI(i_mv_range_thread);
-    AI(i_subpel_refine);
-    AI(b_chroma_me);
-    AI(b_mixed_references);
-    AI(i_trellis);
-    AI(b_fast_pskip);
-
-    AI(b_dct_decimate);
-    AI(i_noise_reduction);
-    AF(f_psy_rd);
-    AF(f_psy_trellis);
-    AI(b_psy);
-
-    PI(b_aud);
-    PI(b_repeat_headers);
-    PI(b_annexb);
-    
-    AI(i_luma_deadzone[0]);
-    AI(i_luma_deadzone[1]);
-
-    PI(i_sps_id);
-
-    PI(i_slice_max_size);
-    PI(i_slice_max_mbs);
-    PI(i_slice_count);
-
-#define RI(x) printf(#x"\t:%d\n",(int)param->rc.x)
-#define RF(x) printf(#x"\t:%f\n",(float)param->rc.x)
+    AI(intra)
+    AI(inter)
+
+    AI(b_transform_8x8)
+    AI(i_weighted_pred)
+    AI(b_weighted_bipred)
+    AI(i_chroma_qp_offset)
+
+    AI(i_me_method)
+    AI(i_me_range)
+    AI(i_mv_range)
+    AI(i_mv_range_thread)
+    AI(i_subpel_refine)
+    AI(b_chroma_me)
+    AI(b_mixed_references)
+    AI(i_trellis)
+    AI(b_fast_pskip)
+
+    AI(b_dct_decimate)
+    AI(i_noise_reduction)
+    AF(f_psy_rd)
+    AF(f_psy_trellis)
+    AI(b_psy)
+
+    PI(b_aud)
+    PI(b_repeat_headers)
+    PI(b_annexb)
+
+    AI(i_luma_deadzone[0])
+    AI(i_luma_deadzone[1])
+
+    PI(i_sps_id)
+
+    PI(i_slice_max_size)
+    PI(i_slice_max_mbs)
+    PI(i_slice_count)
+
+#define RI(x) printf("%-24s : %d\n",MKSTRING(x),(int)param->rc.x);
+#define RF(x) printf("%-24s : %f\n",MKSTRING(x),(float)param->rc.x);
     printf("*************************************\n");
     printf("*********     RC            *********\n");
     printf("*************************************\n");
-    RI(i_rc_method);
-    RI(i_qp_constant);
-    RF(f_rf_constant);
-    RI(i_qp_min);
-    RI(i_qp_max);
-    RI(i_qp_step);
-
-   
-    RI(i_bitrate);
-    RI(i_qp_constant);
-    RF(f_rate_tolerance);
-    RI(i_vbv_max_bitrate);
-    RI(i_vbv_buffer_size);
-    RF(f_vbv_buffer_init);
-    RF(f_ip_factor);
-    RF(f_pb_factor);
-
-    RI(i_aq_mode);
-    RF(f_aq_strength);
-    RI(b_mb_tree);
-    RI(i_lookahead);
+    RI(i_rc_method)
+    RI(i_qp_constant)
+    RF(f_rf_constant)
+    RI(i_qp_min)
+    RI(i_qp_max)
+    RI(i_qp_step)
+
+    RI(i_bitrate)
+    RI(i_qp_constant)
+    RF(f_rate_tolerance)
+    RI(i_vbv_max_bitrate)
+    RI(i_vbv_buffer_size)
+    RF(f_vbv_buffer_init)
+    RF(f_ip_factor)
+    RF(f_pb_factor)
+
+    RI(i_aq_mode)
+    RF(f_aq_strength)
+    RI(b_mb_tree)
+    RI(i_lookahead)
 
 }
 /**

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/gtk_cli/ADM_x264Dialog.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/gtk_cli/ADM_x264Dialog.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp Changed

@@ -38,7 +38,6 @@
 }idcToken;
 
 static const idcToken listOfIdc[]={
-        {(unsigned int)-1,"Auto"},
         {10,"1"},
         {11,"1.1"},
         {12,"1.2"},
@@ -58,10 +57,9 @@
 };
 #define NB_IDC sizeof(listOfIdc)/sizeof(idcToken)
 static const idcToken listOfThreads[]={
-        {0,"Auto"},
-        {1,"1"},      
-        {2,"2"},      
-        {4,"4"},      
+    {1,"1"},
+    {2,"2"},
+    {4,"4"}
 };
 
 #define NB_THREADS sizeof(listOfThreads)/sizeof(idcToken)
@@ -80,12 +78,60 @@
 
 };
 
+static const idcToken listOfPrimaries[] = {
+    {1, "BT.709 (HD)" },
+    {4, "BT.470M (old NTSC)" },
+    {5, "BT.470BG (PAL)" },
+    {6, "SMPTE 170M (NTSC)" }, /* Same as SMTPE 240M */
+    {7, "SMPTE 240M" },
+    {9, "BT.2020 (UHD)" },
+    {8, "Film" },
+    {10, "SMPTE 428" },
+    {11, "SMPTE 431-2 (DCI-P3)" },
+    {12, "SMPTE 432 (Display P3)" }
+};
+
+static const idcToken listOfXfers[] = {
+    {1,  "BT.709 (HD)" }, /* Same as SMPTE 170M, BT.2020-10, BT.2020-12 */
+    {4,  "BT.470M (NTSC)" },
+    {5,  "BT.470BG (PAL)" },
+    {6,  "SMPTE 170M (NTSC)" },
+    {7,  "SMPTE 240M" },
+    {14, "BT.2020 10bit (UHD)" },
+    {15, "BT.2020 12bit (UHD)" },
+    {13, "IEC 61966-2-1 (sRGB)" },
+    {11, "IEC 61966-2-4" },
+    {16, "SMPTE 2084 (HDR)" },
+    {12, "BT.1361e" },
+    {17, "SMPTE 428" },
+    {8,  "linear" },
+    {9,  "log100" },
+    {10, "log316" },
+    {18, "arib-std-b67" }
+};
+
+static const idcToken listOfMatrices[] = { /* Kr      Kb     */
+    {1,  "BT.709 (HD)" },                  /* 0.2126  0.0722 */
+    {4,  "FCC (old NTSC)" },               /* 0.30    0.11   */
+    {5,  "BT.470BG (PAL)" },               /* 0.299   0.114  */
+    {6,  "SMPTE 170M (NTSC)" },            /* 0.299   0.114  */
+    {7,  "SMPTE 240M" },                   /* 0.212   0.087  */
+    {9,  "BT.2020 NCL (UHD)" },            /* 0.2627  0.0593 */
+    {10, "BT.2020 CL" },                   /* Color difference uses different values than luma */
+    {11, "SMPTE 2085 (HDR)" },
+    {14, "ICtCp" },
+    {0,  "gbr" },
+    {8,  "YCGCO" },
+    {12, "Chroma Derived NCL" },
+    {13, "Chroma Derived CL" }
+};
+
 #define NB_SAR sizeof(predefinedARs)/sizeof(aspectRatio)
 
 static const char* listOfPresets[] = { "ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo" };
 #define NB_PRESET sizeof(listOfPresets)/sizeof(char*)
 
-static const char* listOfTunings[] = { "none", "film", "animation", "grain", "stillimage", "psnr", "ssim" };
+static const char* listOfTunings[] = { "film", "animation", "grain", "stillimage", "psnr", "ssim" };
 #define NB_TUNE sizeof(listOfTunings)/sizeof(char*)
 
 static const char* listOfProfiles[] = { "baseline", "main", "high", "high10", "high422", "high444" };
@@ -112,6 +158,60 @@
     qtUnregisterDialog(&dialog);
     return success;
 }
+
+/**
+    \brief Set combo box items to be elements in container with data.
+
+    Elements of container should be idcToken.  The string will be the item name
+    and value will be added as item data.
+
+    One could design function that used a lambda to convert from element type
+    into label and value, so that any element type can be used, but that is
+    C++14.
+
+    If initial is non-NULL, it will be added first and the data used will be
+    initdata;
+
+    As a somewhat ugly hack for Qt4, the initial string will go through
+    fromUtf8() in case it has been translated to non-ASCII.  As none of the
+    items in the containers used are translated, they don't need this.
+
+    \param [in] box ComboBox to set items in
+    \param [in] items Container (array) of idcToken to use.
+    \param [in] initial An option first item to add.
+    \param [in] initdata The data to be assigned with optional first item, default is empty.
+*/
+template <typename ContainerT>
+static void fillComboBoxData(QComboBox *box, const ContainerT& items, const char* initial = NULL, const QVariant& initdata = QVariant())
+{
+    box->clear();
+    if (initial)
+        box->addItem(QString::fromUtf8(initial), initdata);
+    for (const idcToken *t = std::begin(items); t != std::end(items); t++)
+        box->addItem(t->idcString, QVariant(t->idcValue));
+}
+
+/**
+    \brief Set combo box items to be elements in container.
+
+    Elements should be const char*.  In C++11 we could use anything convertable
+    to a QString by changing "const char* const *" to "auto".
+
+    The data assigned to each item will be the index in items whence it came.
+
+    See fillComboBoxData().
+*/
+template <typename ContainerT>
+static void fillComboBox(QComboBox *box, const ContainerT& items, const char* initial = NULL)
+{
+    box->clear();
+    if (initial)
+        box->addItem(QString::fromUtf8(initial), -1);
+    int i = 0;
+    for (const char * const *t = std::begin(items); t != std::end(items); t++, i++)
+        box->addItem(*t, i);
+}
+
 /**
 
 */  
@@ -146,45 +246,22 @@
         connect(ui.saveAsButton, SIGNAL(pressed()), this, SLOT(saveAsButton_pressed()));
         connect(ui.configurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationComboBox_currentIndexChanged(int)));
 
+        const char *automatic = QT_TRANSLATE_NOOP("x264","Auto");
+        const char *none = QT_TRANSLATE_NOOP("x264","none");
+        const char *unknown = QT_TRANSLATE_NOOP("x264","Unknown");
+
         // Rebuild idc level list
-        QComboBox *idc=ui.idcLevelComboBox;
-        idc->clear();
-        for(int i=0;i<NB_IDC;i++)
-        {
-            const idcToken *t=listOfIdc+i;
-            idc->addItem(QString(t->idcString));
-        }
+        fillComboBoxData(ui.idcLevelComboBox, listOfIdc, automatic, -1);
 
-        QComboBox *threads=ui.comboBoxThreads;
-        threads->clear();
-        for(int i=0;i<NB_THREADS;i++)
-        {
-            const idcToken *t=listOfThreads+i;
-            threads->addItem(QString(t->idcString));
-        }
-        QComboBox* presets=ui.presetComboBox;
-        presets->clear();
-        for(int i=0;i<NB_PRESET;i++)
-        {
-            presets->addItem(QString(listOfPresets[i]));
-        }
+        fillComboBoxData(ui.comboBoxThreads, listOfThreads, automatic, 0U);
 
-        QComboBox* tunings=ui.tuningComboBox;
-        tunings->clear();
-        for(int i=0;i<NB_TUNE;i++)
-        {
-            const char* _tn=listOfTunings[i];
-            if(!strcmp(_tn,"none"))
-                _tn=QT_TRANSLATE_NOOP("x264","none");
-            tunings->addItem(QString(_tn));
-        }
+        fillComboBox(ui.presetComboBox, listOfPresets);
+        fillComboBox(ui.tuningComboBox, listOfTunings, none);
+        fillComboBox(ui.profileComboBox, listOfProfiles);
 
-        QComboBox* profiles=ui.profileComboBox;
-        profiles->clear();
-        for(int i=0;i<NB_PROFILE;i++)
-        {
-            profiles->addItem(QString(listOfProfiles[i]));
-        }
+        fillComboBoxData(ui.colourPrimariesComboBox, listOfPrimaries, unknown, 2);
+        fillComboBoxData(ui.transferCharacteristicsComboBox, listOfXfers, unknown, 2);
+        fillComboBoxData(ui.colourMatrixComboBox, listOfMatrices, unknown, 2);
 
         upload();
         ADM_pluginInstallSystem( std::string("x264"),std::string("json"),pluginVersion);
@@ -233,20 +310,35 @@
 
 bool x264Dialog::toogleAdvancedConfiguration(bool advancedEnabled)
 {
-  ui.useAdvancedConfigurationCheckBox->setChecked(advancedEnabled);
-  ui.presetComboBox->setEnabled(!advancedEnabled);
-  ui.tuningComboBox->setEnabled(!advancedEnabled);
-  ui.profileComboBox->setEnabled(!advancedEnabled);
-  ui.fastDecodeCheckBox->setEnabled(!advancedEnabled);
-  ui.zeroLatencyCheckBox->setEnabled(!advancedEnabled);
-  ui.tabAdvancedRC->setEnabled(advancedEnabled);
-  ui.tabMotion->setEnabled(advancedEnabled);
-  ui.tabPartition->setEnabled(advancedEnabled);
-  ui.tabFrame->setEnabled(advancedEnabled);
-  ui.tabAnalysis->setEnabled(advancedEnabled);
-  ui.tabQuantiser->setEnabled(advancedEnabled);
-  ui.tabAdvanced1->setEnabled(advancedEnabled);
-  return true;
+    ui.useAdvancedConfigurationCheckBox->setChecked(advancedEnabled);
+#define SIMPLE(x) ui.x->setEnabled(!advancedEnabled);
+#define ADVANCED(x) ui.x->setEnabled(advancedEnabled);
+    SIMPLE(presetComboBox)
+    SIMPLE(tuningComboBox)
+    SIMPLE(profileComboBox)
+    SIMPLE(fastDecodeCheckBox)
+    SIMPLE(zeroLatencyCheckBox)
+    ADVANCED(tabAdvancedRC)
+    ADVANCED(tabMotion)
+    ADVANCED(tabPartition)
+#ifdef SIMPLE_MODE_EX
+    ADVANCED(cabacCheckBox)
+    ADVANCED(loopFilterCheckBox)
+    ADVANCED(alphaC0Label)
+    ADVANCED(alphaC0SpinBox)
+    ADVANCED(betaLabel)
+    ADVANCED(betaSpinBox)
+    ADVANCED(labelRefFrames)
+    ADVANCED(refFramesSpinBox)
+    ADVANCED(groupBoxBframes)
+#else
+    ADVANCED(tabFrame)
+#endif
+    ADVANCED(tabAnalysis)
+    ADVANCED(tabQuantiser)
+    ADVANCED(tabAdvanced1)
+
+    return true;
 }
 
 /**
@@ -254,24 +346,16 @@
 */
 #define MK_CHECKBOX(x,y) ui.x->setChecked(myCopy.y)
 #define MK_UINT(x,y)  ui.x->setValue(myCopy.y)
-#define DISABLE(x) ui.x->setEnabled(false);
+#define DISABLE(x) ui.x->setEnabled(false)
 #define MK_MENU(x,y) ui.x->setCurrentIndex(myCopy.y)
-#define MK_RADIOBUTTON(x) ui.x->setChecked(true);
-#define MK_COMBOBOX_STR(x,y,list,count) updateComboBox(ui.x,myCopy.y,count,list)
-/**
-
-*/
-static void updateComboBox(QComboBox *combo,const std::string &mine,int count,const char **list)
-{
-    for(int i=0;i<count;i++) 
-    { 
-      const char *p=list[i]; 
-      if(mine.size() && !strcmp(mine.c_str(), p)) 
-      { 
-        combo->setCurrentIndex(i); 
-      } 
-    } 
+#define MK_RADIOBUTTON(x) ui.x->setChecked(true)
+#define MK_COMBOBOX_STR(x,y) \
+{ \
+    const int idx = ui.x->findText(myCopy.y.c_str()); \
+    ui.x->setCurrentIndex(idx < 0 ? 0 : idx); \
 }
+#define MK_COMBOBOX_DATA(x,y) ui.x->setCurrentIndex(ui.x->findData(myCopy.y))
+
 bool x264Dialog::upload(void)
 {
           toogleAdvancedConfiguration(myCopy.useAdvancedConfiguration);
@@ -377,21 +461,13 @@
           }
 
           // preset
-          MK_COMBOBOX_STR(presetComboBox, general.preset.c_str(), listOfPresets, NB_PRESET);
-          MK_COMBOBOX_STR(profileComboBox, general.profile.c_str(), listOfProfiles, NB_PROFILE);
-          MK_COMBOBOX_STR(tuningComboBox, general.tuning.c_str(), listOfTunings, NB_TUNE);
+          MK_COMBOBOX_STR(presetComboBox, general.preset)
+          MK_COMBOBOX_STR(profileComboBox, general.profile)
+          MK_COMBOBOX_STR(tuningComboBox, general.tuning)
 
           // udate idc
-          QComboBox *idc=ui.idcLevelComboBox;
-          for(int i=0;i<NB_IDC;i++)
-          {
-                const idcToken *t=listOfIdc+i;
-                if(myCopy.level==t->idcValue)
-                {
-                        idc->setCurrentIndex(i);
-                        break;
-                }
-          }
+          MK_COMBOBOX_DATA(idcLevelComboBox, level);
+
         // update threads
           QComboBox *threads=ui.comboBoxThreads;
           for(int i=0;i<NB_THREADS;i++)
@@ -454,17 +530,27 @@
                 MK_UINT(sarCustomSpinBox2,vui.sar_height);
         }
 
+        MK_COMBOBOX_DATA(colourPrimariesComboBox, vui.colorprim);
+        MK_COMBOBOX_DATA(transferCharacteristicsComboBox, vui.transfer);
+        MK_COMBOBOX_DATA(colourMatrixComboBox, vui.colmatrix);
+
+        MK_CHECKBOX(fullRangeSamplesCheckBox, vui.fullrange);
+
         DISABLE(spsiComboBox);
         DISABLE(openGopCheckBox);
-        DISABLE(groupBoxQuantMatrix)
+        DISABLE(groupBoxQuantMatrix);
         //DISABLE(tabAdvanced1);
         DISABLE(tabAdvanced2);
-        DISABLE(tabOutput2);
+        //DISABLE(tabOutput2);
+        DISABLE(overscanComboBox);
+        DISABLE(videoFormatComboBox);
+        DISABLE(hrdComboBox);
+        DISABLE(chromaSampleSpinBox);
         DISABLE(maxCrfCheckBox);
         DISABLE(sarAsInputRadioButton);
-        DISABLE(groupBoxQuantCurveCompress)
+        DISABLE(groupBoxQuantCurveCompress);
         DISABLE(accessUnitCheckBox);
-        DISABLE(groupBoxZones)
+        DISABLE(groupBoxZones);
         //
         MK_CHECKBOX(blueRayCompat,general.blueray_compatibility);
         MK_CHECKBOX(fakeInterlaced,general.fake_interlaced);
@@ -476,21 +562,23 @@
 #undef MK_MENU
 #undef MK_RADIOBUTTON
 #undef MK_COMBOBOX_STR
+#undef MK_COMBOBOX_DATA
 #define MK_CHECKBOX(x,y)    myCopy.y=ui.x->isChecked()
 #define MK_UINT(x,y)        myCopy.y=ui.x->value()
 #define MK_MENU(x,y)        myCopy.y=ui.x->currentIndex()
 #define MK_RADIOBUTTON(x,y)   myCopy.y=ui.x->setChecked(true);
-#define MK_COMBOBOX_STR(x,y,list,count) x_readComboBox(ui.x,myCopy.y,count,list)
-
-static void x_readComboBox(QComboBox *combo, std::string &inout,int count,const char **list)
-{
-    int idx=combo->currentIndex(); 
-    ADM_assert(idx<count);    
-    inout = std::string(list[idx]); 
+#define MK_COMBOBOX_STR(x,y,list,count,none) \
+{ \
+    const QComboBox* combo=ui.x; \
+    const int idx = combo->itemData(combo->currentIndex()).toInt(); \
+    ADM_assert(idx < 0 || idx<count); \
+    myCopy.y = idx < 0 ? none : list[idx]; \
+}
+#define MK_COMBOBOX_DATA(x,y) \
+{ \
+    const QComboBox* combo=ui.x; \
+    myCopy.y = combo->itemData(combo->currentIndex()).toInt(); \
 }
-
-
-
 
 bool x264Dialog::download(void)
 {
@@ -585,14 +673,11 @@
           MK_UINT(intraLumaSpinBox,analyze.intra_luma);
           MK_UINT(interLumaSpinBox,analyze.inter_luma);
 
-          MK_COMBOBOX_STR(presetComboBox, general.preset, listOfPresets, NB_PRESET);
-          MK_COMBOBOX_STR(profileComboBox, general.profile, listOfProfiles, NB_PROFILE);
-          MK_COMBOBOX_STR(tuningComboBox, general.tuning, listOfTunings, NB_TUNE);
+          MK_COMBOBOX_STR(presetComboBox, general.preset, listOfPresets, NB_PRESET, "");
+          MK_COMBOBOX_STR(profileComboBox, general.profile, listOfProfiles, NB_PROFILE, "");
+          MK_COMBOBOX_STR(tuningComboBox, general.tuning, listOfTunings, NB_TUNE, "none");
 
-          QComboBox *idc=ui.idcLevelComboBox;
-          int dex=idc->currentIndex();
-          ADM_assert(dex<NB_IDC);
-          myCopy.level=listOfIdc[dex].idcValue;
+          MK_COMBOBOX_DATA(idcLevelComboBox, level);
 
           switch(ui.encodingModeComboBox->currentIndex())
           {
@@ -603,10 +688,7 @@
             case 4: ENCODING(mode)=COMPRESS_2PASS_BITRATE;ENCODING(avg_bitrate)=ui.targetRateControlSpinBox->value();;break;
           }
           // update thread count
-          QComboBox *threads=ui.comboBoxThreads;
-          int threadIndex=threads->currentIndex();
-          myCopy.general.threads=listOfThreads[threadIndex].idcValue;
-
+          MK_COMBOBOX_DATA(comboBoxThreads, general.threads);
 
           int t=ui.trellisComboBox->currentIndex();
           if(!ui.trellisCheckBox->isChecked())
@@ -625,6 +707,13 @@
                 MK_UINT(sarCustomSpinBox1,vui.sar_width);
                 MK_UINT(sarCustomSpinBox2,vui.sar_height);
           }
+
+        MK_CHECKBOX(fullRangeSamplesCheckBox, vui.fullrange);
+
+        MK_COMBOBOX_DATA(colourPrimariesComboBox, vui.colorprim);
+        MK_COMBOBOX_DATA(transferCharacteristicsComboBox, vui.transfer);
+        MK_COMBOBOX_DATA(colourMatrixComboBox, vui.colmatrix);
+
         MK_CHECKBOX(blueRayCompat,general.blueray_compatibility);
         MK_CHECKBOX(fakeInterlaced,general.fake_interlaced);
         return true;
@@ -720,6 +809,12 @@
 
 void x264Dialog::loopFilterCheckBox_toggled(bool checked)
 {
+    bool enable = checked && ui.useAdvancedConfigurationCheckBox->isChecked();
+    ui.alphaC0Label->setEnabled(enable);
+    ui.alphaC0SpinBox->setEnabled(enable);
+    ui.betaLabel->setEnabled(enable);
+    ui.betaSpinBox->setEnabled(enable);
+
         if (!checked)
         {
                 ui.alphaC0SpinBox->setValue(0);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui Changed

@@ -106,7 +106,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <item>
-        <widget class="QGroupBox" name="groupBox_7">
+        <widget class="QGroupBox" name="groupBoxBasic">
          <property name="title">
           <string>Basic</string>
          </property>
@@ -370,7 +370,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
+        <widget class="QGroupBox" name="groupBoxRateControl">
          <property name="title">
           <string>Rate Control</string>
          </property>
@@ -667,7 +667,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_12">
        <item>
-        <widget class="QGroupBox" name="groupBox_20">
+        <widget class="QGroupBox" name="groupBoxAdvRateControl">
          <property name="title">
           <string>Advanced Rate Control</string>
          </property>
@@ -961,7 +961,7 @@
       </attribute>
       <layout class="QVBoxLayout">
        <item>
-        <widget class="QGroupBox" name="groupBox_11">
+        <widget class="QGroupBox" name="groupBoxMotionEstimation">
          <property name="title">
           <string>Motion Estimation</string>
          </property>
@@ -1162,7 +1162,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_19">
+        <widget class="QGroupBox" name="groupBoxMV">
          <property name="title">
           <string>Motion Vector</string>
          </property>
@@ -1289,7 +1289,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_18">
+        <widget class="QGroupBox" name="groupBoxPred">
          <property name="title">
           <string>Prediction</string>
          </property>
@@ -1430,7 +1430,7 @@
       </attribute>
       <layout class="QVBoxLayout">
        <item>
-        <widget class="QGroupBox" name="groupBox_10">
+        <widget class="QGroupBox" name="groupBoxPart">
          <property name="title">
           <string>Partition Search</string>
          </property>
@@ -1505,7 +1505,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
-        <widget class="QGroupBox" name="groupBox_6">
+        <widget class="QGroupBox" name="groupBoxFrameEnc">
          <property name="title">
           <string>Frame Encoding</string>
          </property>
@@ -1695,7 +1695,7 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="label_30">
+             <widget class="QLabel" name="labelRefFrames">
               <property name="text">
                <string>Maximum Reference Frames:</string>
               </property>
@@ -1734,7 +1734,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_9">
+        <widget class="QGroupBox" name="groupBoxBframes">
          <property name="title">
           <string>B-frames</string>
          </property>
@@ -1894,7 +1894,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_8">
+        <widget class="QGroupBox" name="groupBoxKeyFrames">
          <property name="title">
           <string>I-frames</string>
          </property>
@@ -2042,7 +2042,7 @@
       </attribute>
       <layout class="QVBoxLayout">
        <item>
-        <widget class="QGroupBox" name="groupBox_12">
+        <widget class="QGroupBox" name="groupBoxAnalysis">
          <property name="title">
           <string>Analysis</string>
          </property>
@@ -2229,7 +2229,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_13">
+        <widget class="QGroupBox" name="groupBoxLumaQuant">
          <property name="title">
           <string>Luma Quantisation Deadzone</string>
          </property>
@@ -2394,7 +2394,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <item>
-        <widget class="QGroupBox" name="groupBox_4">
+        <widget class="QGroupBox" name="groupBoxQuant">
          <property name="title">
           <string>Quantiser Control</string>
          </property>
@@ -3249,7 +3249,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <widget class="QGroupBox" name="groupBox_17">
+        <widget class="QGroupBox" name="groupBoxThreads">
          <property name="title">
           <string>Multithreading</string>
          </property>
@@ -3394,7 +3394,7 @@
       </attribute>
       <layout class="QVBoxLayout">
        <item>
-        <widget class="QGroupBox" name="groupBox_16">
+        <widget class="QGroupBox" name="groupBoxOutput">
          <property name="title">
           <string>Output</string>
          </property>
@@ -3424,7 +3424,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_15">
+        <widget class="QGroupBox" name="groupBoxAspectRatio">
          <property name="title">
           <string>Pixel Aspect Ratio</string>
          </property>
@@ -3602,7 +3602,7 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QGroupBox" name="groupBox_5">
+        <widget class="QGroupBox" name="groupBoxVui">
          <property name="title">
           <string>Video Usability Information</string>
          </property>
@@ -4299,70 +4299,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>loopFilterCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>alphaC0Label</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>84</x>
-     <y>169</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>117</x>
-     <y>168</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>loopFilterCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>alphaC0SpinBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>84</x>
-     <y>169</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>169</x>
-     <y>168</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>loopFilterCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>betaLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>84</x>
-     <y>169</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>235</x>
-     <y>168</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>loopFilterCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>betaSpinBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>84</x>
-     <y>169</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>331</x>
-     <y>168</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>trellisCheckBox</sender>
    <signal>toggled(bool)</signal>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.conf -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.conf Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_desc.cpp Changed

@@ -14,6 +14,13 @@
  {"level",offsetof(x264_encoder,level),"int32_t",ADM_param_int32_t},
  {"vui.sar_height",offsetof(x264_encoder,vui.sar_height),"uint32_t",ADM_param_uint32_t},
  {"vui.sar_width",offsetof(x264_encoder,vui.sar_width),"uint32_t",ADM_param_uint32_t},
+ {"vui.overscan",offsetof(x264_encoder,vui.overscan),"uint32_t",ADM_param_uint32_t},
+ {"vui.vidformat",offsetof(x264_encoder,vui.vidformat),"uint32_t",ADM_param_uint32_t},
+ {"vui.fullrange",offsetof(x264_encoder,vui.fullrange),"bool",ADM_param_bool},
+ {"vui.colorprim",offsetof(x264_encoder,vui.colorprim),"uint32_t",ADM_param_uint32_t},
+ {"vui.transfer",offsetof(x264_encoder,vui.transfer),"uint32_t",ADM_param_uint32_t},
+ {"vui.colmatrix",offsetof(x264_encoder,vui.colmatrix),"uint32_t",ADM_param_uint32_t},
+ {"vui.chroma_loc",offsetof(x264_encoder,vui.chroma_loc),"uint32_t",ADM_param_uint32_t},
  {"MaxRefFrames",offsetof(x264_encoder,MaxRefFrames),"uint32_t",ADM_param_uint32_t},
  {"MinIdr",offsetof(x264_encoder,MinIdr),"uint32_t",ADM_param_uint32_t},
  {"MaxIdr",offsetof(x264_encoder,MaxIdr),"uint32_t",ADM_param_uint32_t},

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_json.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x264/x264_encoder_json.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp Changed

@@ -246,28 +246,38 @@
   else
       param.bRepeatHeaders=1;
 
-  if(x265Settings.useAdvancedConfiguration)
-  {  
-
   #undef MKPARAM
   #undef MKPARAMD
   #undef MKPARAMB
   #define MKPARAM(x,y) {param.x = x265Settings.y;aprintf("[x265] "#x" = %d\n",param.x);}
   #define MKPARAMD(x,y) {param.x = (double)x265Settings.y; aprintf("[x265] "#x" = %.2f\n",param.x);}
   #define MKPARAMB(x,y) {param.x = x265Settings.y ;aprintf("[x265] "#x" = %s\n",TrueFalse[param.x&1]);}
-    MKPARAMB(interlaceMode,interlaced_mode)
+
+#ifdef SIMPLE_MODE_EX
+  MKPARAM(interlaceMode,interlaced_mode)
+  MKPARAM(maxNumReferences,MaxRefFrames)
+  MKPARAMB(bOpenGOP,b_open_gop)
+  MKPARAM(keyframeMin,MinIdr)
+  MKPARAM(keyframeMax,MaxIdr)
+  MKPARAM(scenecutThreshold,i_scenecut_threshold)
+#endif
+
+  if(x265Settings.useAdvancedConfiguration)
+  {
+#ifndef SIMPLE_MODE_EX
+    MKPARAM(interlaceMode,interlaced_mode)
     MKPARAM(maxNumReferences,MaxRefFrames)
     MKPARAMB(bOpenGOP,b_open_gop)
     MKPARAM(keyframeMin,MinIdr)
     MKPARAM(keyframeMax,MaxIdr)
-
+    MKPARAM(scenecutThreshold,i_scenecut_threshold)
+#endif
     MKPARAM(bframes,MaxBFrame)
     MKPARAM(bFrameAdaptive,i_bframe_adaptive)
     MKPARAM(bBPyramid,i_bframe_pyramid)
     MKPARAM(bFrameBias,i_bframe_bias)
 
     MKPARAM(lookaheadDepth,lookahead)
-    MKPARAM(scenecutThreshold,i_scenecut_threshold)
     MKPARAMB(bEnableConstrainedIntra,constrained_intra)
     MKPARAMB(bIntraInBFrames,b_intra)
 
@@ -360,13 +370,15 @@
 */
 void dumpx265Setup(x265_param *param)
 {
-#define PI(x) printf(#x"\t:%d\n",(int)param->x)
-#define PD(x) printf(#x"\t:%f\n",(double)param->x)
-#define PS(x) printf(#x"\t:%s\n",param->x)
-    printf("*************************************\n");
-    printf("***      Encoder Environment      ***\n");
-    printf("*************************************\n");
-    
+#define STR(x) #x
+#define MKSTRING(x) STR(x)
+#define PI(x) printf("%-32s : %d\n",MKSTRING(x),(int)param->x)
+#define PD(x) printf("%-32s : %f\n",MKSTRING(x),(double)param->x)
+#define PS(x) printf("%-32s : %s\n",MKSTRING(x),param->x)
+    printf("*********************************************\n");
+    printf("***          Encoder Environment          ***\n");
+    printf("*********************************************\n");
+
     PI(cpuid);
     PI(bEnableWavefront);
 #if X265_BUILD >= 47
@@ -380,11 +392,11 @@
     PI(bEnablePsnr); 
     PI(bEnableSsim); 
     PI(decodedPictureHashSEI);
-    
-    printf("*************************************\n");
-    printf("** Internal Picture Specification  **\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***    Internal Picture Specification     ***\n");
+    printf("*********************************************\n");
+
     PI(internalBitDepth);
     PI(internalCsp);
     PI(fpsNum);
@@ -396,19 +408,19 @@
     PI(bRepeatHeaders);
     PI(bEnableAccessUnitDelimiters);
     PI(bEmitHRDSEI);
-    
-    printf("*************************************\n");
-    printf("*** Coding Unit (CU) Definitions  ***\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***     Coding Unit (CU) Definitions      ***\n");
+    printf("*********************************************\n");
+
     PI(maxCUSize);
     PI(tuQTMaxInterDepth);
     PI(tuQTMaxIntraDepth);
-    
-    printf("*************************************\n");
-    printf("***  GOP Structure and Lookahead  ***\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***      GOP Structure and Lookahead      ***\n");
+    printf("*********************************************\n");
+
     PI(bOpenGOP);
     PI(keyframeMin);
     PI(keyframeMax);
@@ -420,19 +432,19 @@
     PI(lookaheadDepth);
     PI(bFrameBias);
     PI(scenecutThreshold);
-    
-    printf("*************************************\n");
-    printf("***      Intra Coding Tools       ***\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***          Intra Coding Tools           ***\n");
+    printf("*********************************************\n");
+
     PI(bEnableConstrainedIntra);
     PI(bIntraInBFrames);
     PI(bEnableStrongIntraSmoothing);
-    
-    printf("*************************************\n");
-    printf("***      Inter Coding Tools       ***\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***          Inter Coding Tools           ***\n");
+    printf("*********************************************\n");
+
     PI(searchMethod);
     PI(subpelRefine);
     PI(searchRange);
@@ -443,11 +455,11 @@
     PI(bEnableRectInter);
     PI(bEnableAMP);
     PI(limitModes);
-    
-    printf("*************************************\n");
-    printf("***        Analysis Tools         ***\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***            Analysis Tools             ***\n");
+    printf("*********************************************\n");
+
 #if X265_BUILD < 45
     PI(bEnableCbfFastMode);
 #endif
@@ -457,11 +469,11 @@
     PD(psyRd);
     PI(rdoqLevel);
     PD(psyRdoq);
-    
-    printf("*************************************\n");
-    printf("***         Coding Tools          ***\n");
-    printf("*************************************\n");
-    
+
+    printf("*********************************************\n");
+    printf("***             Coding Tools              ***\n");
+    printf("*********************************************\n");
+
     PI(bEnableSignHiding);
     PI(bEnableTransformSkip);
     PI(bEnableTSkipFast);
@@ -487,12 +499,12 @@
     PI(bLossless);
     PI(bCULossless);
 
-#define RI(x) printf(#x"\t:%d\n",(int)param->rc.x)
-#define RD(x) printf(#x"\t:%f\n",(double)param->rc.x)
-    printf("*************************************\n");
-    printf("***         Rate Control          ***\n");
-    printf("*************************************\n");
-    
+#define RI(x) printf("%-32s : %d\n",MKSTRING(x),(int)param->rc.x)
+#define RD(x) printf("%-32s : %f\n",MKSTRING(x),(double)param->rc.x)
+    printf("*********************************************\n");
+    printf("***             Rate Control              ***\n");
+    printf("*********************************************\n");
+
     RI(rateControlMode);
     RI(qp);
     RI(bitrate);
@@ -517,11 +529,11 @@
     RD(qblur);
     RD(complexityBlur);
 
-#define VI(x) printf(#x"\t:%d\n",(int)param->vui.x)
-    printf("*************************************\n");
-    printf("***  Video Usability Information  ***\n");
-    printf("*************************************\n");
-    
+#define VI(x) printf("%-32s : %d\n",MKSTRING(x),(int)param->vui.x)
+    printf("*********************************************\n");
+    printf("***      Video Usability Information      ***\n");
+    printf("*********************************************\n");
+
     VI(aspectRatioIdc);
     VI(sarWidth);
     VI(sarHeight);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp Changed

@@ -369,189 +369,206 @@
 
 bool x265Dialog::toogleAdvancedConfiguration(bool advancedEnabled)
 {
-  ui.useAdvancedConfigurationCheckBox->setChecked(advancedEnabled);
-  ui.presetComboBox->setEnabled(!advancedEnabled);
-  ui.tuningComboBox->setEnabled(!advancedEnabled);
-  ui.profileComboBox->setEnabled(!advancedEnabled);
-  ui.comboBoxBitDepth->setEnabled(advancedEnabled);
-  ui.tabAdvancedRC->setEnabled(advancedEnabled);
-  ui.tabMotion->setEnabled(advancedEnabled);
-  ui.tabFrame->setEnabled(advancedEnabled);
-  ui.tabAnalysis->setEnabled(advancedEnabled);
-  ui.tabQuantiser->setEnabled(advancedEnabled);
-  return true;
+    ui.useAdvancedConfigurationCheckBox->setChecked(advancedEnabled);
+#define SIMPLE(x) ui.x->setEnabled(!advancedEnabled);
+#define ADVANCED(x) ui.x->setEnabled(advancedEnabled);
+    SIMPLE(presetComboBox)
+    SIMPLE(tuningComboBox)
+    SIMPLE(profileComboBox)
+    ADVANCED(tabAdvancedRC)
+    ADVANCED(tabMotion)
+#ifdef SIMPLE_MODE_EX
+    ADVANCED(loopFilterCheckBox)
+    ADVANCED(maxRefFramesLabel)
+    ADVANCED(refFramesSpinBox)
+    ADVANCED(refLimitLabel)
+    ADVANCED(limitRefCUCheckBox)
+    ADVANCED(limitRefDepthCheckBox)
+    ADVANCED(groupBoxBframes)
+#else
+    ADVANCED(comboBoxBitDepth)
+    ADVANCED(tabFrame)
+#endif
+    ADVANCED(tabAnalysis)
+    ADVANCED(tabQuantiser)
+
+    return true;
 }
 
 /**
 
 */
-#define MK_CHECKBOX(x,y) ui.x->setChecked(myCopy.y)
-#define MK_UINT(x,y)  ui.x->setValue(myCopy.y)
+#define MK_CHECKBOX(x,y) ui.x->setChecked(myCopy.y);
+#define MK_UINT(x,y) ui.x->setValue(myCopy.y);
 #define DISABLE(x) ui.x->setEnabled(false);
-#define MK_MENU(x,y) ui.x->setCurrentIndex(myCopy.y)
+#define MK_MENU(x,y) ui.x->setCurrentIndex(myCopy.y);
 #define MK_RADIOBUTTON(x) ui.x->setChecked(true);
 #define MK_COMBOBOX_STR(x,y) \
     { \
         const int idx = ui.x->findText(myCopy.y.c_str()); \
         ui.x->setCurrentIndex(idx < 0 ? 0 : idx); \
     }
-#define MK_COMBOBOX_DATA(x,y) ui.x->setCurrentIndex(ui.x->findData(myCopy.y))
+#define MK_COMBOBOX_DATA(x,y) ui.x->setCurrentIndex(ui.x->findData(myCopy.y));
 
 bool x265Dialog::upload(void)
 {
-          toogleAdvancedConfiguration(myCopy.useAdvancedConfiguration);
-          MK_CHECKBOX(fastPSkipCheckBox,fast_pskip);
-          MK_CHECKBOX(weightedPredictCheckBox,weighted_bipred);
-          MK_CHECKBOX(rectInterCheckBox,rect_inter);
-          MK_CHECKBOX(AMPInterCheckBox,amp_inter);
-          MK_CHECKBOX(limitInterModesCheckBox,limit_modes);
-          MK_UINT(rdoSpinBox,rd_level);
-          MK_UINT(psychoRdoSpinBox,psy_rd);
-          MK_UINT(rdoqSpinBox,rdoq_level);
-          MK_UINT(psychoRdoqSpinBox,psy_rdoq); /* double, not uint, but setValue() is the same */
-
-          if (myCopy.interlaced_mode > 0) {
-        	  ui.interlacedCheckBox->setChecked(true);
-                  ui.interlacedComboBox->setCurrentIndex(myCopy.interlaced_mode - 1);
-          } else {
-        	  ui.interlacedCheckBox->setChecked(false);
-          }
-    
-          MK_CHECKBOX(dctDecimateCheckBox,dct_decimate);
-
-          MK_UINT(maxBFramesSpinBox,MaxBFrame);
-          MK_UINT(refFramesSpinBox,MaxRefFrames);
-          MK_CHECKBOX(limitRefDepthCheckBox,limit_refs & X265_REF_LIMIT_DEPTH);
-          MK_CHECKBOX(limitRefCUCheckBox,limit_refs & X265_REF_LIMIT_CU);
-          MK_UINT(minGopSizeSpinBox,MinIdr);
-          MK_UINT(maxGopSizeSpinBox,MaxIdr);
-          MK_UINT(IFrameThresholdSpinBox,i_scenecut_threshold);
-          MK_UINT(meSpinBox,subpel_refine);
-
-          MK_UINT(quantiserMaxStepSpinBox,ratecontrol.qp_step);
-          MK_UINT(quantiserIpRatioSpinBox,ratecontrol.ip_factor);
-          MK_UINT(quantiserPbRatioSpinBox,ratecontrol.pb_factor);
-          MK_UINT(cbChromaLumaOffsetSpinBox,cb_chroma_offset);
-          MK_UINT(crChromaLumaOffsetSpinBox,cr_chroma_offset);
-          uint32_t aq_mode = myCopy.ratecontrol.aq_mode;
-          if (aq_mode > 0)
-          {
-                ui.aqVarianceCheckBox->setChecked(true);
-                ui.aqAlgoComboBox->setCurrentIndex(aq_mode-1);
-                MK_UINT(aqStrengthSpinBox,ratecontrol.aq_strength);
-          }
-
-          MK_UINT(lookaheadSpinBox,lookahead);
-          MK_CHECKBOX(cuTreeCheckBox,ratecontrol.cu_tree);
-
-          MK_CHECKBOX(loopFilterCheckBox,b_deblocking_filter);
-          MK_CHECKBOX(openGopCheckBox,b_open_gop);
-
-          MK_MENU(meMethodComboBox,me_method);
-          MK_MENU(weightedPPredictComboBox,weighted_pred);
-          MK_MENU(bFrameRefComboBox,i_bframe_pyramid);
-          MK_MENU(adaptiveBFrameComboBox,i_bframe_adaptive);
-          MK_CHECKBOX(constrainedIntraCheckBox,constrained_intra);
-          MK_CHECKBOX(bIntraCheckBox,b_intra);
-
-          MK_UINT(mvRangeSpinBox,me_range);
-
-          // preset
-          MK_COMBOBOX_STR(presetComboBox, general.preset);
-          MK_COMBOBOX_STR(profileComboBox, general.profile);
-          MK_COMBOBOX_STR(tuningComboBox, general.tuning);
-
-        // udate idc
-        MK_COMBOBOX_DATA(idcLevelComboBox, level);
-
-        // update threads
+    toogleAdvancedConfiguration(myCopy.useAdvancedConfiguration);
+
+    MK_CHECKBOX(fastPSkipCheckBox,fast_pskip)
+    MK_CHECKBOX(weightedPredictCheckBox,weighted_bipred)
+    MK_CHECKBOX(rectInterCheckBox,rect_inter)
+    MK_CHECKBOX(AMPInterCheckBox,amp_inter)
+    MK_CHECKBOX(limitInterModesCheckBox,limit_modes)
+
+    MK_UINT(rdoSpinBox,rd_level)
+    MK_UINT(psychoRdoSpinBox,psy_rd)
+    MK_UINT(rdoqSpinBox,rdoq_level)
+    MK_UINT(psychoRdoqSpinBox,psy_rdoq) /* double, not uint, but setValue() is the same */
+
+    if (myCopy.interlaced_mode > 0) {
+        ui.interlacedCheckBox->setChecked(true);
+        ui.interlacedComboBox->setCurrentIndex(myCopy.interlaced_mode - 1);
+    } else {
+        ui.interlacedCheckBox->setChecked(false);
+    }
+
+    MK_CHECKBOX(dctDecimateCheckBox,dct_decimate)
+
+    MK_UINT(maxBFramesSpinBox,MaxBFrame)
+    MK_UINT(refFramesSpinBox,MaxRefFrames)
+
+    MK_CHECKBOX(limitRefDepthCheckBox,limit_refs & X265_REF_LIMIT_DEPTH)
+    MK_CHECKBOX(limitRefCUCheckBox,limit_refs & X265_REF_LIMIT_CU)
+
+    MK_UINT(minGopSizeSpinBox,MinIdr)
+    MK_UINT(maxGopSizeSpinBox,MaxIdr)
+    MK_UINT(IFrameThresholdSpinBox,i_scenecut_threshold)
+    MK_UINT(meSpinBox,subpel_refine)
+
+    MK_UINT(quantiserMaxStepSpinBox,ratecontrol.qp_step)
+    MK_UINT(quantiserIpRatioSpinBox,ratecontrol.ip_factor)
+    MK_UINT(quantiserPbRatioSpinBox,ratecontrol.pb_factor)
+    MK_UINT(cbChromaLumaOffsetSpinBox,cb_chroma_offset)
+    MK_UINT(crChromaLumaOffsetSpinBox,cr_chroma_offset)
+
+    uint32_t aq_mode = myCopy.ratecontrol.aq_mode;
+    if (aq_mode > 0)
+    {
+        ui.aqVarianceCheckBox->setChecked(true);
+        ui.aqAlgoComboBox->setCurrentIndex(aq_mode-1);
+        MK_UINT(aqStrengthSpinBox,ratecontrol.aq_strength)
+    }
+
+    MK_UINT(lookaheadSpinBox,lookahead)
+    MK_CHECKBOX(cuTreeCheckBox,ratecontrol.cu_tree)
+
+    MK_CHECKBOX(loopFilterCheckBox,b_deblocking_filter)
+    MK_CHECKBOX(openGopCheckBox,b_open_gop)
+
+    MK_MENU(meMethodComboBox,me_method)
+    MK_MENU(weightedPPredictComboBox,weighted_pred)
+    MK_MENU(bFrameRefComboBox,i_bframe_pyramid)
+    MK_MENU(adaptiveBFrameComboBox,i_bframe_adaptive)
+    MK_CHECKBOX(constrainedIntraCheckBox,constrained_intra)
+    MK_CHECKBOX(bIntraCheckBox,b_intra)
+
+    MK_UINT(mvRangeSpinBox,me_range)
+
+    // preset
+    MK_COMBOBOX_STR(presetComboBox, general.preset)
+    MK_COMBOBOX_STR(profileComboBox, general.profile)
+    MK_COMBOBOX_STR(tuningComboBox, general.tuning)
+
+    // udate idc
+    MK_COMBOBOX_DATA(idcLevelComboBox, level)
+
+    // update threads
 #if X265_BUILD >= 47
-        DISABLE(comboBoxPoolThreads);
+    DISABLE(comboBoxPoolThreads)
 #else
-        MK_COMBOBOX_DATA(comboBoxPoolThreads, general.poolThreads);
+    MK_COMBOBOX_DATA(comboBoxPoolThreads, general.poolThreads)
 #endif
-          
-        /* both 0 and 99 mean auto? */
-        const unsigned int framethreads = myCopy.general.frameThreads == 99 ? 0 : myCopy.general.frameThreads;
-        ui.comboBoxFrameThreads->setCurrentIndex(ui.comboBoxFrameThreads->findData(framethreads));
-
-        // update bit depth
-        QComboBox *bdc=ui.comboBoxBitDepth;
-        int i = bdc->findData(myCopy.general.output_bit_depth);
-        if(i == -1) /* Not found.  Maybe saved project and depth is not supported anymore?  Use default. */
-        {
-            ADM_warning("X265 output bit depth %u not supported, using default\n", myCopy.general.output_bit_depth);
-            i = 0;
-        }
-        bdc->setCurrentIndex(i);
+    /* both 0 and 99 mean auto? */
+    const unsigned int framethreads = myCopy.general.frameThreads == 99 ? 0 : myCopy.general.frameThreads;
+    ui.comboBoxFrameThreads->setCurrentIndex(ui.comboBoxFrameThreads->findData(framethreads));
+
+    // update bit depth
+    QComboBox *bdc=ui.comboBoxBitDepth;
+    int i = bdc->findData(myCopy.general.output_bit_depth);
+    if(i == -1) /* Not found.  Maybe saved project and depth is not supported anymore?  Use default. */
+    {
+        ADM_warning("X265 output bit depth %u not supported, using default\n", myCopy.general.output_bit_depth);
+        i = 0;
+    }
+    bdc->setCurrentIndex(i);
 
-        switch(ENCODING(mode))
-        {
-            case COMPRESS_AQ: // CRF
-                            ui.encodingModeComboBox->setCurrentIndex(2);
-                            ui.quantiserSpinBox->setValue(ENCODING(qz));
-                            break;
-            case COMPRESS_CBR:
-                            ui.encodingModeComboBox->setCurrentIndex(0);
-                            ui.targetRateControlSpinBox->setValue(ENCODING(bitrate));
-                            break;
-            case COMPRESS_2PASS:
-                            ui.encodingModeComboBox->setCurrentIndex(3);
-                            ui.targetRateControlSpinBox->setValue(ENCODING(finalsize));
-                            break;
-            case COMPRESS_SAME:
-                            ADM_assert(0);
-                            break;
-            case COMPRESS_2PASS_BITRATE:
-                            ui.encodingModeComboBox->setCurrentIndex(4);
-                            ui.targetRateControlSpinBox->setValue(ENCODING(avg_bitrate));
-                            break;
-
-            case COMPRESS_CQ:
-                            ui.encodingModeComboBox->setCurrentIndex(1);
-                            //encodingModeComboBox_currentIndexChanged(1);
-                            ui.quantiserSpinBox->setValue(ENCODING(qz));
-                            break;
-
-            default: ADM_assert(0);break;
-        }
+    switch(ENCODING(mode))
+    {
+        case COMPRESS_AQ: // CRF
+            ui.encodingModeComboBox->setCurrentIndex(2);
+            ui.quantiserSpinBox->setValue(ENCODING(qz));
+            break;
+        case COMPRESS_CBR:
+            ui.encodingModeComboBox->setCurrentIndex(0);
+            ui.targetRateControlSpinBox->setValue(ENCODING(bitrate));
+            break;
+        case COMPRESS_2PASS:
+            ui.encodingModeComboBox->setCurrentIndex(3);
+            ui.targetRateControlSpinBox->setValue(ENCODING(finalsize));
+            break;
+        case COMPRESS_SAME:
+            ADM_assert(0);
+            break;
+        case COMPRESS_2PASS_BITRATE:
+            ui.encodingModeComboBox->setCurrentIndex(4);
+            ui.targetRateControlSpinBox->setValue(ENCODING(avg_bitrate));
+            break;
+        case COMPRESS_CQ:
+            ui.encodingModeComboBox->setCurrentIndex(1);
+            //encodingModeComboBox_currentIndexChanged(1);
+            ui.quantiserSpinBox->setValue(ENCODING(qz));
+            break;
+
+        default: ADM_assert(0);break;
+    }
 
     if (myCopy.vui.sar_idc == 0)
     {
-        MK_RADIOBUTTON(sarUnspecifiedRadioButton);
+        MK_RADIOBUTTON(sarUnspecifiedRadioButton)
     } else if (myCopy.vui.sar_idc == X265_EXTENDED_SAR)
     {
-        MK_RADIOBUTTON(sarCustomRadioButton);
-        MK_UINT(sarCustomSpinBox1,vui.sar_width);
-        MK_UINT(sarCustomSpinBox2,vui.sar_height);
+        MK_RADIOBUTTON(sarCustomRadioButton)
+        MK_UINT(sarCustomSpinBox1,vui.sar_width)
+        MK_UINT(sarCustomSpinBox2,vui.sar_height)
     } else
     {
-        MK_RADIOBUTTON(sarPredefinedRadioButton);
-        MK_COMBOBOX_DATA(sarPredefinedComboBox,vui.sar_idc);
+        MK_RADIOBUTTON(sarPredefinedRadioButton)
+        MK_COMBOBOX_DATA(sarPredefinedComboBox,vui.sar_idc)
     }
 
-    MK_UINT(noiseReductionIntraSpinBox,noise_reduction_intra);
-    MK_UINT(noiseReductionInterSpinBox,noise_reduction_inter);
+    MK_UINT(noiseReductionIntraSpinBox,noise_reduction_intra)
+    MK_UINT(noiseReductionInterSpinBox,noise_reduction_inter)
 
-    MK_CHECKBOX(strongIntraSmoothingCheckBox,strong_intra_smoothing);
+    MK_CHECKBOX(strongIntraSmoothingCheckBox,strong_intra_smoothing)
 
-    MK_CHECKBOX(strictCbrCheckBox,ratecontrol.strict_cbr);
+    MK_CHECKBOX(strictCbrCheckBox,ratecontrol.strict_cbr)
 
     /* VUI */
-    MK_COMBOBOX_DATA(colourPrimariesComboBox,vui.color_primaries);
-    MK_COMBOBOX_DATA(transferCharacteristicsComboBox,vui.transfer_characteristics);
-    MK_COMBOBOX_DATA(colourMatrixComboBox,vui.matrix_coeffs);
-    DISABLE(tabOutput); /* These aren't implemented */
-    DISABLE(videoFormatComboBox);
-    DISABLE(sarAsInputRadioButton);
-
-          DISABLE(spsiComboBox);
-          DISABLE(groupBox_14); // quant matrix
-          DISABLE(tabAdvanced1);
-          DISABLE(tabAdvanced2);
-          DISABLE(maxCrfCheckBox);
-          DISABLE(groupBox_3);
-          return true;
+    MK_COMBOBOX_DATA(colourPrimariesComboBox,vui.color_primaries)
+    MK_COMBOBOX_DATA(transferCharacteristicsComboBox,vui.transfer_characteristics)
+    MK_COMBOBOX_DATA(colourMatrixComboBox,vui.matrix_coeffs)
+    DISABLE(tabOutput) /* These aren't implemented */
+    DISABLE(videoFormatComboBox)
+    DISABLE(sarAsInputRadioButton)
+
+    DISABLE(spsiComboBox)
+    DISABLE(groupBoxQuantMatrix)
+    DISABLE(tabAdvanced1)
+    DISABLE(tabAdvanced2)
+    DISABLE(maxCrfCheckBox)
+    DISABLE(groupBoxQuantCurveCompress)
+
+    return true;
 }
 #undef MK_CHECKBOX
 #undef MK_UINT
@@ -559,10 +576,10 @@
 #undef MK_RADIOBUTTON
 #undef MK_COMBOBOX_STR
 #undef MK_COMBOBOX_DATA
-#define MK_CHECKBOX(x,y)    myCopy.y=ui.x->isChecked()
-#define MK_UINT(x,y)        myCopy.y=ui.x->value()
-#define MK_MENU(x,y)        myCopy.y=ui.x->currentIndex()
-#define MK_RADIOBUTTON(x,y)   myCopy.y=ui.x->setChecked(true);
+#define MK_CHECKBOX(x,y)    myCopy.y=ui.x->isChecked();
+#define MK_UINT(x,y)        myCopy.y=ui.x->value();
+#define MK_MENU(x,y)        myCopy.y=ui.x->currentIndex();
+#define MK_RADIOBUTTON(x,y) myCopy.y=ui.x->setChecked(true);
 #define MK_COMBOBOX_STR(x,y,list,count,none) \
     { \
         const QComboBox* combo=ui.x; \
@@ -578,113 +595,114 @@
 
 bool x265Dialog::download(void)
 {
-          MK_CHECKBOX(useAdvancedConfigurationCheckBox,useAdvancedConfiguration);
-          MK_CHECKBOX(fastPSkipCheckBox,fast_pskip);
-          MK_CHECKBOX(weightedPredictCheckBox,weighted_bipred);
-          MK_CHECKBOX(rectInterCheckBox,rect_inter);
-          MK_CHECKBOX(AMPInterCheckBox,amp_inter);
-          MK_CHECKBOX(limitInterModesCheckBox,limit_modes);
-
-          if (ui.interlacedCheckBox->isChecked()) {
-                  myCopy.interlaced_mode = ui.interlacedComboBox->currentIndex() + 1;
-          } else {
-        	  myCopy.interlaced_mode = 0;
-          }
-    
-          MK_CHECKBOX(dctDecimateCheckBox,dct_decimate);
-
-          MK_UINT(maxBFramesSpinBox,MaxBFrame);
-          MK_UINT(refFramesSpinBox,MaxRefFrames);
-          myCopy.limit_refs = (ui.limitRefDepthCheckBox->isChecked() ? X265_REF_LIMIT_DEPTH : 0) |
-                              (ui.limitRefCUCheckBox->isChecked() ? X265_REF_LIMIT_CU : 0);
-          MK_UINT(minGopSizeSpinBox,MinIdr);
-          MK_UINT(maxGopSizeSpinBox,MaxIdr);
-          MK_UINT(IFrameThresholdSpinBox,i_scenecut_threshold);
-          MK_UINT(meSpinBox,subpel_refine);
-          MK_UINT(BFrameBiasSpinBox,i_bframe_bias);
-
-          MK_MENU(meMethodComboBox,me_method);
-          MK_MENU(weightedPPredictComboBox,weighted_pred);
-          MK_MENU(bFrameRefComboBox,i_bframe_pyramid);
-          MK_MENU(adaptiveBFrameComboBox,i_bframe_adaptive);
-          MK_CHECKBOX(constrainedIntraCheckBox,constrained_intra);
-          MK_CHECKBOX(bIntraCheckBox,b_intra);
-
-          MK_UINT(quantiserMaxStepSpinBox,ratecontrol.qp_step);
-          
-          MK_CHECKBOX(strictCbrCheckBox,ratecontrol.strict_cbr);
-          
-          MK_UINT(quantiserIpRatioSpinBox,ratecontrol.ip_factor);
-          MK_UINT(quantiserPbRatioSpinBox,ratecontrol.pb_factor);
-          MK_UINT(cbChromaLumaOffsetSpinBox,cb_chroma_offset);
-          MK_UINT(crChromaLumaOffsetSpinBox,cr_chroma_offset);
-          int a=ui.aqAlgoComboBox->currentIndex();
-          if(!ui.aqVarianceCheckBox->isChecked())
-          {
-                myCopy.ratecontrol.aq_mode=0;
-          }else
-          {
-                myCopy.ratecontrol.aq_mode=a+1;
-                MK_UINT(aqStrengthSpinBox,ratecontrol.aq_strength);
-          }
-          
-          MK_UINT(lookaheadSpinBox,lookahead);
-          MK_CHECKBOX(cuTreeCheckBox,ratecontrol.cu_tree);
-
-          MK_CHECKBOX(loopFilterCheckBox,b_deblocking_filter);
-          MK_CHECKBOX(openGopCheckBox,b_open_gop);
-
-          MK_UINT(mvRangeSpinBox,me_range);
-
-          MK_UINT(rdoSpinBox,rd_level);
-          MK_UINT(psychoRdoSpinBox,psy_rd);
-          MK_UINT(rdoqSpinBox,rdoq_level);
-          MK_UINT(psychoRdoqSpinBox,psy_rdoq); /* double, not uint, but value() is the same */
-          
-          MK_UINT(noiseReductionIntraSpinBox,noise_reduction_intra);
-          MK_UINT(noiseReductionInterSpinBox,noise_reduction_inter);
-
-          MK_CHECKBOX(strongIntraSmoothingCheckBox,strong_intra_smoothing);
-
-          MK_COMBOBOX_STR(presetComboBox, general.preset, listOfPresets, NB_PRESET, "");
-          MK_COMBOBOX_STR(profileComboBox, general.profile, listOfProfiles, NB_PROFILE, "");
-          MK_COMBOBOX_STR(tuningComboBox, general.tuning, listOfTunings, NB_TUNE, "none");
-
-          MK_COMBOBOX_DATA(idcLevelComboBox, level);
-          MK_COMBOBOX_DATA(comboBoxBitDepth, general.output_bit_depth);
-
-          switch(ui.encodingModeComboBox->currentIndex())
-          {
-            case 0: ENCODING(mode)=COMPRESS_CBR; ENCODING(bitrate)=ui.targetRateControlSpinBox->value();break;
-            case 1: ENCODING(mode)=COMPRESS_CQ;ENCODING(qz)=ui.quantiserSpinBox->value();break;
-            case 2: ENCODING(mode)=COMPRESS_AQ;ENCODING(qz)=ui.quantiserSpinBox->value();break;
-            case 3: ENCODING(mode)=COMPRESS_2PASS;ENCODING(finalsize)=ui.targetRateControlSpinBox->value();;break;
-            case 4: ENCODING(mode)=COMPRESS_2PASS_BITRATE;ENCODING(avg_bitrate)=ui.targetRateControlSpinBox->value();;break;
-          }
-          
+    MK_CHECKBOX(useAdvancedConfigurationCheckBox,useAdvancedConfiguration)
+    MK_CHECKBOX(fastPSkipCheckBox,fast_pskip)
+    MK_CHECKBOX(weightedPredictCheckBox,weighted_bipred)
+    MK_CHECKBOX(rectInterCheckBox,rect_inter)
+    MK_CHECKBOX(AMPInterCheckBox,amp_inter)
+    MK_CHECKBOX(limitInterModesCheckBox,limit_modes)
+
+    if (ui.interlacedCheckBox->isChecked()) {
+        myCopy.interlaced_mode = ui.interlacedComboBox->currentIndex() + 1;
+    } else {
+        myCopy.interlaced_mode = 0;
+    }
+
+    MK_CHECKBOX(dctDecimateCheckBox,dct_decimate)
+
+    MK_UINT(maxBFramesSpinBox,MaxBFrame)
+    MK_UINT(refFramesSpinBox,MaxRefFrames)
+    myCopy.limit_refs = (ui.limitRefDepthCheckBox->isChecked() ? X265_REF_LIMIT_DEPTH : 0) |
+                        (ui.limitRefCUCheckBox->isChecked() ? X265_REF_LIMIT_CU : 0);
+    MK_UINT(minGopSizeSpinBox,MinIdr)
+    MK_UINT(maxGopSizeSpinBox,MaxIdr)
+    MK_UINT(IFrameThresholdSpinBox,i_scenecut_threshold)
+    MK_UINT(meSpinBox,subpel_refine)
+    MK_UINT(BFrameBiasSpinBox,i_bframe_bias)
+
+    MK_MENU(meMethodComboBox,me_method)
+    MK_MENU(weightedPPredictComboBox,weighted_pred)
+    MK_MENU(bFrameRefComboBox,i_bframe_pyramid)
+    MK_MENU(adaptiveBFrameComboBox,i_bframe_adaptive)
+    MK_CHECKBOX(constrainedIntraCheckBox,constrained_intra)
+    MK_CHECKBOX(bIntraCheckBox,b_intra)
+
+    MK_UINT(quantiserMaxStepSpinBox,ratecontrol.qp_step)
+
+    MK_CHECKBOX(strictCbrCheckBox,ratecontrol.strict_cbr)
+
+    MK_UINT(quantiserIpRatioSpinBox,ratecontrol.ip_factor)
+    MK_UINT(quantiserPbRatioSpinBox,ratecontrol.pb_factor)
+    MK_UINT(cbChromaLumaOffsetSpinBox,cb_chroma_offset)
+    MK_UINT(crChromaLumaOffsetSpinBox,cr_chroma_offset)
+
+    int a=ui.aqAlgoComboBox->currentIndex();
+    if(!ui.aqVarianceCheckBox->isChecked())
+    {
+        myCopy.ratecontrol.aq_mode=0;
+    }else
+    {
+        myCopy.ratecontrol.aq_mode=a+1;
+        MK_UINT(aqStrengthSpinBox,ratecontrol.aq_strength)
+    }
+
+    MK_UINT(lookaheadSpinBox,lookahead)
+    MK_CHECKBOX(cuTreeCheckBox,ratecontrol.cu_tree)
+
+    MK_CHECKBOX(loopFilterCheckBox,b_deblocking_filter)
+    MK_CHECKBOX(openGopCheckBox,b_open_gop)
+
+    MK_UINT(mvRangeSpinBox,me_range)
+
+    MK_UINT(rdoSpinBox,rd_level)
+    MK_UINT(psychoRdoSpinBox,psy_rd)
+    MK_UINT(rdoqSpinBox,rdoq_level)
+    MK_UINT(psychoRdoqSpinBox,psy_rdoq) /* double, not uint, but value() is the same */
+
+    MK_UINT(noiseReductionIntraSpinBox,noise_reduction_intra)
+    MK_UINT(noiseReductionInterSpinBox,noise_reduction_inter)
+
+    MK_CHECKBOX(strongIntraSmoothingCheckBox,strong_intra_smoothing)
+
+    MK_COMBOBOX_STR(presetComboBox, general.preset, listOfPresets, NB_PRESET, "")
+    MK_COMBOBOX_STR(profileComboBox, general.profile, listOfProfiles, NB_PROFILE, "")
+    MK_COMBOBOX_STR(tuningComboBox, general.tuning, listOfTunings, NB_TUNE, "none")
+
+    MK_COMBOBOX_DATA(idcLevelComboBox, level)
+    MK_COMBOBOX_DATA(comboBoxBitDepth, general.output_bit_depth)
+
+    switch(ui.encodingModeComboBox->currentIndex())
+    {
+        case 0: ENCODING(mode)=COMPRESS_CBR; ENCODING(bitrate)=ui.targetRateControlSpinBox->value();break;
+        case 1: ENCODING(mode)=COMPRESS_CQ;ENCODING(qz)=ui.quantiserSpinBox->value();break;
+        case 2: ENCODING(mode)=COMPRESS_AQ;ENCODING(qz)=ui.quantiserSpinBox->value();break;
+        case 3: ENCODING(mode)=COMPRESS_2PASS;ENCODING(finalsize)=ui.targetRateControlSpinBox->value();;break;
+        case 4: ENCODING(mode)=COMPRESS_2PASS_BITRATE;ENCODING(avg_bitrate)=ui.targetRateControlSpinBox->value();;break;
+    }
+
 #if X265_BUILD < 47
-          MK_COMBOBOX_DATA(comboBoxPoolThreads, general.poolThreads);
+    MK_COMBOBOX_DATA(comboBoxPoolThreads, general.poolThreads)
 #endif
-          MK_COMBOBOX_DATA(comboBoxFrameThreads, general.frameThreads);
-
-          if(ui.sarUnspecifiedRadioButton->isChecked())
-          {
-              myCopy.vui.sar_idc = 0;
-          }else if(ui.sarCustomRadioButton->isChecked())
-          {
-              myCopy.vui.sar_idc = X265_EXTENDED_SAR;
-              MK_UINT(sarCustomSpinBox1,vui.sar_width);
-              MK_UINT(sarCustomSpinBox2,vui.sar_height);
-          }else
-          {
-              MK_COMBOBOX_DATA(sarPredefinedComboBox,vui.sar_idc);
-          }
-
-          MK_COMBOBOX_DATA(colourPrimariesComboBox, vui.color_primaries);
-          MK_COMBOBOX_DATA(transferCharacteristicsComboBox, vui.transfer_characteristics);
-          MK_COMBOBOX_DATA(colourMatrixComboBox, vui.matrix_coeffs);
-
-          return true;
+    MK_COMBOBOX_DATA(comboBoxFrameThreads, general.frameThreads)
+
+    if(ui.sarUnspecifiedRadioButton->isChecked())
+    {
+        myCopy.vui.sar_idc = 0;
+    }else if(ui.sarCustomRadioButton->isChecked())
+    {
+        myCopy.vui.sar_idc = X265_EXTENDED_SAR;
+        MK_UINT(sarCustomSpinBox1,vui.sar_width)
+        MK_UINT(sarCustomSpinBox2,vui.sar_height)
+    }else
+    {
+        MK_COMBOBOX_DATA(sarPredefinedComboBox,vui.sar_idc)
+    }
+
+    MK_COMBOBOX_DATA(colourPrimariesComboBox, vui.color_primaries)
+    MK_COMBOBOX_DATA(transferCharacteristicsComboBox, vui.transfer_characteristics)
+    MK_COMBOBOX_DATA(colourMatrixComboBox, vui.matrix_coeffs)
+
+    return true;
 }
 
 // General tab
@@ -777,7 +795,7 @@
 void x265Dialog::refFramesSpinBox_valueChanged(int value)
 {
     // Limiting reference frames doesn't have an effect when they are already limited to 1
-    const bool enable = value > 1;
+    const bool enable = value > 1 && ui.useAdvancedConfigurationCheckBox->isChecked();
     ui.limitRefDepthCheckBox->setEnabled(enable);
     ui.limitRefCUCheckBox->setEnabled(enable);
 }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/x265/qt4/x265ConfigDialog.ui Changed

@@ -12,7 +12,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>x265 Configuraton</string>
+   <string>x265 Configuration</string>
   </property>
   <layout class="QVBoxLayout" name="_11">
    <item>
@@ -1377,7 +1377,7 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="label_30">
+             <widget class="QLabel" name="maxRefFramesLabel">
               <property name="text">
                <string>Maximum Reference Frames:</string>
               </property>
@@ -1411,7 +1411,7 @@
              </layout>
             </item>
             <item>
-             <widget class="QLabel" name="label_56">
+             <widget class="QLabel" name="refLimitLabel">
               <property name="text">
                <string>Limit References by:</string>
               </property>
@@ -1437,7 +1437,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_9">
+        <widget class="QGroupBox" name="groupBoxBframes">
          <property name="title">
           <string>B-frames</string>
          </property>
@@ -1995,7 +1995,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_14">
+        <widget class="QGroupBox" name="groupBoxQuantMatrix">
          <property name="title">
           <string>Quantisation Matrix</string>
          </property>
@@ -2276,7 +2276,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_3">
+        <widget class="QGroupBox" name="groupBoxQuantCurveCompress">
          <property name="title">
           <string>Quantiser Curve Compression</string>
          </property>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp Changed

@@ -26,54 +26,54 @@
 */
 extern xvid4_encoder xvid4Settings;
 bool         xvid4Configure(void)
-{         
+{
 
 diaMenuEntry meE[]={
-  {0,QT_TRANSLATE_NOOP("xvid4","None")},
-  {1,QT_TRANSLATE_NOOP("xvid4","Low")},
-  {2,QT_TRANSLATE_NOOP("xvid4","Medium")},
-  {3,QT_TRANSLATE_NOOP("xvid4","Full")}
-};       
+  {0,QT_TRANSLATE_NOOP("xvid4","None"),NULL},
+  {1,QT_TRANSLATE_NOOP("xvid4","Low"),NULL},
+  {2,QT_TRANSLATE_NOOP("xvid4","Medium"),NULL},
+  {3,QT_TRANSLATE_NOOP("xvid4","Full"),NULL}
+};
 
 diaMenuEntry qzE[]={
-  {0,QT_TRANSLATE_NOOP("xvid4","H.263")},
-  {1,QT_TRANSLATE_NOOP("xvid4","MPEG")},
-  {2,QT_TRANSLATE_NOOP("xvid4","Custom")}
-};      
+  {0,QT_TRANSLATE_NOOP("xvid4","H.263"),NULL},
+  {1,QT_TRANSLATE_NOOP("xvid4","MPEG"),NULL},
+  {2,QT_TRANSLATE_NOOP("xvid4","Custom"),NULL}
+};
 diaMenuEntry profileE[]={
-{ XVID_PROFILE_S_L0  ,"Simple Level0"},
-{ XVID_PROFILE_S_L1  ,"Simple Level1"},
-{ XVID_PROFILE_S_L2  ,"Simple Level2"},
-{ XVID_PROFILE_S_L3  ,"Simple Level3"},
-{ XVID_PROFILE_AS_L0 ,"Adv. Simple Level0"},
-{ XVID_PROFILE_AS_L1 ,"Adv. Simple Level1"},
-{ XVID_PROFILE_AS_L2 ,"Adv. Simple Level2"},
-{ XVID_PROFILE_AS_L3 ,"Adv. Simple Level3"},
-{ XVID_PROFILE_AS_L4 ,"Adv. Simple Level4"},
-}; 
+  { XVID_PROFILE_S_L0  ,"Simple Level0", NULL},
+  { XVID_PROFILE_S_L1  ,"Simple Level1", NULL},
+  { XVID_PROFILE_S_L2  ,"Simple Level2", NULL},
+  { XVID_PROFILE_S_L3  ,"Simple Level3", NULL},
+  { XVID_PROFILE_AS_L0 ,"Adv. Simple Level0", NULL},
+  { XVID_PROFILE_AS_L1 ,"Adv. Simple Level1", NULL},
+  { XVID_PROFILE_AS_L2 ,"Adv. Simple Level2", NULL},
+  { XVID_PROFILE_AS_L3 ,"Adv. Simple Level3", NULL},
+  { XVID_PROFILE_AS_L4 ,"Adv. Simple Level4", NULL}
+};
 
 diaMenuEntry rdE[]={
-  {0,QT_TRANSLATE_NOOP("xvid4","None")},
-  {1,QT_TRANSLATE_NOOP("xvid4","DCT")},
-  {2,QT_TRANSLATE_NOOP("xvid4","Qpel16")},
-  {3,QT_TRANSLATE_NOOP("xvid4","Qpel8")},
-  {4,QT_TRANSLATE_NOOP("xvid4","Square")}
-};    
+  {0,QT_TRANSLATE_NOOP("xvid4","None"),NULL},
+  {1,QT_TRANSLATE_NOOP("xvid4","DCT"),NULL},
+  {2,QT_TRANSLATE_NOOP("xvid4","Qpel16"),NULL},
+  {3,QT_TRANSLATE_NOOP("xvid4","Qpel8"),NULL},
+  {4,QT_TRANSLATE_NOOP("xvid4","Square"),NULL}
+};
 
 diaMenuEntry threads[]={
-  {1,QT_TRANSLATE_NOOP("xvid4","One thread")},
-  {2,QT_TRANSLATE_NOOP("xvid4","Two threads)")},
-  {3,QT_TRANSLATE_NOOP("xvid4","Three threads")},
-  {99,QT_TRANSLATE_NOOP("xvid4","Auto (#cpu)")}
-};  
+  {1,QT_TRANSLATE_NOOP("xvid4","One thread"),NULL},
+  {2,QT_TRANSLATE_NOOP("xvid4","Two threads"),NULL},
+  {3,QT_TRANSLATE_NOOP("xvid4","Three threads"),NULL},
+  {99,QT_TRANSLATE_NOOP("xvid4","Auto (#cpu)"),NULL}
+};
 
 diaMenuEntry arModeE[]={
-  {XVID_PAR_11_VGA,QT_TRANSLATE_NOOP("xvid4","1:1 (PC)")},
-  {XVID_PAR_43_PAL,QT_TRANSLATE_NOOP("xvid4","4:3 (PAL)")},
-  {XVID_PAR_43_NTSC,QT_TRANSLATE_NOOP("xvid4","4:3 (NTSC)")},
-  {XVID_PAR_169_PAL,QT_TRANSLATE_NOOP("xvid4","16:9 (PAL)")},
-  {XVID_PAR_169_NTSC,QT_TRANSLATE_NOOP("xvid4","16:9 (NTSC)")},
-};  
+  {XVID_PAR_11_VGA,QT_TRANSLATE_NOOP("xvid4","1:1 (PC)"),NULL},
+  {XVID_PAR_43_PAL,QT_TRANSLATE_NOOP("xvid4","4:3 (PAL)"),NULL},
+  {XVID_PAR_43_NTSC,QT_TRANSLATE_NOOP("xvid4","4:3 (NTSC)"),NULL},
+  {XVID_PAR_169_PAL,QT_TRANSLATE_NOOP("xvid4","16:9 (PAL)"),NULL},
+  {XVID_PAR_169_NTSC,QT_TRANSLATE_NOOP("xvid4","16:9 (NTSC)"),NULL}
+};
 
 
 #define PX(x) &(xvid4Settings.x)

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters/Animated/ADM_vidAnimated.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters/Animated/ADM_vidAnimated.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

@@ -7,18 +7,23 @@
 ADD_SUBDIRECTORY(asciiView)
 ADD_SUBDIRECTORY(addBorder)
 ADD_SUBDIRECTORY(admIvtc)
+ADD_SUBDIRECTORY(analyzer)
 ADD_SUBDIRECTORY(asharp)
 ADD_SUBDIRECTORY(ass)
 ADD_SUBDIRECTORY(avsfilter)
 ADD_SUBDIRECTORY(black)
 ADD_SUBDIRECTORY(blackenBorder)
 ADD_SUBDIRECTORY(blend)
+ADD_SUBDIRECTORY(blur)
 ADD_SUBDIRECTORY(changeFps)
+ADD_SUBDIRECTORY(colorBalance)
+ADD_SUBDIRECTORY(colorTemp)
 ADD_SUBDIRECTORY(colorYUV)
 ADD_SUBDIRECTORY(contrast)
 ADD_SUBDIRECTORY(chromaShift)
 ADD_SUBDIRECTORY(crop)
 #ADD_SUBDIRECTORY(decimate)
+ADD_SUBDIRECTORY(delogoHQ)
 ADD_SUBDIRECTORY(dgBob)
 ADD_SUBDIRECTORY(dummy)
 ADD_SUBDIRECTORY(eq2)
@@ -26,7 +31,8 @@
 ADD_SUBDIRECTORY(fadeTo)
 ADD_SUBDIRECTORY(fastConvolution)
 ADD_SUBDIRECTORY(fields)
-ADD_SUBDIRECTORY(horizontalFlip)
+ADD_SUBDIRECTORY(fitToSize)
+#ADD_SUBDIRECTORY(horizontalFlip)
 ADD_SUBDIRECTORY(hue)
 ADD_SUBDIRECTORY(ivtcDupeRemover)
 ADD_SUBDIRECTORY(kernelDeint)
@@ -34,6 +40,7 @@
 ADD_SUBDIRECTORY(lavDeint)
 ADD_SUBDIRECTORY(logo)
 ADD_SUBDIRECTORY(lumaOnly)
+ADD_SUBDIRECTORY(lumaStab)
 #ADD_SUBDIRECTORY(mcDeint) Does not work ???
 ADD_SUBDIRECTORY(mplayerDenoise3D)
 ADD_SUBDIRECTORY(mplayerDelogo)
@@ -52,10 +59,26 @@
         ADD_SUBDIRECTORY(vaapiFilters)
 ENDIF(USE_LIBVA AND DO_COMMON)
 ADD_SUBDIRECTORY(vdpauFilters)
-ADD_SUBDIRECTORY(verticalFlip)
+#ADD_SUBDIRECTORY(verticalFlip)
+ADD_SUBDIRECTORY(waveletDenoise)
+ADD_SUBDIRECTORY(waveletSharp)
+ADD_SUBDIRECTORY(artCartoon)
+ADD_SUBDIRECTORY(artCharcoal)
+ADD_SUBDIRECTORY(artChromaHold)
+ADD_SUBDIRECTORY(artChromaKey)
 ADD_SUBDIRECTORY(artColorEffect)
-ADD_SUBDIRECTORY(artVignette)
+ADD_SUBDIRECTORY(artDynThreshold)
+ADD_SUBDIRECTORY(artGrid)
+ADD_SUBDIRECTORY(artMirror)
 ADD_SUBDIRECTORY(artPixelize)
+ADD_SUBDIRECTORY(artPosterize)
 ADD_SUBDIRECTORY(artVHS)
-ADD_SUBDIRECTORY(artCharcoal)
-ADD_SUBDIRECTORY(colorTemp)
+ADD_SUBDIRECTORY(artVignette)
+ADD_SUBDIRECTORY(flip)
+ADD_SUBDIRECTORY(quadTrans)
+ADD_SUBDIRECTORY(imageStab)
+ADD_SUBDIRECTORY(zoom)
+ADD_SUBDIRECTORY(fadeFromImage)
+#ADD_SUBDIRECTORY(fadeInOut)
+ADD_SUBDIRECTORY(fadeThrough)
+ADD_SUBDIRECTORY(deband)

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/admIvtc/ADM_admIvtc.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.cpp Added

@@ -0,0 +1,88 @@
+/***************************************************************************
+                          Analyzer filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "ADM_vidAnalyzer.h"
+
+
+extern uint8_t DIA_getAnalyzer(ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoAnalyzer,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoAnalyzer,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_COLORS,            // Category
+                                      "analyzer",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("analyzer","Analyzer"),            // Display name
+                                      QT_TRANSLATE_NOOP("analyzer","Null filter. Vectorscope, Waveform scopes and Histograms in Preview.") // Description
+                                  );
+
+/**
+    \fn configure
+*/
+bool ADMVideoAnalyzer::configure()
+{
+    return DIA_getAnalyzer(previousFilter);
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoAnalyzer::getConfiguration(void)
+{
+    return "Null filter";
+}
+/**
+    \fn ctor
+*/
+ADMVideoAnalyzer::ADMVideoAnalyzer(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    UNUSED_ARG(couples);
+}
+/**
+    \fn dtor
+*/
+ADMVideoAnalyzer::~ADMVideoAnalyzer()
+{
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoAnalyzer::getCoupledConf(CONFcouple **couples)
+{
+    *couples=new CONFcouple(0); // Even if we dont have configuration we must allocate one 
+    return true;
+}
+
+void ADMVideoAnalyzer::setCoupledConf(CONFcouple *couples)
+{
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoAnalyzer::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    return previousFilter->getNextFrame(fn,image);
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/ADM_vidAnalyzer.h Added

@@ -0,0 +1,32 @@
+/***************************************************************************
+                          Analyzer filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoAnalyzer
+*/
+class  ADMVideoAnalyzer:public ADM_coreVideoFilter
+{
+  public:
+    ADMVideoAnalyzer(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoAnalyzer();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/cli/DIA_analyzer.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/qt4/DIA_flyAnalyzer.cpp Added

@@ -0,0 +1,592 @@
+/***************************************************************************
+                          Analyzer filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyAnalyzer.h"
+#include "ADM_vidAnalyzer.h"
+#include <QImage>
+#include <QPixmap>
+#include <QColor>
+#include <cmath>
+
+#define FRAME_COLOR	(0xFF000000) //(0xFF7F7F7F)
+
+/************* COMMON PART *********************/
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+flyAnalyzer::flyAnalyzer (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider, QGraphicsScene * scVectorScope,
+                                    QGraphicsScene * scYUVparade, QGraphicsScene * scRGBparade, QGraphicsScene * scHistograms ) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    this->width = width;
+    this->height = height;
+    sceneVectorScope = scVectorScope;
+    wrkVectorScope = new uint32_t [256*256];
+    bufVectorScope = new uint32_t [620*600];
+    scaleVectorScope = new uint32_t [620*600];
+    imgVectorScope = new QImage((uchar *)bufVectorScope, 620, 600, 620*sizeof(uint32_t), QImage::Format_RGB32);
+    
+    for (int y=0; y<600; y++)
+    {
+        for (int x=0; x<620; x++)
+        {
+            double xc = x-(64.0+256.0);
+            double yc = y-(44.0+256.0);
+            double r = std::sqrt(xc*xc + yc*yc);
+            uint32_t c = 0;
+            if ((r <= 300.0) && (r >= 284.0))   // hue ring
+            {
+                xc *= 127.0/r;
+                yc *= 127.0/r;
+                yc *= -1.0;
+                r = (8.0-std::abs(r-292.0))/8.0;  // 0..1..0 triangle
+                r = std::sqrt(r); // nonlinearity
+                r *= 166;
+                if (r > 128.0)
+                    r = 128.0;
+                int rgb[3];
+                rgb[0] = std::round(r            +   1.4*yc);
+                rgb[1] = std::round(r - 0.343*xc - 0.711*yc);
+                rgb[2] = std::round(r + 1.765*xc           );
+                for (int i=0; i<3; i++)
+                {
+                    if (rgb[i] < 0) rgb[i] = 0;
+                    if (rgb[i] > 255) rgb[i] = 255;
+                }
+                c = (rgb[0]<<16) + (rgb[1]<<8) + rgb[2];
+            }
+            
+            for (int pri=1; pri<=6; pri++)
+            {
+                int rgb[3];
+                rgb[0] = (pri&1)? 1:0;
+                rgb[1] = (pri&2)? 1:0;
+                rgb[2] = (pri&4)? 1:0;
+                double u = 64 + 256 + 2*224.0*(-0.1146*rgb[0] + -0.3854*rgb[1] +  0.5   *rgb[2]);
+                double v = 44 + 256 - 2*224.0*( 0.5   *rgb[0] + -0.4542*rgb[1] + -0.0458*rgb[2]);
+                u = x-u;
+                v = y-v;
+                r = std::sqrt(u*u + v*v);
+                if ((r <= 16.1) && (r >= 13.3))
+                {
+                    c = 0;
+                    if (pri&1)
+                        c += 0xFF0000;
+                    if (pri&2)
+                        c += 0x00FF00;
+                    if (pri&4)
+                        c += 0x0000FF;
+                }
+            }
+            
+            scaleVectorScope[y*620+x] = c;
+        }
+    }
+
+    sceneYUVparade = scYUVparade;
+    for (int i=0; i<3; i++)
+        wrkYUVparade[i] = new uint32_t [256*256];
+    bufYUVparade = new uint32_t [772*258];
+    imgYUVparade = new QImage((uchar *)bufYUVparade, 772, 258, 772*sizeof(uint32_t), QImage::Format_RGB32);
+
+    sceneRGBparade = scRGBparade;
+    for (int i=0; i<3; i++)
+        wrkRGBparade[i] = new uint32_t [256*256];
+    bufRGBparade = new uint32_t [772*258];
+    imgRGBparade = new QImage((uchar *)bufRGBparade, 772, 258, 772*sizeof(uint32_t), QImage::Format_RGB32);
+
+    sceneHistograms = scHistograms;
+    for (int i=0; i<6; i++)
+        wrkHistograms[i] = new uint32_t [256];
+    bufHistograms = new uint32_t [772*259];
+    imgHistograms = new QImage((uchar *)bufHistograms, 772, 259, 772*sizeof(uint32_t), QImage::Format_RGB32);
+    
+    paradeIndex = new int [width];
+    for (int i=0; i<width; i++)
+    {
+        double fpos = i;
+        fpos /= width;
+        fpos *= 256.0;
+        paradeIndex[i] = fpos;
+        if (paradeIndex[i] > 255)
+            paradeIndex[i] = 255;
+    }
+    paradeIndexHalf = new int [width/2];
+    for (int i=0; i<width/2; i++)
+    {
+        double fpos = i;
+        fpos *= 2.0;
+        fpos /= width;
+        fpos *= 256.0;
+        paradeIndexHalf[i] = fpos;
+        if (paradeIndexHalf[i] > 255)
+            paradeIndexHalf[i] = 255;
+    }
+
+    rgbBufStride = ADM_IMAGE_ALIGN(width * 4);
+    rgbBufRaw = new ADM_byteBuffer();
+    rgbBufRaw->setSize(rgbBufStride * height);
+    convertYuvToRgb = new ADMColorScalerFull(ADM_CS_BILINEAR,width,height,width,height,ADM_PIXFRMT_YV12,ADM_PIXFRMT_RGB32A);
+}
+/**
+    \fn dtor
+*/
+flyAnalyzer::~flyAnalyzer()
+{
+    delete [] wrkVectorScope;
+    delete [] bufVectorScope;
+    delete [] scaleVectorScope;
+    delete imgVectorScope;
+    for (int i=0; i<3; i++)
+        delete [] wrkYUVparade[i];
+    delete [] bufYUVparade;
+    delete imgYUVparade;
+    for (int i=0; i<3; i++)
+        delete [] wrkRGBparade[i];
+    delete [] bufRGBparade;
+    delete imgRGBparade;
+    for (int i=0; i<6; i++)
+        delete [] wrkHistograms[i];
+    delete [] bufHistograms;
+    delete imgHistograms;
+    
+    delete [] paradeIndex;
+    delete [] paradeIndexHalf;
+
+    delete convertYuvToRgb;
+    rgbBufRaw->clean();
+    delete rgbBufRaw;
+}
+/**
+    \fn update
+*/
+uint8_t  flyAnalyzer::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyAnalyzer::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+    
+    // Make Y plane statistics
+    {
+        memset(wrkYUVparade[0],0,256*256*sizeof(uint32_t));
+        memset(wrkHistograms[0],0,256*sizeof(uint32_t));
+        uint8_t * yp=in->GetReadPtr(PLANAR_Y);
+        int stride=in->GetPitch(PLANAR_Y);
+        uint8_t * ptr;
+        int value;
+        
+        for (int y=0; y<height; y++)
+        {
+            ptr = yp + y*stride;
+            for (int x=0; x<width; x++)
+            {
+                value = *ptr++;
+                wrkHistograms[3][value]++;
+                wrkYUVparade[0][value*256 + paradeIndex[x]]++;
+            }
+        }
+    }
+
+    // Make U-V plane statistics
+    {
+        memset(wrkVectorScope,0,256*256*sizeof(uint32_t));
+        memset(wrkYUVparade[1],0,256*256*sizeof(uint32_t));
+        memset(wrkYUVparade[2],0,256*256*sizeof(uint32_t));
+        memset(wrkHistograms[4],0,256*sizeof(uint32_t));
+        memset(wrkHistograms[5],0,256*sizeof(uint32_t));
+        uint8_t * up=in->GetReadPtr(PLANAR_U);
+        uint8_t * vp=in->GetReadPtr(PLANAR_V);
+        int ustride=in->GetPitch(PLANAR_U);
+        int vstride=in->GetPitch(PLANAR_V);
+        uint8_t * uptr, * vptr;
+        int uvalue, vvalue;
+        int width=in->GetWidth(PLANAR_U); 
+        int height=in->GetHeight(PLANAR_U);
+        
+        for (int y=0; y<height; y++)
+        {
+            uptr = up + y*ustride;
+            vptr = vp + y*vstride;
+            for (int x=0; x<width; x++)
+            {
+                uvalue = *uptr++;
+                vvalue = *vptr++;
+                wrkHistograms[4][uvalue]+=4;    // num of chroma pixels are quarter of luma pixels
+                wrkHistograms[5][vvalue]+=4;
+                wrkYUVparade[1][uvalue*256 + paradeIndexHalf[x]]+=4;
+                wrkYUVparade[2][vvalue*256 + paradeIndexHalf[x]]+=4;
+                wrkVectorScope[vvalue*256 + uvalue]++;
+            }
+        }
+    }
+    
+    // Make RGB statistics
+    {
+        convertYuvToRgb->convertImage(in,rgbBufRaw->at(0));
+        memset(wrkRGBparade[0],0,256*256*sizeof(uint32_t));
+        memset(wrkRGBparade[1],0,256*256*sizeof(uint32_t));
+        memset(wrkRGBparade[2],0,256*256*sizeof(uint32_t));
+        memset(wrkHistograms[0],0,256*sizeof(uint32_t));
+        memset(wrkHistograms[1],0,256*sizeof(uint32_t));
+        memset(wrkHistograms[2],0,256*sizeof(uint32_t));
+        uint8_t * ptr;
+        int rvalue, gvalue, bvalue;
+ 
+        for (int y=0; y<height; y++)
+        {
+            ptr = rgbBufRaw->at(y*rgbBufStride);
+            for (int x=0; x<width; x++)
+            {
+                rvalue = *ptr++;
+                gvalue = *ptr++;
+                bvalue = *ptr++;
+                ptr++;
+                wrkHistograms[0][rvalue]++;
+                wrkHistograms[1][gvalue]++;
+                wrkHistograms[2][bvalue]++;
+                wrkRGBparade[0][rvalue*256 + paradeIndex[x]]++;
+                wrkRGBparade[1][gvalue*256 + paradeIndex[x]]++;
+                wrkRGBparade[2][bvalue*256 + paradeIndex[x]]++;
+            }
+        }
+    }
+    
+    // Normalize histograms to 0 .. 124
+    {
+        for (int csp=0; csp<2; csp++)
+        {
+            uint32_t max = 0;
+            for (int ch=0; ch<3; ch++)
+                for (int i=0; i<256; i++)
+                    if (max < wrkHistograms[csp*3+ch][i])
+                        max = wrkHistograms[csp*3+ch][i];
+            uint32_t norm = 2080374784ULL / max;    // 124 * 2<<24
+            for (int ch=0; ch<3; ch++)
+                for (int i=0; i<256; i++)
+                    wrkHistograms[csp*3+ch][i] = (wrkHistograms[csp*3+ch][i]*norm)>>24;
+        }
+    }
+    
+    // Normalize parades
+    {
+        uint32_t norm = 2147483648ULL/(width*height);
+        for (int ch=0; ch<3; ch++)
+            for (int i=0; i<256; i++)
+            {
+                wrkYUVparade[ch][i] = (wrkYUVparade[ch][i]*norm)>>8;
+                wrkRGBparade[ch][i] = (wrkRGBparade[ch][i]*norm)>>8;
+            }
+    }
+
+    // Normalize vectorscope
+    {
+        uint32_t norm = 1073741824ULL/(width*height);
+        for (int y=0; y<256; y++)
+            for (int x=0; x<256; x++)
+                wrkVectorScope[y*256 + x] = (wrkVectorScope[y*256 + x]*norm)>>8;
+    }
+
+    // Draw histograms
+    {
+        memset(bufHistograms, 0, 772*259*sizeof(uint32_t));
+        uint32_t q,color;
+
+        for (int csp=0; csp<2; csp++)
+        {
+            for (int ch=0; ch<3; ch++)
+            {
+                switch(ch+csp*3)
+                {
+                    case 0:    //R
+                            color = 0xFFFF0000;
+                        break;
+                    case 1:    //G
+                            color = 0xFF00FF00;
+                        break;
+                    case 2:    //B
+                            color = 0xFF0000FF;
+                        break;
+                    case 3:    //Y
+                            color = 0xFFFFFFFF;
+                        break;
+                    case 4:    //U
+                            color = 0xFF7F3FFF;
+                        break;
+                    case 5:    //V
+                            color = 0xFFFF3F7F;
+                        break;
+                }
+                for (int x=0; x<256; x++)
+                {
+                    q = wrkHistograms[csp*3+ch][x];
+                    for (int y=0; y<128;y++)
+                    {
+                        bufHistograms[(csp*129+y+1)*772+(ch*257+1)+x] = ((((127-y)-(int)q) > 0) ? 0xFF000000 : color);
+                    }
+                }
+            }
+        }
+
+        // add frame
+        for (int x=0; x<772; x++)
+        {
+            bufHistograms[772*0+x] = FRAME_COLOR;
+            bufHistograms[772*129+x] = FRAME_COLOR;
+            bufHistograms[772*258+x] = FRAME_COLOR;
+        }
+        for (int y=1; y<257; y++)
+        {
+            bufHistograms[772*y+0] = FRAME_COLOR;
+            bufHistograms[772*y+257] = FRAME_COLOR;
+            bufHistograms[772*y+514] = FRAME_COLOR;
+            bufHistograms[772*y+771] = FRAME_COLOR;
+        }
+
+        sceneHistograms->clear();
+        sceneHistograms->addPixmap( QPixmap::fromImage(*imgHistograms));
+    }
+    
+    // Draw YUV parade
+    {
+        uint32_t p,c;
+        // convert to color 0xffRRGGBB
+        for (int y=1; y<257; y++)
+        {
+            //Y
+            for (int x=1; x<257; x++)
+            {
+                p = wrkYUVparade[0][(256-y)*256 + x-1];
+                c = 0;
+                if (p)
+                {
+                    p /= 2;
+                    if (p >= 256)
+                        c = 0x00FFFFFF;
+                    else
+                        c = (p << 16) + (p << 8) + (p << 0);
+                }
+                bufYUVparade[772*y+x] = 0xFF000000 | c;
+            }
+            //U
+            for (int x=258; x<514; x++)
+            {
+                p = wrkYUVparade[1][(256-y)*256 + x-258];
+                c = 0;
+                if (p)
+                {
+                    if (p >= 1020)
+                        c = 0x00FFFFFF;
+                    else
+                    if (p >= 510)
+                        c = 0x00FF00FF + ((p/4) << 8);
+                    else
+                    if (p >= 256)
+                        c = 0x000000FF + ((p/2) << 16) + ((p/4) << 8);
+                    else
+                        c = ((p/2) << 16) + ((p/4) << 8) + (p << 0);
+                }
+                bufYUVparade[772*y+x] = 0xFF000000 | c;
+            }
+            //V
+            for (int x=515; x<771; x++)
+            {
+                p = wrkYUVparade[2][(256-y)*256 + x-515];
+                c = 0;
+                if (p)
+                {
+                    if (p >= 1020)
+                        c = 0x00FFFFFF;
+                    else
+                    if (p >= 510)
+                        c = 0x00FF00FF + ((p/4) << 8);
+                    else
+                    if (p >= 256)
+                        c = 0x00FF0000 + ((p/4) << 8) + ((p/2) << 0);
+                    else
+                        c = (p << 16) + ((p/4) << 8) + ((p/2) << 0);
+                }
+                bufYUVparade[772*y+x] = 0xFF000000 | c;
+            }
+        }
+
+        // add frame
+        for (int x=0; x<772; x++)
+        {
+            bufYUVparade[772*0+x] = FRAME_COLOR;
+            bufYUVparade[772*257+x] = FRAME_COLOR;
+        }
+        for (int y=1; y<257; y++)
+        {
+            bufYUVparade[772*y+0] = FRAME_COLOR;
+            bufYUVparade[772*y+257] = FRAME_COLOR;
+            bufYUVparade[772*y+514] = FRAME_COLOR;
+            bufYUVparade[772*y+771] = FRAME_COLOR;
+        }
+
+        sceneYUVparade->clear();
+        sceneYUVparade->addPixmap( QPixmap::fromImage(*imgYUVparade));
+    }
+    
+    // Draw RGB parade
+    {
+         uint32_t p,c;
+       // convert to color 0xffRRGGBB
+        for (int y=1; y<257; y++)
+        {
+            //R
+            for (int x=1; x<257; x++)
+            {
+                p = wrkRGBparade[0][(256-y)*256 + x-1];
+                if (p >= 765)
+                    c = 0x00FFFFFF;
+                else
+                if (p >= 256)
+                {
+                    p = (p-255)/2;
+                    c = 0x00FF0000 + (p<<8) + p;
+                } else
+                    c = p << 16;
+                bufRGBparade[772*y+x] = 0xFF000000 | c;
+            }
+            //G
+            for (int x=258; x<514; x++)
+            {
+                p =wrkRGBparade[1][(256-y)*256 + x-258];
+                if (p >= 765)
+                    c = 0x00FFFFFF;
+                else
+                if (p >= 256)
+                {
+                    p = (p-255)/2;
+                    c = 0x0000FF00 + (p<<16) + p;
+                } else
+                    c = p << 8;
+                bufRGBparade[772*y+x] = 0xFF000000 | c;
+            }
+            //B
+            for (int x=515; x<771; x++)
+            {
+                p = wrkRGBparade[2][(256-y)*256 + x-515];
+                if (p >= 765)
+                    c = 0x00FFFFFF;
+                else
+                if (p >= 256)
+                {
+                    p = (p-255)/2;
+                    c = 0x000000FF + (p<<16) + (p<<8);
+                } else
+                    c = p << 0;
+                bufRGBparade[772*y+x] = 0xFF000000 | c;
+            }
+        }
+
+        // add frame
+        for (int x=0; x<772; x++)
+        {
+            bufRGBparade[772*0+x] = FRAME_COLOR;
+            bufRGBparade[772*257+x] = FRAME_COLOR;
+        }
+        for (int y=1; y<257; y++)
+        {
+            bufRGBparade[772*y+0] = FRAME_COLOR;
+            bufRGBparade[772*y+257] = FRAME_COLOR;
+            bufRGBparade[772*y+514] = FRAME_COLOR;
+            bufRGBparade[772*y+771] = FRAME_COLOR;
+        }
+
+        sceneRGBparade->clear();
+        sceneRGBparade->addPixmap( QPixmap::fromImage(*imgRGBparade));
+    }
+    
+    // Draw vectorscope
+    {
+        uint32_t p,q,c;
+        uint8_t argb[4];
+        memset(bufVectorScope,0,620*600*sizeof(uint32_t));
+        
+        for (int y=0; y<256; y++)
+            for (int x=0; x<256; x++)
+                bufVectorScope[(2*y + 44)*620 + 2*x + 64] = wrkVectorScope[(255-y)*256+x];
+
+        // interpolate histogram
+        for (int y=44; y<(44+512); y+=2)
+        {
+            uint32_t * ptr = bufVectorScope+620*y;
+            for (int x=(64-1); x<(64+512+1); x+=2)
+            {
+                *(ptr+x) = ( (*(ptr+x-1)) + (*(ptr+x+1)) )/2;
+            }
+        }
+        for (int y=(44-1); y<(44+512+1); y+=2)
+        {
+            uint32_t * ptrm = bufVectorScope+620*(y-1);
+            uint32_t * ptr  = bufVectorScope+620*y;
+            uint32_t * ptrp = bufVectorScope+620*(y+1);
+            for (int x=64; x<(64+512); x+=1)
+            {
+                *(ptr+x) = ( (*(ptrm+x)) + (*(ptrp+x)) )/2;
+            }
+        }
+
+        // convert to color 0xffRRGGBB and apply scale
+        for (int i=0; i<620*600; i++)
+        {
+            p = bufVectorScope[i];
+            q = scaleVectorScope[i];
+            if (p)
+            {
+                if (p >= 765)
+                {
+                    c = 0x00FFFFFF;
+                } else
+                if (p >= 256)
+                {
+                    p = (p-255)/2;
+                    c = 0x0000FF00 + (p<<16) + p;
+                } else {
+                    c = p<<8;
+                }
+                
+                if (q)
+                {
+                    c = (c>>1) & 0x007F7F7F;
+                    q = (q>>1) & 0x007F7F7F;
+                    q += c;
+                }
+                else
+                    q = c;
+            }
+            bufVectorScope[i] = 0xFF000000 | q;
+        }
+
+        sceneVectorScope->clear();
+        sceneVectorScope->addPixmap( QPixmap::fromImage(*imgVectorScope));
+    }
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/qt4/DIA_flyAnalyzer.h Added

@@ -0,0 +1,62 @@
+/***************************************************************************
+                          Analyzer filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_Analyzer_H
+#define FLY_Analyzer_H
+#include <QGraphicsScene>
+#include <QImage>
+#include "ADM_default.h"
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+/**
+    \class flyAnalyzer
+*/
+class flyAnalyzer : public ADM_flyDialogYuv
+{
+  public:
+    QGraphicsScene * sceneVectorScope;
+    QGraphicsScene * sceneYUVparade;
+    QGraphicsScene * sceneRGBparade;
+    QGraphicsScene * sceneHistograms;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void) { return 1; }
+    uint8_t    upload(void) { return 1; }
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyAnalyzer (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider, QGraphicsScene * scVectorScope,
+                                    QGraphicsScene * scYUVparade, QGraphicsScene * scRGBparade, QGraphicsScene * scHistograms) ;
+    virtual    ~flyAnalyzer() ;
+  private:
+    int                  width, height;
+    int                  rgbBufStride;
+    ADM_byteBuffer *     rgbBufRaw;
+    ADMColorScalerFull * convertYuvToRgb;
+    uint32_t * wrkVectorScope;
+    uint32_t * bufVectorScope;
+    uint32_t * scaleVectorScope;
+    QImage   * imgVectorScope;
+    uint32_t * wrkYUVparade[3];
+    uint32_t * bufYUVparade;
+    QImage   * imgYUVparade;
+    uint32_t * wrkRGBparade[3];
+    uint32_t * bufRGBparade;
+    QImage   * imgRGBparade;
+    uint32_t * wrkHistograms[6];
+    uint32_t * bufHistograms;
+    QImage   * imgHistograms;
+    int      * paradeIndex;
+    int      * paradeIndexHalf;
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/qt4/Q_analyzer.cpp Added

@@ -0,0 +1,156 @@
+/***************************************************************************
+                          Analyzer filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 "Q_analyzer.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidAnalyzer.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_analyzerWindow::Ui_analyzerWindow(QWidget *parent, ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    ui.setupUi(this);
+    firstRun = true;
+    // Allocate space for green-ised video
+    uint32_t _width=in->getInfo()->width;
+    uint32_t _height=in->getInfo()->height;
+    _in = in;
+
+    canvas=new ADM_QCanvas(ui.graphicsView,_width,_height);
+
+    sceneVectorScope=new QGraphicsScene(this);
+    sceneVectorScope->setSceneRect(0,0,620,600);
+    ui.graphicsViewVectorScope->setScene(sceneVectorScope);
+    ui.graphicsViewVectorScope->scale(0.5,0.5);
+
+    sceneYUVparade=new QGraphicsScene(this);
+    sceneYUVparade->setSceneRect(0,0,772,258);
+    ui.graphicsViewYUVparade->setScene(sceneYUVparade);
+    ui.graphicsViewYUVparade->scale(0.5,0.5);
+
+    sceneRGBparade=new QGraphicsScene(this);
+    sceneRGBparade->setSceneRect(0,0,772,258);
+    ui.graphicsViewRGBparade->setScene(sceneRGBparade);
+    ui.graphicsViewRGBparade->scale(0.5,0.5);
+
+    sceneHistograms=new QGraphicsScene(this);
+    sceneHistograms->setSceneRect(0,0,772,259);
+    ui.graphicsViewHistograms->setScene(sceneHistograms);
+    ui.graphicsViewHistograms->scale(0.5,0.5);
+
+    myFly = new flyAnalyzer(this,_width, _height,_in,canvas,ui.horizontalSlider,sceneVectorScope, sceneYUVparade, sceneRGBparade, sceneHistograms);
+    myFly->_cookie=&ui;
+    myFly->addControl(ui.toolboxLayout);
+    myFly->setTabOrder();
+    myFly->upload();
+    myFly->sliderChanged();
+
+    connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+
+    setModal(true);
+
+}
+void Ui_analyzerWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+Ui_analyzerWindow::~Ui_analyzerWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_analyzerWindow::adjustGraphs(void)
+{
+    QRectF bounds;
+
+    bounds = sceneVectorScope->itemsBoundingRect();
+    ui.graphicsViewVectorScope->fitInView(bounds, Qt::KeepAspectRatio);
+
+    bounds = sceneYUVparade->itemsBoundingRect();
+    ui.graphicsViewYUVparade->fitInView(bounds, Qt::KeepAspectRatio);
+
+    bounds = sceneRGBparade->itemsBoundingRect();
+    ui.graphicsViewRGBparade->fitInView(bounds, Qt::KeepAspectRatio);
+
+    bounds = sceneHistograms->itemsBoundingRect();
+    ui.graphicsViewHistograms->fitInView(bounds, Qt::KeepAspectRatio);
+}
+void Ui_analyzerWindow::resizeEvent(QResizeEvent *event)
+{
+    adjustGraphs();
+
+    if(!canvas->height())
+        return;
+    myFly->fitCanvasIntoView(ui.graphicsView->width(), ui.graphicsView->height());
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_analyzerWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    adjustGraphs();
+
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+    if (firstRun)
+    {
+        adjustSize();
+        firstRun = false;
+    }
+}
+
+void flyAnalyzer::setTabOrder(void)
+{
+    Ui_analyzerDialog *w=(Ui_analyzerDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getAnalyzer(ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_analyzerWindow dialog(qtLastRegisteredDialog(),in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/qt4/Q_analyzer.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/analyzer/qt4/analyzer.ui Added

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>analyzerDialog</class>
+ <widget class="QDialog" name="analyzerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>799</width>
+    <height>674</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Analyzer</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="2">
+      <widget class="QGraphicsView" name="graphicsViewHistograms">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="backgroundBrush">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </brush>
+       </property>
+       <property name="renderHints">
+        <set>QPainter::TextAntialiasing</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QGraphicsView" name="graphicsViewYUVparade">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="backgroundBrush">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </brush>
+       </property>
+       <property name="renderHints">
+        <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" rowspan="2" colspan="2">
+      <widget class="QGraphicsView" name="graphicsViewVectorScope">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="backgroundBrush">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </brush>
+       </property>
+       <property name="renderHints">
+        <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QGraphicsView" name="graphicsViewRGBparade">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="backgroundBrush">
+        <brush brushstyle="SolidPattern">
+         <color alpha="255">
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </brush>
+       </property>
+       <property name="renderHints">
+        <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QGraphicsView" name="graphicsView">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>analyzerDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>analyzerDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.cpp Added

@@ -0,0 +1,260 @@
+/***************************************************************************
+                          Cartoon filter ported from frei0r
+    Algorithm:
+        Copyright 2003 Dries Pruimboom <dries@irssystems.nl>
+        Copyright      Denis Rojo <jaromil@dyne.org>
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artCartoon.h"
+#include "artCartoon_desc.cpp"
+#include "ADM_vidArtCartoon.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getArtCartoon(artCartoon *param, ADM_coreVideoFilter *in);
+
+
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtCartoon,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtCartoon,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artCartoon",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artCartoon","Cartoon"),            // Display name
+                                      QT_TRANSLATE_NOOP("artCartoon","Ported from frei0r.") // Description
+                                  );
+
+/**
+    \fn ArtCartoonCreateBuffers
+*/
+void ADMVideoArtCartoon::ArtCartoonCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv)
+{
+    *rgbBufStride = ADM_IMAGE_ALIGN(w * 4);
+    *rgbBufRaw = new ADM_byteBuffer();
+    if (*rgbBufRaw)
+        (*rgbBufRaw)->setSize(*rgbBufStride * h);
+    *convertYuvToRgb = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_YV12,ADM_PIXFRMT_RGB32A);
+    *convertRgbToYuv = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_RGB32A,ADM_PIXFRMT_YV12);
+    *rgbBufImage = new ADMImageRef(w,h);
+    if (*rgbBufImage)
+    {
+        (*rgbBufImage)->_pixfrmt = ADM_PIXFRMT_RGB32A;
+        (*rgbBufImage)->_planes[0] = (*rgbBufRaw)->at(0);
+        (*rgbBufImage)->_planes[1] = (*rgbBufImage)->_planes[2] = NULL;
+        (*rgbBufImage)->_planeStride[0] = *rgbBufStride;
+        (*rgbBufImage)->_planeStride[1] = (*rgbBufImage)->_planeStride[2] = 0;
+    }
+}
+/**
+    \fn ArtCartoonDestroyBuffers
+*/
+void ADMVideoArtCartoon::ArtCartoonDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (convertYuvToRgb) delete convertYuvToRgb;
+    if (convertRgbToYuv) delete convertRgbToYuv;
+    if (rgbBufRaw) rgbBufRaw->clean();
+    if (rgbBufImage) delete rgbBufImage;
+    if (rgbBufRaw) delete rgbBufRaw;
+}
+/**
+    \fn GMError
+*/
+int ADMVideoArtCartoon::GMError(int err, uint8_t * p1, uint8_t * p2)
+{
+    int i,t1,t2,res;
+    res = 0;
+    for (i=0; i<3; i++)
+    {
+        t1 = p1[i];
+        t2 = p2[i];
+        res += (t1-t2)*(t1-t2);
+    }
+    return (res > err ? res:err);
+}
+/**
+    \fn ArtCartoonProcess_C
+*/
+void ADMVideoArtCartoon::ArtCartoonProcess_C(ADMImage *img, int w, int h, float threshold, uint32_t scatter, uint32_t color, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (!img || !rgbBufRaw || !rgbBufImage || !convertYuvToRgb || !convertRgbToYuv) return;
+    uint8_t *p, * q, *qm, *qp;
+    int i,x,y,t;
+    uint8_t matrix[3][3][4];
+    uint8_t levels_table[256];
+
+    if (threshold > 1.0) threshold = 1.0;
+    if (threshold < 0.0) threshold = 0.0;
+    if (scatter > 16) scatter = 16;
+    if (scatter < 1) scatter = 1;
+    if (color > 32) color = 32;
+    if (color < 2) color = 2;
+
+    int thres = (threshold*threshold*65536);
+    int diff = scatter;
+    for (i = 0; i < 256; i++)
+    {
+        levels_table[i] = 255 * (color*i / 256) / (color-1);
+    }
+
+    convertYuvToRgb->convertImage(img,rgbBufRaw->at(0));
+
+    for(y=diff; y<(h-diff); y++) {
+        p = rgbBufRaw->at(y*rgbBufStride);
+        for(x=diff; x<(w-diff); x++) {
+            q = p + x*4;
+            qm = q - diff*rgbBufStride;
+            qp = q + diff*rgbBufStride;
+
+            memcpy(matrix[ 0 ][ 0 ],qm-4*diff,4);
+            memcpy(matrix[ 0 ][ 1 ],qm       ,4);
+            memcpy(matrix[ 0 ][ 2 ],qm+4*diff,4);
+            memcpy(matrix[ 1 ][ 0 ],q -4*diff,4);
+            memcpy(matrix[ 1 ][ 2 ],q +4*diff,4);
+            memcpy(matrix[ 2 ][ 0 ],qp-4*diff,4);
+            memcpy(matrix[ 2 ][ 1 ],qp       ,4);
+            memcpy(matrix[ 2 ][ 2 ],qp+4*diff,4);
+
+            t = GMError(0, matrix[ 1 ][ 0 ], matrix[ 1 ][ 2 ]);
+            t = GMError(t, matrix[ 0 ][ 1 ], matrix[ 2 ][ 1 ]);
+            t = GMError(t, matrix[ 0 ][ 0 ], matrix[ 2 ][ 2 ]);
+            t = GMError(t, matrix[ 2 ][ 0 ], matrix[ 0 ][ 2 ]);
+
+            *(q+3) = ((t > thres) ? 0xFF:0x00);    // use alpha channel as work storage (one's complement)
+        }
+    }
+
+    uint8_t mask;
+    for(y=0; y<h; y++)
+    {
+        p = rgbBufRaw->at(y*rgbBufStride);
+        for (x=0; x<w; x++)
+        {
+            mask = ~(*(p+3));
+            *p = mask & levels_table[*p]; p++;
+            *p = mask & levels_table[*p]; p++;
+            *p = mask & levels_table[*p]; p++;
+            *p = 0xFF; p++;
+        }
+    }
+
+    convertRgbToYuv->convertImage(rgbBufImage,img);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtCartoon::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtCartoon(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoArtCartoon::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255," Threshold: %.2f, Scatter: %d, Color level: %d",_param.threshold, _param.scatter, _param.color);
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtCartoon::ADMVideoArtCartoon(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artCartoon_param,&_param))
+    {
+        _param.threshold = 0.5;
+        _param.scatter = 3;
+        _param.color = 8;
+    }
+    ArtCartoonCreateBuffers(info.width,info.height, &(_rgbBufStride), &(_rgbBufRaw), &(_rgbBufImage), &(_convertYuvToRgb), &(_convertRgbToYuv));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoArtCartoon::update(void)
+{
+    _threshold=_param.threshold;
+    _scatter=_param.scatter;
+    _color=_param.color;
+
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtCartoon::~ADMVideoArtCartoon()
+{
+    ArtCartoonDestroyBuffers(_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtCartoon::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artCartoon_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoArtCartoon::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artCartoon_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtCartoon::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtCartoonProcess_C(image,info.width,info.height,_threshold,_scatter,_color,_rgbBufStride,_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/ADM_vidArtCartoon.h Added

@@ -0,0 +1,56 @@
+/***************************************************************************
+                          Cartoon filter ported from frei0r
+    Algorithm:
+        Copyright 2003 Dries Pruimboom <dries@irssystems.nl>
+        Copyright      Denis Rojo <jaromil@dyne.org>
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+
+/**
+    \class ADMVideoArtCartoon
+*/
+class  ADMVideoArtCartoon:public ADM_coreVideoFilter
+{
+
+  protected:
+    void                  update(void);
+    artCartoon            _param;
+    float                 _threshold;
+    uint32_t              _scatter;
+    uint32_t              _color;
+    int                   _rgbBufStride;
+    ADM_byteBuffer *      _rgbBufRaw;
+    ADMImageRef *         _rgbBufImage;
+    ADMColorScalerFull *  _convertYuvToRgb;
+    ADMColorScalerFull *  _convertRgbToYuv;
+  public:
+    ADMVideoArtCartoon(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtCartoon();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface        
+
+    static void ArtCartoonCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv);
+    static void ArtCartoonDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+    static void ArtCartoonProcess_C(ADMImage *img, int w, int h, float threshold, uint32_t scatter, uint32_t color, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+
+  private:
+    static int GMError(int err, uint8_t * p1, uint8_t * p2);
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/artCartoon_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/cli/DIA_artCartoon.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/DIA_flyArtCartoon.cpp Added

@@ -0,0 +1,57 @@
+/**/
+/***************************************************************************
+                          DIA_flyArtCartoon
+                             -------------------
+
+			   Ui for Cartoon
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtCartoon.h"
+#include "ADM_vidArtCartoon.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyArtCartoon::update(void)
+{
+    return 1;
+}
+/**
+    \fn createBuffers
+*/
+void flyArtCartoon::createBuffers(void)
+{
+    ADMVideoArtCartoon::ArtCartoonCreateBuffers(_w, _h, &rgbBufStride, &rgbBufRaw, &rgbBufImage, &convertYuvToRgb, &convertRgbToYuv);
+}
+/**
+    \fn destroyBuffers
+*/
+void flyArtCartoon::destroyBuffers(void)
+{
+    ADMVideoArtCartoon::ArtCartoonDestroyBuffers(rgbBufRaw, rgbBufImage, convertYuvToRgb, convertRgbToYuv);
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtCartoon::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoArtCartoon::ArtCartoonProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),param.threshold,param.scatter,param.color, rgbBufStride, rgbBufRaw, rgbBufImage, convertYuvToRgb, convertRgbToYuv);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/DIA_flyArtCartoon.h Added

@@ -0,0 +1,46 @@
+/***************************************************************************
+  \fn     DIA_flyArtCartoon
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artCartoon
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTCartoon_H
+#define FLY_ARTCartoon_H
+#include "artCartoon.h"
+/**
+    \class flyArtCartoon
+*/
+class flyArtCartoon : public ADM_flyDialogYuv
+{
+  private:
+    int                    rgbBufStride;
+    ADM_byteBuffer *       rgbBufRaw;
+    ADMImageRef *          rgbBufImage;
+    ADMColorScalerFull *   convertYuvToRgb;
+    ADMColorScalerFull *   convertRgbToYuv;
+
+    void       createBuffers(void);
+    void       destroyBuffers(void);
+
+  public:
+    artCartoon param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+
+    flyArtCartoon(QDialog *parent, uint32_t width, uint32_t height, ADM_coreVideoFilter *in, ADM_QCanvas *canvas, ADM_QSlider *slider)
+        : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) { createBuffers(); }
+    ~flyArtCartoon() { destroyBuffers(); }
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/Q_artCartoon.cpp Added

@@ -0,0 +1,172 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_artCartoon.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidArtCartoon.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artCartoonWindow::Ui_artCartoonWindow(QWidget *parent, artCartoon *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        myFly=new flyArtCartoon(this,width,height,in,canvas,ui.horizontalSlider);
+
+        memcpy(&(myFly->param),param,sizeof(artCartoon));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(Threshold,100,2)
+        SPINNER(Scatter,1,0)
+        SPINNER(Color,1,0)
+
+        setModal(true);
+}
+void Ui_artCartoonWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artCartoonWindow::gather(artCartoon *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(artCartoon));
+}
+Ui_artCartoonWindow::~Ui_artCartoonWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL;
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_artCartoonWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_artCartoonWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artCartoonWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYCHECK(x) w->checkBox##x
+//************************
+uint8_t flyArtCartoon::upload(void)
+{
+    Ui_artCartoonDialog *w=(Ui_artCartoonDialog *)_cookie;
+    MYSPIN(Threshold)->setValue((int)round(param.threshold*100.0));
+    MYSPIN(Scatter)->setValue(param.scatter);
+    MYSPIN(Color)->setValue(param.color);
+    return 1;
+}
+
+uint8_t flyArtCartoon::download(void)
+{
+    Ui_artCartoonDialog *w=(Ui_artCartoonDialog *)_cookie;
+    param.threshold=((float)MYSPIN(Threshold)->value()) / 100.0;
+    param.scatter=MYSPIN(Scatter)->value();
+    param.color=MYSPIN(Color)->value();
+    return 1;
+}
+
+void flyArtCartoon::setTabOrder(void)
+{
+    Ui_artCartoonDialog *w=(Ui_artCartoonDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSHME(x) controls.push_back(MYSPIN(x));
+    PUSHME(Threshold)
+    PUSHME(Scatter)
+    PUSHME(Color)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtCartoon(artCartoon *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artCartoonWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/Q_artCartoon.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCartoon/qt4/artCartoon.ui Added

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artCartoonDialog</class>
+ <widget class="QDialog" name="artCartoonDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Cartoon</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelThreshold">
+       <property name="text">
+        <string>Threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderThreshold">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelScatter">
+       <property name="text">
+        <string>Scatter</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderScatter">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>16</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelLevel">
+       <property name="text">
+        <string>Color level</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderColor">
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>32</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>horizontalSliderThreshold</tabstop>
+  <tabstop>horizontalSliderScatter</tabstop>
+  <tabstop>horizontalSliderColor</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artCartoonDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artCartoonDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artCharcoal/qt4/Q_artCharcoal.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artCharcoal/qt4/Q_artCharcoal.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.cpp Added

@@ -0,0 +1,290 @@
+/***************************************************************************
+                          ChromaHold filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artChromaHold.h"
+#include "artChromaHold_desc.cpp"
+#include "ADM_vidArtChromaHold.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getArtChromaHold(artChromaHold *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtChromaHold,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtChromaHold,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artChromaHold",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artChromaHold","Chroma Hold"),            // Display name
+                                      QT_TRANSLATE_NOOP("artChromaHold","Monochrome effect with kept color(s).") // Description
+                                  );
+/**
+    \fn ArtChromaHoldProcess_C
+*/
+void ADMVideoArtChromaHold::ArtChromaHoldProcess_C(ADMImage *img, bool * cen, float * cu, float * cv, float * cdist, float * cslope)
+
+{
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int ustride,vstride;
+    uint8_t * uptr, * vptr;
+    int upixel,vpixel,pixmul;
+    unsigned int * uvplane = (unsigned int *)malloc(256*256*sizeof(unsigned int));
+    unsigned int uvcurr,uvnew;
+    if (!uvplane) return;
+
+    if (cen[0] || cen[1] || cen[2])
+        memset(uvplane, 0, 256*256*sizeof(unsigned int));
+    else
+        for (int i=0; i<(256*256); i++)
+            uvplane[i]=256;    // if no one enabled --> show full colors
+    for (int c=0; c<3; c++)
+    {
+        if (!cen[c]) continue;
+        int iu,iv,i,j;
+        iu = std::floor(cu[c]*128.0 + 128.0);
+        iv = std::floor(cv[c]*128.0 + 128.0);
+        float cutdist = cdist[c]*128.0;
+        float cutslope = cslope[c]*128.0;
+        float diff;
+        for (i=0; i<256; i++)
+        {
+            for (j=0; j<256; j++)
+            {
+                diff = std::sqrt(((iu-i)*(iu-i) + (iv-j)*(iv-j))) - cutdist;
+                if (diff <= 0) uvplane[i*256+j] = 256;
+                else {
+                    uvcurr = uvplane[i*256+j];
+                    if ((diff > cutslope) || (cutslope == 0.0)) uvnew = 0;
+                    else {
+                        // diff == 0 -> 256 ...... diff == cutslope --> 0
+                        uvnew = std::floor(256.0 - 256.0*valueLimit((diff / cutslope), 0.0, 1.0));
+                    }
+
+                    if (uvnew > uvcurr) uvplane[i*256+j] = uvnew;
+                }
+            }
+        }
+    }
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+        img->expandColorRange();
+
+    // Y plane - no change
+
+    // UV planes
+    ustride=img->GetPitch(PLANAR_U);
+    uptr=img->GetWritePtr(PLANAR_U);
+    vstride=img->GetPitch(PLANAR_V);
+    vptr=img->GetWritePtr(PLANAR_V);
+    for(int y=0;y<height/2;y++)	// 4:2:0
+    {
+        for (int x=0;x<width/2;x++)
+        {
+            upixel = uptr[x];
+            vpixel = vptr[x];
+            pixmul = uvplane[upixel*256 + vpixel];
+            upixel -= 128;
+            vpixel -= 128;
+            upixel = (upixel * pixmul) >> 8;
+            vpixel = (vpixel * pixmul) >> 8;
+            uptr[x] = upixel + 128;
+            vptr[x] = vpixel + 128;
+        }
+        uptr+=ustride;
+        vptr+=vstride;
+    }
+
+    free(uvplane);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtChromaHold::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtChromaHold(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoArtChromaHold::getConfiguration(void)
+{
+    static char s[256];
+    static char s1[64],s2[64],s3[64];
+
+    if (_param.c1en)
+    {
+        snprintf(s1,63,"[%.2f,%.2f]:{r=%.2f,s=%.2f}, ",_param.c1u,_param.c1v,_param.c1dist,_param.c1slope);
+    } else {
+        strcpy(s1,"");
+    }
+
+    if (_param.c2en)
+    {
+        snprintf(s2,63,"[%.2f,%.2f]:{r=%.2f,s=%.2f}, ",_param.c2u,_param.c2v,_param.c2dist,_param.c2slope);
+    } else {
+        strcpy(s2,"");
+    }
+
+    if (_param.c3en)
+    {
+        snprintf(s3,63,"[%.2f,%.2f]:{r=%.2f,s=%.2f}, ",_param.c3u,_param.c3v,_param.c3dist,_param.c3slope);
+    } else {
+        strcpy(s3,"");
+    }
+    snprintf(s,255," Chroma hold: %s%s%s",s1,s2,s3);
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtChromaHold::ADMVideoArtChromaHold(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artChromaHold_param,&_param))
+    {
+        _param.c1en = true;
+        _param.c1u = 0.0;
+        _param.c1v = 0.0;
+        _param.c1dist = 0.5;
+        _param.c1slope = 0.0;
+        _param.c2en =false;
+        _param.c2u = 0.0;
+        _param.c2v = 0.0;
+        _param.c2dist = 0.0;
+        _param.c2slope = 0.0;
+        _param.c3en =false;
+        _param.c3u = 0.0;
+        _param.c3v = 0.0;
+        _param.c3dist = 0.0;
+        _param.c3slope = 0.0;
+    }
+    update();
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoArtChromaHold::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoArtChromaHold::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoArtChromaHold::update(void)
+{
+    _cen[0] = _param.c1en;
+    _cen[1] = _param.c2en;
+    _cen[2] = _param.c3en;
+    _cu[0] = _param.c1u;
+    _cu[1] = _param.c2u;
+    _cu[2] = _param.c3u;
+    _cv[0] = _param.c1v;
+    _cv[1] = _param.c2v;
+    _cv[2] = _param.c3v;
+    _cdist[0] = _param.c1dist;
+    _cdist[1] = _param.c2dist;
+    _cdist[2] = _param.c3dist;
+    _cslope[0] = _param.c1slope;
+    _cslope[1] = _param.c2slope;
+    _cslope[2] = _param.c3slope;
+
+    for (int i=0; i<3; i++)
+    {
+        _cu[i] = valueLimit(_cu[i], -1.0, 1.0);
+        _cv[i] = valueLimit(_cv[i], -1.0, 1.0);
+        _cdist[i] = valueLimit(_cdist[i], 0.0, 1.0);
+        _cslope[i] = valueLimit(_cslope[i], 0.0, 1.0);
+    }
+
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtChromaHold::~ADMVideoArtChromaHold()
+{
+    
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtChromaHold::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artChromaHold_param,&_param);
+}
+
+void ADMVideoArtChromaHold::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artChromaHold_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtChromaHold::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtChromaHoldProcess_C(image, _cen, _cu, _cv, _cdist, _cslope);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/ADM_vidArtChromaHold.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+                          ChromaHold filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoArtChromaHold
+*/
+class  ADMVideoArtChromaHold:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    artChromaHold   _param;
+    bool            _cen[3];
+    float           _cu[3];
+    float           _cv[3];
+    float           _cdist[3];
+    float           _cslope[3];
+
+  public:
+    ADMVideoArtChromaHold(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtChromaHold();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static void          ArtChromaHoldProcess_C(ADMImage *img, bool * cen, float * cu, float * cv, float * cdist, float * cslope);
+
+  private:
+    static float   valueLimit(float val, float min, float max);
+    static int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/CMakeLists.txt Added

@@ -0,0 +1,32 @@
+INCLUDE(vf_plugin)
+
+
+IF(DO_QT4)
+    IF(ADM_QT_VERSION EQUAL 4)
+        SET(QT_TAG qt4)
+    ELSE(ADM_QT_VERSION EQUAL 4)
+        SET(QT_TAG qt5)
+        ADM_QT_ADD_RESOURCES(resource   qt4/artChromaHold.qrc)
+    ENDIF(ADM_QT_VERSION EQUAL 4)
+ENDIF(DO_QT4)
+
+
+SET(ArtChromaHoldCommon_SRCS 
+ADM_vidArtChromaHold.cpp  
+)
+# ---------- QT4 Version ----------------
+INCLUDE(vf_plugin_qt4)
+SET(ArtChromaHoldQT_SRCS  qt4/Q_artChromaHold.cpp)
+SET(ArtChromaHoldQT_HEADERS  qt4/Q_artChromaHold.h)
+SET(ArtChromaHoldQT_UI    qt4/artChromaHold)
+INIT_VIDEO_FILTER_QT4(ADM_vf_artChromaHold${QT_LIBRARY_EXTENSION} ${ArtChromaHoldQT_SRCS} ${ArtChromaHoldQT_HEADERS} ${ArtChromaHoldQT_UI} ${ArtChromaHoldCommon_SRCS} qt4/DIA_flyArtChromaHold.cpp ${resource})
+
+# /QT4
+
+
+
+#------------ Cli Version ----------------
+INCLUDE(vf_plugin_cli)
+SET(ArtChromaHoldCli_SRCS cli/DIA_artChromaHold.cpp)
+INIT_VIDEO_FILTER_CLI(  ADM_vf_artChromaHoldCli ${ArtChromaHoldCli_SRCS} ${ArtChromaHoldCommon_SRCS})
+#

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold_desc.cpp Added

@@ -0,0 +1,19 @@
+// automatically generated by admSerialization.py, do not edit!
+extern const ADM_paramList artChromaHold_param[]={
+ {"c1en",offsetof(artChromaHold,c1en),"bool",ADM_param_bool},
+ {"c1u",offsetof(artChromaHold,c1u),"float",ADM_param_float},
+ {"c1v",offsetof(artChromaHold,c1v),"float",ADM_param_float},
+ {"c1dist",offsetof(artChromaHold,c1dist),"float",ADM_param_float},
+ {"c1slope",offsetof(artChromaHold,c1slope),"float",ADM_param_float},
+ {"c2en",offsetof(artChromaHold,c2en),"bool",ADM_param_bool},
+ {"c2u",offsetof(artChromaHold,c2u),"float",ADM_param_float},
+ {"c2v",offsetof(artChromaHold,c2v),"float",ADM_param_float},
+ {"c2dist",offsetof(artChromaHold,c2dist),"float",ADM_param_float},
+ {"c2slope",offsetof(artChromaHold,c2slope),"float",ADM_param_float},
+ {"c3en",offsetof(artChromaHold,c3en),"bool",ADM_param_bool},
+ {"c3u",offsetof(artChromaHold,c3u),"float",ADM_param_float},
+ {"c3v",offsetof(artChromaHold,c3v),"float",ADM_param_float},
+ {"c3dist",offsetof(artChromaHold,c3dist),"float",ADM_param_float},
+ {"c3slope",offsetof(artChromaHold,c3slope),"float",ADM_param_float},
+{NULL,0,NULL}
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/artChromaHold_json.cpp Added

@@ -0,0 +1,32 @@
+// automatically generated by admSerialization.py, do not edit!
+#include "ADM_default.h"
+#include "ADM_paramList.h"
+#include "ADM_coreJson.h"
+#include "artChromaHold.h"
+bool  artChromaHold_jserialize(const char *file, const artChromaHold *key){
+admJson json;
+json.addBool("c1en",key->c1en);
+json.addFloat("c1u",key->c1u);
+json.addFloat("c1v",key->c1v);
+json.addFloat("c1dist",key->c1dist);
+json.addFloat("c1slope",key->c1slope);
+json.addBool("c2en",key->c2en);
+json.addFloat("c2u",key->c2u);
+json.addFloat("c2v",key->c2v);
+json.addFloat("c2dist",key->c2dist);
+json.addFloat("c2slope",key->c2slope);
+json.addBool("c3en",key->c3en);
+json.addFloat("c3u",key->c3u);
+json.addFloat("c3v",key->c3v);
+json.addFloat("c3dist",key->c3dist);
+json.addFloat("c3slope",key->c3slope);
+return json.dumpToFile(file);
+};
+bool  artChromaHold_jdeserialize(const char *file, const ADM_paramList *tmpl,artChromaHold *key){
+admJsonToCouple json;
+CONFcouple *c=json.readFromFile(file);
+if(!c) {ADM_error("Cannot read json file");return false;}
+bool r= ADM_paramLoadPartial(c,tmpl,key);
+delete c;
+return r;
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/cli/DIA_artChromaHold.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/DIA_flyArtChromaHold.cpp Added

@@ -0,0 +1,63 @@
+/**/
+/***************************************************************************
+                          DIA_ArtChromaHold
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtChromaHold.h"
+
+#include "ADM_vidArtChromaHold.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyArtChromaHold::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtChromaHold::processYuv(ADMImage *in,ADMImage *out )
+{
+    bool cen[3];
+    float cu[3];
+    float cv[3];
+    float cdist[3];
+    float cslope[3];
+    cen[0] = param.c1en;
+    cu[0] = param.c1u;
+    cv[0] = param.c1v;
+    cdist[0] = param.c1dist;
+    cslope[0] = param.c1slope;
+    cen[1] = param.c2en;
+    cu[1] = param.c2u;
+    cv[1] = param.c2v;
+    cdist[1] = param.c2dist;
+    cslope[1] = param.c2slope;
+    cen[2] = param.c3en;
+    cu[2] = param.c3u;
+    cv[2] = param.c3v;
+    cdist[2] = param.c3dist;
+    cslope[2] = param.c3slope;
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoArtChromaHold::ArtChromaHoldProcess_C(out, cen, cu, cv, cdist, cslope);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/DIA_flyArtChromaHold.h Added

@@ -0,0 +1,41 @@
+/***************************************************************************
+  \fn     DIA_flyArtChromaHold
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artChromaHold
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTChromaHold_H
+#define FLY_ARTChromaHold_H
+#include "artChromaHold.h"
+#include <QGraphicsScene>
+/**
+    \class flyArtChromaHold
+*/
+class flyArtChromaHold : public ADM_flyDialogYuv
+{
+
+  public:
+    artChromaHold  param;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyArtChromaHold (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in, ADM_QCanvas *canvas, ADM_QSlider *slider,QGraphicsScene*sc) : 
+        ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {
+            scene=sc;
+        };
+  private:
+    QGraphicsScene *scene;
+    void drawScene();
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/Q_artChromaHold.cpp Added

@@ -0,0 +1,373 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_artChromaHold.h"
+#include "ADM_toolkitQt.h"
+#include <cmath>
+#include <QColorDialog>
+#include <QPalette>
+#include <QString>
+#include <QImage>
+#include <QPixmap>
+
+static void rgb2yuv(int * yuv, int * rgb);
+static void yuv2rgb(int * rgb, int * yuv);
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artChromaHoldWindow::Ui_artChromaHoldWindow(QWidget *parent, artChromaHold *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        scene=new QGraphicsScene(this);
+        ui.graphicsViewUV->setScene(scene);
+        ui.graphicsViewUV->scale(1.0,1.0);
+
+        myFly=new flyArtChromaHold( this,width, height,in,canvas,ui.horizontalSlider, scene);
+        memcpy(&(myFly->param),param,sizeof(artChromaHold));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        CHKBOX(C1en);
+        CHKBOX(C2en);
+        CHKBOX(C3en);
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(C1dist,100,2);
+        SPINNER(C1slope,100,2);
+        SPINNER(C2dist,100,2);
+        SPINNER(C2slope,100,2);
+        SPINNER(C3dist,100,2);
+        SPINNER(C3slope,100,2);
+#define PUSHB(x) connect(ui.pushButton##x,SIGNAL(released()),this,SLOT(pushed##x()));
+        PUSHB(C1);
+        PUSHB(C2);
+        PUSHB(C3);
+
+        setModal(true);
+}
+void Ui_artChromaHoldWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artChromaHoldWindow::gather(artChromaHold *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(artChromaHold));
+}
+Ui_artChromaHoldWindow::~Ui_artChromaHoldWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+    scene=NULL;
+}
+void Ui_artChromaHoldWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+#define PUSHHANDLER(x) \
+    QPalette indctrPalette(ui.lineEditC##x->palette()); \
+    QColor startColor = indctrPalette.color(QPalette::Window); \
+    QColor color = QColorDialog::getColor(startColor, this ); \
+    if( color.isValid() ) \
+    { \
+        int rgb[3],yuv[3]; \
+        color.getRgb(rgb+0,rgb+1,rgb+2, NULL); \
+        rgb2yuv(yuv, rgb); \
+        yuv[0] = 128; \
+        myFly->param.c##x##u = (float)yuv[1]/128.0; \
+        myFly->param.c##x##v = (float)yuv[2]/128.0; \
+        yuv2rgb(rgb, yuv); \
+        color.setRgb(rgb[0],rgb[1],rgb[2],255); \
+        indctrPalette.setColor(QPalette::Window,color); \
+        indctrPalette.setColor(QPalette::Base,color); \
+        indctrPalette.setColor(QPalette::AlternateBase,color); \
+        ui.lineEditC##x->setPalette(indctrPalette); \
+        if(!lock) \
+        { \
+            lock++; \
+            myFly->download(); \
+            myFly->sameImage(); \
+            lock--; \
+        } \
+    }
+
+void Ui_artChromaHoldWindow::pushedC1()
+{
+    PUSHHANDLER(1);
+}
+void Ui_artChromaHoldWindow::pushedC2()
+{
+    PUSHHANDLER(2);
+}
+void Ui_artChromaHoldWindow::pushedC3()
+{
+    PUSHHANDLER(3);
+}
+void rgb2yuv(int * yuv, int * rgb)
+{
+    yuv[0] = std::round( 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]);
+    yuv[1] = std::round(-0.169*rgb[0] - 0.331*rgb[1] + 0.500*rgb[2]);
+    yuv[2] = std::round( 0.500*rgb[0] - 0.419*rgb[1] - 0.081*rgb[2]);
+    if (yuv[0] <   0) yuv[0] = 0;
+    if (yuv[0] > 255) yuv[0] = 255;
+    if (yuv[1] < -128) yuv[1] = -128;
+    if (yuv[1] >  127) yuv[1] = 127;
+    if (yuv[2] < -128) yuv[2] = -128;
+    if (yuv[2] >  127) yuv[2] = 127;
+}
+void yuv2rgb(int * rgb, int * yuv)
+{
+    rgb[0] = std::round(yuv[0]                +   1.4*yuv[2]);
+    rgb[1] = std::round(yuv[0] - 0.343*yuv[1] - 0.711*yuv[2]);
+    rgb[2] = std::round(yuv[0] + 1.765*yuv[1]               );
+    for (int i=0; i<3; i++)
+    {
+        if (rgb[i] < 0) rgb[i] = 0;
+        if (rgb[i] > 255) rgb[i] = 255;
+    }
+}
+
+void Ui_artChromaHoldWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artChromaHoldWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADYUV(x) { \
+    QLineEdit * indctr = w->lineEditC##x; \
+    QPalette indctrPalette(indctr->palette()); \
+    QColor color; \
+    yuv[0] = 128; \
+    yuv[1] = (int)round(param.c##x##u*128.0); \
+    yuv[2] = (int)round(param.c##x##v*128.0); \
+    yuv2rgb(rgb, yuv); \
+    color.setRgb(rgb[0],rgb[1],rgb[2],255); \
+    indctrPalette.setColor(QPalette::Window,color); \
+    indctrPalette.setColor(QPalette::Base,color); \
+    indctrPalette.setColor(QPalette::AlternateBase,color); \
+    indctr->setPalette(indctrPalette); \
+    }
+
+//************************
+uint8_t flyArtChromaHold::upload(void)
+{
+    Ui_artChromaHoldDialog *w=(Ui_artChromaHoldDialog *)_cookie;
+
+    MYCHECK(C1en)->setChecked(param.c1en);
+    MYCHECK(C2en)->setChecked(param.c2en);
+    MYCHECK(C3en)->setChecked(param.c3en);
+    MYSPIN(C1dist)->setValue((int)round(param.c1dist*100.0));
+    MYSPIN(C1slope)->setValue((int)round(param.c1slope*100.0));
+    MYSPIN(C2dist)->setValue((int)round(param.c2dist*100.0));
+    MYSPIN(C2slope)->setValue((int)round(param.c2slope*100.0));
+    MYSPIN(C3dist)->setValue((int)round(param.c3dist*100.0));
+    MYSPIN(C3slope)->setValue((int)round(param.c3slope*100.0));
+
+    int rgb[3],yuv[3];
+    UPLOADYUV(1);
+    UPLOADYUV(2);
+    UPLOADYUV(3);
+
+    drawScene();
+    return 1;
+}
+
+uint8_t flyArtChromaHold::download(void)
+{
+    Ui_artChromaHoldDialog *w=(Ui_artChromaHoldDialog *)_cookie;
+    param.c1en=MYCHECK(C1en)->isChecked();
+    param.c2en=MYCHECK(C2en)->isChecked();
+    param.c3en=MYCHECK(C3en)->isChecked();
+    param.c1dist=((float)MYSPIN(C1dist)->value()) / 100.0;
+    param.c1slope=((float)MYSPIN(C1slope)->value()) / 100.0;
+    param.c2dist=((float)MYSPIN(C2dist)->value()) / 100.0;
+    param.c2slope=((float)MYSPIN(C2slope)->value()) / 100.0;
+    param.c3dist=((float)MYSPIN(C3dist)->value()) / 100.0;
+    param.c3slope=((float)MYSPIN(C3slope)->value()) / 100.0;
+
+    drawScene();
+    return 1;
+}
+void flyArtChromaHold::drawScene()
+{
+    #define YUVmapSize (124)
+    uint8_t * uvplane = (uint8_t*)malloc(YUVmapSize*YUVmapSize);
+    QImage * img = new QImage(YUVmapSize,YUVmapSize,QImage::Format_RGB32);
+    if(scene && uvplane && img)
+    {
+        bool cen[3];
+        float cu[3];
+        float cv[3];
+        float cdist[3];
+        float cslope[3];
+        cen[0] = param.c1en;
+        cu[0] = param.c1u;
+        cv[0] = param.c1v;
+        cdist[0] = param.c1dist;
+        cslope[0] = param.c1slope;
+        cen[1] = param.c2en;
+        cu[1] = param.c2u;
+        cv[1] = param.c2v;
+        cdist[1] = param.c2dist;
+        cslope[1] = param.c2slope;
+        cen[2] = param.c3en;
+        cu[2] = param.c3u;
+        cv[2] = param.c3v;
+        cdist[2] = param.c3dist;
+        cslope[2] = param.c3slope;
+        float fi,fj;
+        float diff,slp;
+        uint8_t uvcurr,uvnew;
+        if (cen[0] || cen[1] || cen[2])
+            memset(uvplane, 0, YUVmapSize*YUVmapSize);
+        else
+            memset(uvplane, 255, YUVmapSize*YUVmapSize);    // if no one enabled --> show full colors
+
+        for (int c=0; c<3; c++)
+        {
+            if (!cen[c]) continue;
+            for (int i=0; i<YUVmapSize; i++) for(int j=0; j<YUVmapSize; j++)
+            {
+                fi = ((float)i-YUVmapSize/2.0)/(YUVmapSize/2.0);
+                fj = ((float)j-YUVmapSize/2.0)/(YUVmapSize/2.0);
+                diff = std::sqrt(((cu[c]-fi)*(cu[c]-fi) + (cv[c]-fj)*(cv[c]-fj))) - cdist[c];
+                if (diff <= 0) uvplane[i*YUVmapSize+j] = 255;
+                else {
+                    uvcurr = uvplane[i*YUVmapSize+j];
+                    if ((diff > cslope[c]) || (cslope[c] == 0.0)) uvnew = 0;
+                    else {
+                        slp = (diff / cslope[c]);
+                        if (slp < 0) slp = 0;
+                        if (slp > 1) slp = 1;
+                        uvnew = std::floor(255.0 - 255.0*slp);
+                    }
+                    if (uvnew > uvcurr) uvplane[i*YUVmapSize+j] = uvnew;
+                }
+            }
+        }
+
+        int rgb[3],yuv[3];
+
+        for (int i=0; i<YUVmapSize; i++) for(int j=0; j<YUVmapSize; j++)
+        {
+            fi = ((float)uvplane[i*YUVmapSize+j]/255.0)*((float)i-YUVmapSize/2.0)/(YUVmapSize/2.0);
+            fj = ((float)uvplane[i*YUVmapSize+j]/255.0)*((float)j-YUVmapSize/2.0)/(YUVmapSize/2.0);
+            yuv[0] = uvplane[i*YUVmapSize+j]>>1;
+            yuv[1] = std::floor(fi*128.0);
+            yuv[2] = std::floor(fj*128.0);
+            yuv2rgb(rgb, yuv);
+            img->setPixel(i,(YUVmapSize-1-j),qRgb(rgb[0],rgb[1],rgb[2]));
+        }
+        scene->clear();
+        scene->addPixmap( QPixmap::fromImage(*img)); 
+    }
+    if (img) delete img;
+    if (uvplane) free(uvplane);
+}
+void flyArtChromaHold::setTabOrder(void)
+{
+    Ui_artChromaHoldDialog *w=(Ui_artChromaHoldDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+#define PUSHME(x) controls.push_back(MYCHECK(x##en)); \
+                  controls.push_back(w->pushButton##x); \
+                  controls.push_back(MYSPIN(x##dist)); \
+                  controls.push_back(MYSPIN(x##slope));
+    PUSHME(C1)
+    PUSHME(C2)
+    PUSHME(C3)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtChromaHold(artChromaHold *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artChromaHoldWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/Q_artChromaHold.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.qrc Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/artChromaHold.ui Added

@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artChromaHoldDialog</class>
+ <widget class="QDialog" name="artChromaHoldDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Chroma Hold</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="pushButtonC1">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="artChromaHold.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="4">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC3slope">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC1slope">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLineEdit" name="lineEditC1">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="checkBoxC3en">
+       <property name="text">
+        <string>Tertiary</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBoxC2en">
+       <property name="text">
+        <string>Secondary</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="checkBoxC1en">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>Primary</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QPushButton" name="pushButtonC2">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="artChromaHold.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QPushButton" name="pushButtonC3">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="artChromaHold.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QLineEdit" name="lineEditC2">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLineEdit" name="lineEditC3">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC1dist">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC2dist">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="labelDistance">
+       <property name="text">
+        <string>Distance</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QLabel" name="labelSlope">
+       <property name="text">
+        <string>Cutoff slope</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" colspan="2">
+      <widget class="QLabel" name="labelChroma">
+       <property name="text">
+        <string>Pick Chroma</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="4">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC2slope">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="3">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC3dist">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="5" rowspan="3">
+      <widget class="QGraphicsView" name="graphicsViewUV">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>128</width>
+         <height>128</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>128</width>
+         <height>128</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>checkBoxC1en</tabstop>
+  <tabstop>pushButtonC1</tabstop>
+  <tabstop>lineEditC1</tabstop>
+  <tabstop>horizontalSliderC1dist</tabstop>
+  <tabstop>horizontalSliderC1slope</tabstop>
+  <tabstop>checkBoxC2en</tabstop>
+  <tabstop>pushButtonC2</tabstop>
+  <tabstop>lineEditC2</tabstop>
+  <tabstop>horizontalSliderC2dist</tabstop>
+  <tabstop>horizontalSliderC2slope</tabstop>
+  <tabstop>checkBoxC3en</tabstop>
+  <tabstop>pushButtonC3</tabstop>
+  <tabstop>lineEditC3</tabstop>
+  <tabstop>horizontalSliderC3dist</tabstop>
+  <tabstop>horizontalSliderC3slope</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
+ <resources>
+  <include location="artChromaHold.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artChromaHoldDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artChromaHoldDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaHold/qt4/color.png Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.cpp Added

@@ -0,0 +1,525 @@
+/***************************************************************************
+                          ChromaKey filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artChromaKey.h"
+#include "artChromaKey_desc.cpp"
+#include "ADM_vidArtChromaKey.h"
+#include "ADM_imageLoader.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getArtChromaKey(artChromaKey *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtChromaKey,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtChromaKey,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artChromaKey",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artChromaKey","Chroma Key"),            // Display name
+                                      QT_TRANSLATE_NOOP("artChromaKey","Replace \"green screen\" with an image.") // Description
+                                  );
+/**
+    \fn ArtChromaKeyProcess_C
+*/
+void ADMVideoArtChromaKey::ArtChromaKeyProcess_C(ADMImage *img, ADMImage *backgrnd, bool * cen, float * cu, float * cv, float * cdist, float * cslope, uint32_t spill)
+{
+    if (!backgrnd) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int iystride, iustride,ivstride;
+    uint8_t * iyptr, * iuptr, * ivptr;
+    int bystride, bustride,bvstride;
+    uint8_t * byptr, * buptr, * bvptr;
+    int upixel,vpixel,pixmul,pixel,pixsum;
+
+    unsigned int * uvplane = (unsigned int *)malloc(256*256*sizeof(unsigned int));
+    int uvcurr,uvnew;
+    if (!uvplane) return;
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+        img->expandColorRange();
+
+    unsigned int * alphaneg = NULL;
+    if (spill)
+    {
+        alphaneg = (unsigned int *)malloc(width*height*sizeof(unsigned int));
+        if (!alphaneg)
+            spill = 0;
+    }
+
+    memset(uvplane, 0, 256*256*sizeof(unsigned int));
+    for (int c=0; c<3; c++)
+    {
+        if (!cen[c]) continue;
+        int iu,iv,i,j;
+        iu = std::floor(cu[c]*128.0 + 128.0);
+        iv = std::floor(cv[c]*128.0 + 128.0);
+        float cutdist = cdist[c]*128.0;
+        float cutslope = cslope[c]*128.0;
+        float diff;
+        for (i=0; i<256; i++)
+        {
+            for (j=0; j<256; j++)
+            {
+                diff = std::sqrt(((iu-i)*(iu-i) + (iv-j)*(iv-j))) - cutdist;
+                if (diff <= 0) uvplane[i*256+j] = 256;
+                else {
+                    uvcurr = uvplane[i*256+j];
+                    if ((diff > cutslope) || (cutslope == 0.0)) uvnew = 0;
+                    else {
+                        // diff == 0 -> 256 ...... diff == cutslope --> 0
+                        uvnew = std::floor(256.0 - 256.0*valueLimit((diff / cutslope), 0.0, 1.0));
+                    }
+
+                    if (uvnew > uvcurr) uvplane[i*256+j] = uvnew;
+                }
+            }
+        }
+    }
+
+    // YUV planes
+    iystride=img->GetPitch(PLANAR_Y);
+    iyptr=img->GetWritePtr(PLANAR_Y);
+    iustride=img->GetPitch(PLANAR_U);
+    iuptr=img->GetWritePtr(PLANAR_U);
+    ivstride=img->GetPitch(PLANAR_V);
+    ivptr=img->GetWritePtr(PLANAR_V);
+    bystride=backgrnd->GetPitch(PLANAR_Y);
+    byptr=backgrnd->GetWritePtr(PLANAR_Y);
+    bustride=backgrnd->GetPitch(PLANAR_U);
+    buptr=backgrnd->GetWritePtr(PLANAR_U);
+    bvstride=backgrnd->GetPitch(PLANAR_V);
+    bvptr=backgrnd->GetWritePtr(PLANAR_V);
+    int x,y;
+
+    for(y=0;y<height;y++)
+    {
+        for (x=0;x<width;x++)
+        {
+            upixel = iuptr[x/2];
+            vpixel = ivptr[x/2];
+            pixmul = uvplane[upixel*256 + vpixel];
+
+            if ( spill && ((x/2) > 0) && ((x/2) < (width/2 -1))  && ((y/2) > 0) && ((y/2) < (height/2 -1)) )
+            {
+                int quadrant = (((height&1) << 1) + (width&1))&3;
+                int pixmuls[4];
+                pixmuls[0] = pixmul;
+                switch(quadrant)
+                {
+                    case 0:    // left, up
+                            upixel = iuptr[x/2-1];
+                            vpixel = ivptr[x/2-1];
+                            pixmuls[1] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr-iustride)[x/2];
+                            vpixel = (ivptr-ivstride)[x/2];
+                            pixmuls[2] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr-iustride)[x/2-1];
+                            vpixel = (ivptr-ivstride)[x/2-1];
+                            pixmuls[3] = uvplane[upixel*256 + vpixel];
+                        break;
+                    case 1:    // right, up
+                            upixel = iuptr[x/2+1];
+                            vpixel = ivptr[x/2+1];
+                            pixmuls[1] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr-iustride)[x/2];
+                            vpixel = (ivptr-ivstride)[x/2];
+                            pixmuls[2] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr-iustride)[x/2+1];
+                            vpixel = (ivptr-ivstride)[x/2+1];
+                            pixmuls[3] = uvplane[upixel*256 + vpixel];
+                        break;
+                    case 2:    // left, down
+                            upixel = iuptr[x/2-1];
+                            vpixel = ivptr[x/2-1];
+                            pixmuls[1] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr+iustride)[x/2];
+                            vpixel = (ivptr+ivstride)[x/2];
+                            pixmuls[2] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr+iustride)[x/2-1];
+                            vpixel = (ivptr+ivstride)[x/2-1];
+                            pixmuls[3] = uvplane[upixel*256 + vpixel];
+                        break;
+                    default:
+                    case 3:    // right, down
+                            upixel = iuptr[x/2+1];
+                            vpixel = ivptr[x/2+1];
+                            pixmuls[1] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr+iustride)[x/2];
+                            vpixel = (ivptr+ivstride)[x/2];
+                            pixmuls[2] = uvplane[upixel*256 + vpixel];
+                            upixel = (iuptr+iustride)[x/2+1];
+                            vpixel = (ivptr+ivstride)[x/2+1];
+                            pixmuls[3] = uvplane[upixel*256 + vpixel];
+                        break;
+                }
+
+                switch(spill)
+                {
+                    case 1:    // Weighted alpha
+                            pixmul = (9*pixmuls[0] + 3*pixmuls[1] + 3*pixmuls[2] + 1*pixmuls[3])/16;
+                        break;
+                    case 2:    // AVG alpha
+                            pixmul = 0;
+                            for (int i=0; i<4; i++)
+                            {
+                                pixmul += pixmuls[i];
+                            }
+                            pixmul /= 4;
+                        break;
+                    case 3:    // RMS alpha
+                            pixmul = 0;
+                            for (int i=0; i<4; i++)
+                            {
+                                pixmul += pixmuls[i]*pixmuls[i];
+                            }
+                            pixmul /= 4;
+                            pixmul = (int)std::sqrt(pixmul);
+                        break;
+                    case 4:    // MIN alpha
+                            pixmul = pixmuls[0];
+                            for (int i=1; i<4; i++)
+                            {
+                                if (pixmul < pixmuls[i]) pixmul = pixmuls[i];
+                            }
+                        break;
+                    default:
+                        break;
+                }
+
+            }
+
+            if ( spill)
+            {
+                alphaneg[y*width+x] = pixmul;
+            }
+
+            if (pixmul <= 0) continue;    // video frame pixel
+            if (pixmul >= 256)    // background image pixel
+            {
+                iyptr[x]   = byptr[x];
+                continue;
+            }
+            // blending:
+            pixel = iyptr[x];
+            pixsum = pixel * (256 - pixmul);
+            pixel = byptr[x];
+            pixsum += pixel * pixmul;
+            iyptr[x] = pixsum >> 8;
+        }
+
+        iyptr += iystride;
+        byptr += bystride;
+        if (y%2)	// 4:2:0
+        {
+            iuptr+=iustride;
+            ivptr+=ivstride;
+        }
+    }
+
+    iuptr=img->GetWritePtr(PLANAR_U);
+    ivptr=img->GetWritePtr(PLANAR_V);
+    buptr=backgrnd->GetWritePtr(PLANAR_U);
+    bvptr=backgrnd->GetWritePtr(PLANAR_V);
+    for(y=0;y<height/2;y++)
+    {
+        for (x=0;x<width/2;x++)
+        {
+            upixel = iuptr[x];
+            vpixel = ivptr[x];
+            pixmul = uvplane[upixel*256 + vpixel];
+
+            if ( spill )
+            {
+                int pixmuls[4];
+                pixmuls[0] = alphaneg[(2*y    )*width+(2*x    )];
+                pixmuls[1] = alphaneg[(2*y    )*width+(2*x + 1)];
+                pixmuls[2] = alphaneg[(2*y + 1)*width+(2*x    )];
+                pixmuls[3] = alphaneg[(2*y + 1)*width+(2*x + 1)];
+
+                switch(spill)
+                {
+                    case 1:
+                    case 2:    // Weighted alpha / AVG alpha
+                            pixmul = 0;
+                            for (int i=0; i<4; i++)
+                            {
+                                pixmul += pixmuls[i];
+                            }
+                            pixmul /= 4;
+                        break;
+                    case 3:    // RMS alpha
+                            pixmul = 0;
+                            for (int i=0; i<4; i++)
+                            {
+                                pixmul += pixmuls[i]*pixmuls[i];
+                            }
+                            pixmul /= 4;
+                            pixmul = (int)std::sqrt(pixmul);
+                        break;
+                    case 4:    // MIN alpha
+                            pixmul = pixmuls[0];
+                            for (int i=1; i<4; i++)
+                            {
+                                if (pixmul < pixmuls[i]) pixmul = pixmuls[i];
+                            }
+                        break;
+
+                    default:
+                        break;
+                }
+
+            }
+
+            if (pixmul <= 0) continue;    // video frame pixel
+            if (pixmul >= 256)    // background image pixel
+            {
+                iuptr[x] = buptr[x];
+                ivptr[x] = bvptr[x];
+                continue;
+            }
+            // blending:
+            pixel = iuptr[x];
+            pixsum = pixel * (256 - pixmul);
+            pixel = buptr[x];
+            pixsum += pixel * pixmul;
+            iuptr[x] = pixsum >> 8;
+            pixel = ivptr[x];
+            pixsum = pixel * (256 - pixmul);
+            pixel = bvptr[x];
+            pixsum += pixel * pixmul;
+            ivptr[x] = pixsum >> 8;
+        }
+        iuptr+=iustride;
+        ivptr+=ivstride;
+        buptr+=bustride;
+        bvptr+=bvstride;
+    }
+
+    free(uvplane);
+    free(alphaneg);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtChromaKey::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtChromaKey(&_param, previousFilter);
+    reloadImage();
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoArtChromaKey::getConfiguration(void)
+{
+    static char s[2560];
+    static char s1[64],s2[64],s3[64];
+
+    if (_param.c1en)
+    {
+        snprintf(s1,63,"[%.2f,%.2f]:{r=%.2f,s=%.2f}, ",_param.c1u,_param.c1v,_param.c1dist,_param.c1slope);
+    } else {
+        strcpy(s1,"");
+    }
+
+    if (_param.c2en)
+    {
+        snprintf(s2,63,"[%.2f,%.2f]:{r=%.2f,s=%.2f}, ",_param.c2u,_param.c2v,_param.c2dist,_param.c2slope);
+    } else {
+        strcpy(s2,"");
+    }
+
+    if (_param.c3en)
+    {
+        snprintf(s3,63,"[%.2f,%.2f]:{r=%.2f,s=%.2f}, ",_param.c3u,_param.c3v,_param.c3dist,_param.c3slope);
+    } else {
+        strcpy(s3,"");
+    }
+    snprintf(s,2559," Chroma key: %s%s%s File:%s, Spill control: %d",s1,s2,s3,_param.imagefile.c_str(),_param.spill);
+
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtChromaKey::ADMVideoArtChromaKey(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artChromaKey_param,&_param))
+    {
+        _param.c1en = false;
+        _param.c1u = 0.0;
+        _param.c1v = 0.0;
+        _param.c1dist = 0.0;
+        _param.c1slope = 0.0;
+        _param.c2en =false;
+        _param.c2u = 0.0;
+        _param.c2v = 0.0;
+        _param.c2dist = 0.0;
+        _param.c2slope = 0.0;
+        _param.c3en =false;
+        _param.c3u = 0.0;
+        _param.c3v = 0.0;
+        _param.c3dist = 0.0;
+        _param.c3slope = 0.0;
+        _param.spill = 0;
+    }
+    _backgrnd=new ADMImageDefault(info.width,info.height);
+    _backgrnd->blacken();
+    if(_backgrnd->_range == ADM_COL_RANGE_MPEG)
+        _backgrnd->expandColorRange();
+    reloadImage();
+    update();
+}
+/**
+    \fn reloadImage
+*/
+bool ADMVideoArtChromaKey::reloadImage(void)
+{
+        if(!_param.imagefile.size())
+        {
+            return false;
+        }
+        ADMImage *im2=createImageFromFile(_param.imagefile.c_str());
+        if(!im2) return false;
+        ADMColorScalerFull * scaler = new ADMColorScalerFull(ADM_CS_BICUBIC,im2->GetWidth(PLANAR_Y),im2->GetHeight(PLANAR_Y),_backgrnd->GetWidth(PLANAR_Y),_backgrnd->GetHeight(PLANAR_Y),im2->_pixfrmt,ADM_PIXFRMT_YV12);
+
+        if (scaler) {
+            scaler->convertImage(im2, _backgrnd);
+            if(_backgrnd->_range == ADM_COL_RANGE_MPEG)
+                _backgrnd->expandColorRange();
+            delete scaler;
+        }
+
+        delete im2;
+
+        return true;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoArtChromaKey::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoArtChromaKey::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoArtChromaKey::update(void)
+{
+    _cen[0] = _param.c1en;
+    _cen[1] = _param.c2en;
+    _cen[2] = _param.c3en;
+    _cu[0] = _param.c1u;
+    _cu[1] = _param.c2u;
+    _cu[2] = _param.c3u;
+    _cv[0] = _param.c1v;
+    _cv[1] = _param.c2v;
+    _cv[2] = _param.c3v;
+    _cdist[0] = _param.c1dist;
+    _cdist[1] = _param.c2dist;
+    _cdist[2] = _param.c3dist;
+    _cslope[0] = _param.c1slope;
+    _cslope[1] = _param.c2slope;
+    _cslope[2] = _param.c3slope;
+    _spill = _param.spill;
+
+    for (int i=0; i<3; i++)
+    {
+        _cu[i] = valueLimit(_cu[i], -1.0, 1.0);
+        _cv[i] = valueLimit(_cv[i], -1.0, 1.0);
+        _cdist[i] = valueLimit(_cdist[i], 0.0, 1.0);
+        _cslope[i] = valueLimit(_cslope[i], 0.0, 1.0);
+    }
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtChromaKey::~ADMVideoArtChromaKey()
+{
+    if(_backgrnd) delete _backgrnd;
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtChromaKey::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artChromaKey_param,&_param);
+}
+
+void ADMVideoArtChromaKey::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artChromaKey_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtChromaKey::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtChromaKeyProcess_C(image, _backgrnd, _cen, _cu, _cv, _cdist, _cslope, _spill);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/ADM_vidArtChromaKey.h Added

@@ -0,0 +1,52 @@
+/***************************************************************************
+                          ChromaKey filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoArtChromaKey
+*/
+class  ADMVideoArtChromaKey:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    ADMImage *      _backgrnd;
+    artChromaKey    _param;
+    bool            _cen[3];
+    float           _cu[3];
+    float           _cv[3];
+    float           _cdist[3];
+    float           _cslope[3];
+    uint32_t        _spill;
+  public:
+    ADMVideoArtChromaKey(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtChromaKey();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static void          ArtChromaKeyProcess_C(ADMImage *img, ADMImage *backgrnd, bool * cen, float * cu, float * cv, float * cdist, float * cslope, uint32_t _spill);
+
+  private:
+    static float   valueLimit(float val, float min, float max);
+    static int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+    bool           reloadImage(void);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/CMakeLists.txt Added

@@ -0,0 +1,37 @@
+INCLUDE(vf_plugin)
+
+
+IF(DO_QT4)
+    IF(ADM_QT_VERSION EQUAL 4)
+        SET(QT_TAG qt4)
+    ELSE(ADM_QT_VERSION EQUAL 4)
+        SET(QT_TAG qt5)
+        ADM_QT_ADD_RESOURCES(resource   qt4/artChromaKey.qrc)
+    ENDIF(ADM_QT_VERSION EQUAL 4)
+ENDIF(DO_QT4)
+
+
+SET(ArtChromaKeyCommon_SRCS 
+ADM_vidArtChromaKey.cpp  
+)
+# ---------- QT4 Version ----------------
+INCLUDE(vf_plugin_qt4)
+SET(ArtChromaKeyQT_SRCS  qt4/Q_artChromaKey.cpp)
+SET(ArtChromaKeyQT_HEADERS  qt4/Q_artChromaKey.h)
+SET(ArtChromaKeyQT_UI    qt4/artChromaKey)
+IF(DO_QT4)
+    INIT_VIDEO_FILTER_QT4(ADM_vf_artChromaKey${QT_LIBRARY_EXTENSION} ${ArtChromaKeyQT_SRCS} ${ArtChromaKeyQT_HEADERS} ${ArtChromaKeyQT_UI} ${ArtChromaKeyCommon_SRCS} qt4/DIA_flyArtChromaKey.cpp ${resource})
+    TARGET_LINK_LIBRARIES(ADM_vf_artChromaKey${QT_LIBRARY_EXTENSION} ADM_coreImageLoader6)
+ENDIF(DO_QT4)
+# /QT4
+
+
+
+#------------ Cli Version ----------------
+INCLUDE(vf_plugin_cli)
+SET(ArtChromaKeyCli_SRCS cli/DIA_artChromaKey.cpp)
+IF(DO_CLI)
+    INIT_VIDEO_FILTER_CLI(  ADM_vf_artChromaKeyCli ${ArtChromaKeyCli_SRCS} ${ArtChromaKeyCommon_SRCS})
+    TARGET_LINK_LIBRARIES(ADM_vf_artChromaKeyCli ADM_coreImageLoader6)
+ENDIF(DO_CLI)
+#

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey_desc.cpp Added

@@ -0,0 +1,21 @@
+// automatically generated by admSerialization.py, do not edit!
+extern const ADM_paramList artChromaKey_param[]={
+ {"c1en",offsetof(artChromaKey,c1en),"bool",ADM_param_bool},
+ {"c1u",offsetof(artChromaKey,c1u),"float",ADM_param_float},
+ {"c1v",offsetof(artChromaKey,c1v),"float",ADM_param_float},
+ {"c1dist",offsetof(artChromaKey,c1dist),"float",ADM_param_float},
+ {"c1slope",offsetof(artChromaKey,c1slope),"float",ADM_param_float},
+ {"c2en",offsetof(artChromaKey,c2en),"bool",ADM_param_bool},
+ {"c2u",offsetof(artChromaKey,c2u),"float",ADM_param_float},
+ {"c2v",offsetof(artChromaKey,c2v),"float",ADM_param_float},
+ {"c2dist",offsetof(artChromaKey,c2dist),"float",ADM_param_float},
+ {"c2slope",offsetof(artChromaKey,c2slope),"float",ADM_param_float},
+ {"c3en",offsetof(artChromaKey,c3en),"bool",ADM_param_bool},
+ {"c3u",offsetof(artChromaKey,c3u),"float",ADM_param_float},
+ {"c3v",offsetof(artChromaKey,c3v),"float",ADM_param_float},
+ {"c3dist",offsetof(artChromaKey,c3dist),"float",ADM_param_float},
+ {"c3slope",offsetof(artChromaKey,c3slope),"float",ADM_param_float},
+ {"spill",offsetof(artChromaKey,spill),"uint32_t",ADM_param_uint32_t},
+ {"imagefile",offsetof(artChromaKey,imagefile),"std::string",ADM_param_stdstring},
+{NULL,0,NULL}
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/artChromaKey_json.cpp Added

@@ -0,0 +1,34 @@
+// automatically generated by admSerialization.py, do not edit!
+#include "ADM_default.h"
+#include "ADM_paramList.h"
+#include "ADM_coreJson.h"
+#include "artChromaKey.h"
+bool  artChromaKey_jserialize(const char *file, const artChromaKey *key){
+admJson json;
+json.addBool("c1en",key->c1en);
+json.addFloat("c1u",key->c1u);
+json.addFloat("c1v",key->c1v);
+json.addFloat("c1dist",key->c1dist);
+json.addFloat("c1slope",key->c1slope);
+json.addBool("c2en",key->c2en);
+json.addFloat("c2u",key->c2u);
+json.addFloat("c2v",key->c2v);
+json.addFloat("c2dist",key->c2dist);
+json.addFloat("c2slope",key->c2slope);
+json.addBool("c3en",key->c3en);
+json.addFloat("c3u",key->c3u);
+json.addFloat("c3v",key->c3v);
+json.addFloat("c3dist",key->c3dist);
+json.addFloat("c3slope",key->c3slope);
+json.addUint32("spill",key->spill);
+json.addString("imagefile",key->imagefile);
+return json.dumpToFile(file);
+};
+bool  artChromaKey_jdeserialize(const char *file, const ADM_paramList *tmpl,artChromaKey *key){
+admJsonToCouple json;
+CONFcouple *c=json.readFromFile(file);
+if(!c) {ADM_error("Cannot read json file");return false;}
+bool r= ADM_paramLoadPartial(c,tmpl,key);
+delete c;
+return r;
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/cli/DIA_artChromaKey.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/DIA_flyArtChromaKey.cpp Added

@@ -0,0 +1,71 @@
+/**/
+/***************************************************************************
+                          DIA_ArtChromaKey
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtChromaKey.h"
+#include "Q_artChromaKey.h"
+#include "ADM_vidArtChromaKey.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyArtChromaKey::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtChromaKey::processYuv(ADMImage *in,ADMImage *out )
+{
+    bool cen[3];
+    float cu[3];
+    float cv[3];
+    float cdist[3];
+    float cslope[3];
+    cen[0] = param.c1en;
+    cu[0] = param.c1u;
+    cv[0] = param.c1v;
+    cdist[0] = param.c1dist;
+    cslope[0] = param.c1slope;
+    cen[1] = param.c2en;
+    cu[1] = param.c2u;
+    cv[1] = param.c2v;
+    cdist[1] = param.c2dist;
+    cslope[1] = param.c2slope;
+    cen[2] = param.c3en;
+    cu[2] = param.c3u;
+    cv[2] = param.c3v;
+    cdist[2] = param.c3dist;
+    cslope[2] = param.c3slope;
+    out->duplicate(in);
+
+    Ui_artChromaKeyWindow *parent=(Ui_artChromaKeyWindow *)_parent;
+    // Do it!
+    if (parent)
+    {
+        if (showTestImage)
+            ADMVideoArtChromaKey::ArtChromaKeyProcess_C(out, parent->testimage, cen, cu, cv, cdist, cslope, param.spill);
+        else
+            ADMVideoArtChromaKey::ArtChromaKeyProcess_C(out, parent->image, cen, cu, cv, cdist, cslope, param.spill);
+    }
+    parent = NULL;
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/DIA_flyArtChromaKey.h Added

@@ -0,0 +1,43 @@
+/***************************************************************************
+  \fn     DIA_flyArtChromaKey
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artChromaKey
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTChromaKey_H
+#define FLY_ARTChromaKey_H
+#include "artChromaKey.h"
+#include "ADM_image.h"
+#include <QGraphicsScene>
+/**
+    \class flyArtChromaKey
+*/
+class flyArtChromaKey : public ADM_flyDialogYuv
+{
+
+  public:
+    artChromaKey  param;
+    QGraphicsScene *scene;
+    bool          showTestImage;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyArtChromaKey (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in, ADM_QCanvas *canvas, ADM_QSlider *slider,QGraphicsScene*sc) : 
+        ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {
+            scene=sc;
+        };
+  private:
+    void drawScene();
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.cpp Added

@@ -0,0 +1,557 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_artChromaKey.h"
+#include "ADM_toolkitQt.h"
+#include <cmath>
+#include <QColorDialog>
+#include <QPalette>
+#include <QString>
+#include <QImage>
+#include <QPixmap>
+#include "ADM_imageLoader.h"
+#include "DIA_fileSel.h"
+#include "ADM_last.h"
+
+static void rgb2yuv(int * yuv, int * rgb);
+static void yuv2rgb(int * rgb, int * yuv);
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artChromaKeyWindow::Ui_artChromaKeyWindow(QWidget *parent, artChromaKey *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        admCoreUtils::getLastReadFolder(lastFolder);
+        image = new ADMImageDefault(width, height);
+        image->blacken();
+        if(param->imagefile.size())
+        {
+            if(tryToLoadimage(param->imagefile.c_str()))
+            {
+                imageName=param->imagefile;
+            }
+        }
+        testimage = new ADMImageDefault(width, height);
+        testimage->blacken();
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        scene=new QGraphicsScene(this);
+        ui.graphicsViewUV->setScene(scene);
+        ui.graphicsViewUV->scale(1.0,1.0);
+
+        myFly=new flyArtChromaKey( this,width, height,in,canvas,ui.horizontalSlider, scene);
+        //memcpy(&(myFly->param),param,sizeof(artChromaKey));
+#define COPYPARAMTOFLY(x) \
+            myFly->param.c##x##en = param->c##x##en; \
+            myFly->param.c##x##u = param->c##x##u; \
+            myFly->param.c##x##v = param->c##x##v; \
+            myFly->param.c##x##dist = param->c##x##dist; \
+            myFly->param.c##x##slope = param->c##x##slope;
+        COPYPARAMTOFLY(1);
+        COPYPARAMTOFLY(2);
+        COPYPARAMTOFLY(3);
+        myFly->param.spill = param->spill;
+
+        myFly->showTestImage = false;
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        CHKBOX(C1en);
+        CHKBOX(C2en);
+        CHKBOX(C3en);
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(C1dist,100,2);
+        SPINNER(C1slope,100,2);
+        SPINNER(C2dist,100,2);
+        SPINNER(C2slope,100,2);
+        SPINNER(C3dist,100,2);
+        SPINNER(C3slope,100,2);
+#define PUSHB(x) connect(ui.pushButton##x,SIGNAL(released()),this,SLOT(pushed##x()));
+        PUSHB(C1);
+        PUSHB(C2);
+        PUSHB(C3);
+        connect( ui.pushButtonImage,SIGNAL(pressed()),this,SLOT(imageSelect()));
+        ui.checkBoxTest->setChecked(false);
+        connect(ui.checkBoxTest,SIGNAL(stateChanged(int)),this,SLOT(testImageChanged(int)));
+        connect(ui.comboBoxSpill, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+
+
+
+        setModal(true);
+}
+void Ui_artChromaKeyWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artChromaKeyWindow::gather(artChromaKey *param)
+{
+#define COPYPARAMFROMFLY(x) \
+        param->c##x##en = myFly->param.c##x##en; \
+        param->c##x##u = myFly->param.c##x##u; \
+        param->c##x##v = myFly->param.c##x##v; \
+        param->c##x##dist = myFly->param.c##x##dist; \
+        param->c##x##slope = myFly->param.c##x##slope;
+    myFly->download();
+    //memcpy(param,&(myFly->param),sizeof(artChromaKey));
+    COPYPARAMFROMFLY(1);
+    COPYPARAMFROMFLY(2);
+    COPYPARAMFROMFLY(3);
+    param->spill = myFly->param.spill;
+    param->imagefile=imageName;
+}
+Ui_artChromaKeyWindow::~Ui_artChromaKeyWindow()
+{
+    admCoreUtils::setLastReadFolder(lastFolder);
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+    //if (scene) delete scene;
+    scene=NULL;
+    if (image) delete image;
+    image = NULL;
+    if (testimage) delete testimage;
+    testimage = NULL;
+}
+void Ui_artChromaKeyWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_artChromaKeyWindow::testImageChanged(int f)
+{
+    if (ui.checkBoxTest->isChecked())
+    {
+        myFly->download();
+        if (myFly->param.c1en || myFly->param.c2en || myFly->param.c3en)
+        {
+            float su = 0.0;
+            float sv = 0.0;
+            float sc = 0.0;
+            int iu,iv;
+            if (myFly->param.c1en)
+            {
+                su += myFly->param.c1u;
+                sv += myFly->param.c1v;
+                sc += 1.0;
+            }
+            if (myFly->param.c2en)
+            {
+                su += myFly->param.c2u;
+                sv += myFly->param.c2v;
+                sc += 1.0;
+            }
+            if (myFly->param.c2en)
+            {
+                su += myFly->param.c2u;
+                sv += myFly->param.c2v;
+                sc += 1.0;
+            }
+            su /= sc;
+            sv /= sc;
+            su = std::round(-1.0*su*128+128);
+            sv = std::round(-1.0*sv*128+128);
+            if (su < 0.0) su = 0.0;
+            if (su > 255.0) su = 255.0;
+            if (sv < 0.0) sv = 0.0;
+            if (sv > 255.0) sv = 255.0;
+            iu = su;
+            iv = sv;
+
+            int width=testimage->GetWidth(PLANAR_Y); 
+            int height=testimage->GetHeight(PLANAR_Y);
+            int stride;
+            uint8_t * ptr;
+
+            stride=testimage->GetPitch(PLANAR_Y);
+            ptr=testimage->GetWritePtr(PLANAR_Y);
+            for (int y=0; y<height; y++)
+            {
+                memset(ptr,128,width);
+                ptr += stride;
+            }
+
+            stride=testimage->GetPitch(PLANAR_U);
+            ptr=testimage->GetWritePtr(PLANAR_U);
+            for (int y=0; y<height/2; y++)
+            {
+                memset(ptr,iu,width/2);
+                ptr += stride;
+            }
+
+            stride=testimage->GetPitch(PLANAR_V);
+            ptr=testimage->GetWritePtr(PLANAR_V);
+            for (int y=0; y<height/2; y++)
+            {
+                memset(ptr,iv,width/2);
+                ptr += stride;
+            }
+
+        } else {
+            testimage->blacken();
+        }
+        myFly->showTestImage = true;
+    } else {
+        myFly->showTestImage = false;
+    }
+    if(lock) return;
+    lock++;
+    myFly->sameImage();
+    lock--;
+}
+
+#define PUSHHANDLER(x) \
+    QPalette indctrPalette(ui.lineEditC##x->palette()); \
+    QColor startColor = indctrPalette.color(QPalette::Window); \
+    QColor color = QColorDialog::getColor(startColor, this ); \
+    if( color.isValid() ) \
+    { \
+        int rgb[3],yuv[3]; \
+        color.getRgb(rgb+0,rgb+1,rgb+2, NULL); \
+        rgb2yuv(yuv, rgb); \
+        yuv[0] = 128; \
+        myFly->param.c##x##u = (float)yuv[1]/128.0; \
+        myFly->param.c##x##v = (float)yuv[2]/128.0; \
+        yuv2rgb(rgb, yuv); \
+        color.setRgb(rgb[0],rgb[1],rgb[2],255); \
+        indctrPalette.setColor(QPalette::Window,color); \
+        indctrPalette.setColor(QPalette::Base,color); \
+        indctrPalette.setColor(QPalette::AlternateBase,color); \
+        ui.lineEditC##x->setPalette(indctrPalette); \
+        if(!lock) \
+        { \
+            lock++; \
+            myFly->download(); \
+            myFly->sameImage(); \
+            lock--; \
+        } \
+    }
+
+void Ui_artChromaKeyWindow::pushedC1()
+{
+    PUSHHANDLER(1);
+}
+void Ui_artChromaKeyWindow::pushedC2()
+{
+    PUSHHANDLER(2);
+}
+void Ui_artChromaKeyWindow::pushedC3()
+{
+    PUSHHANDLER(3);
+}
+void Ui_artChromaKeyWindow::imageSelect()
+{
+    char buffer[2048];
+    std::string source;
+    if(imageName.size())
+        source=imageName;
+    else
+        source=lastFolder;
+    if(FileSel_SelectRead(QT_TRANSLATE_NOOP("artChromaKey","Select Background Image"),buffer,2048,source.c_str()))
+    {
+        admCoreUtils::setLastReadFolder(std::string(buffer));
+        if(tryToLoadimage(buffer))
+        {
+            myFly->sameImage();
+        }
+    }
+}
+bool Ui_artChromaKeyWindow::tryToLoadimage(const char *filename)
+{
+    bool status=false;
+    if(strlen(filename))
+    {
+        ADMImage *im2=createImageFromFile(filename);
+        if(im2)
+        {
+            ADMColorScalerFull * scaler = new ADMColorScalerFull(ADM_CS_BICUBIC,im2->GetWidth(PLANAR_Y),im2->GetHeight(PLANAR_Y),image->GetWidth(PLANAR_Y),image->GetHeight(PLANAR_Y),im2->_pixfrmt,ADM_PIXFRMT_YV12);
+            if (scaler)
+            {
+                imageName=std::string(filename);
+                ui.lineEditImage->clear();
+                ui.lineEditImage->insert(QString::fromStdString(imageName));
+
+                scaler->convertImage(im2, image);
+                if(image->_range == ADM_COL_RANGE_MPEG)
+                    image->expandColorRange();
+                delete scaler;
+            }
+            delete im2;
+            status=true;
+        }
+    }
+    return status;
+}
+
+void rgb2yuv(int * yuv, int * rgb)
+{
+    yuv[0] = std::round( 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]);
+    yuv[1] = std::round(-0.169*rgb[0] - 0.331*rgb[1] + 0.500*rgb[2]);
+    yuv[2] = std::round( 0.500*rgb[0] - 0.419*rgb[1] - 0.081*rgb[2]);
+    if (yuv[0] <   0) yuv[0] = 0;
+    if (yuv[0] > 255) yuv[0] = 255;
+    if (yuv[1] < -128) yuv[1] = -128;
+    if (yuv[1] >  127) yuv[1] = 127;
+    if (yuv[2] < -128) yuv[2] = -128;
+    if (yuv[2] >  127) yuv[2] = 127;
+}
+void yuv2rgb(int * rgb, int * yuv)
+{
+    rgb[0] = std::round(yuv[0]                +   1.4*yuv[2]);
+    rgb[1] = std::round(yuv[0] - 0.343*yuv[1] - 0.711*yuv[2]);
+    rgb[2] = std::round(yuv[0] + 1.765*yuv[1]               );
+    for (int i=0; i<3; i++)
+    {
+        if (rgb[i] < 0) rgb[i] = 0;
+        if (rgb[i] > 255) rgb[i] = 255;
+    }
+}
+
+void Ui_artChromaKeyWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artChromaKeyWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADYUV(x) { \
+    QLineEdit * indctr = w->lineEditC##x; \
+    QPalette indctrPalette(indctr->palette()); \
+    QColor color; \
+    yuv[0] = 128; \
+    yuv[1] = (int)round(param.c##x##u*128.0); \
+    yuv[2] = (int)round(param.c##x##v*128.0); \
+    yuv2rgb(rgb, yuv); \
+    color.setRgb(rgb[0],rgb[1],rgb[2],255); \
+    indctrPalette.setColor(QPalette::Window,color); \
+    indctrPalette.setColor(QPalette::Base,color); \
+    indctrPalette.setColor(QPalette::AlternateBase,color); \
+    indctr->setPalette(indctrPalette); \
+    }
+
+//************************
+uint8_t flyArtChromaKey::upload(void)
+{
+    Ui_artChromaKeyDialog *w=(Ui_artChromaKeyDialog *)_cookie;
+
+    MYCHECK(C1en)->setChecked(param.c1en);
+    MYCHECK(C2en)->setChecked(param.c2en);
+    MYCHECK(C3en)->setChecked(param.c3en);
+    MYSPIN(C1dist)->setValue((int)round(param.c1dist*100.0));
+    MYSPIN(C1slope)->setValue((int)round(param.c1slope*100.0));
+    MYSPIN(C2dist)->setValue((int)round(param.c2dist*100.0));
+    MYSPIN(C2slope)->setValue((int)round(param.c2slope*100.0));
+    MYSPIN(C3dist)->setValue((int)round(param.c3dist*100.0));
+    MYSPIN(C3slope)->setValue((int)round(param.c3slope*100.0));
+    MYCOMBOX(Spill)->setCurrentIndex(param.spill);
+
+
+    int rgb[3],yuv[3];
+    UPLOADYUV(1);
+    UPLOADYUV(2);
+    UPLOADYUV(3);
+
+    drawScene();
+    return 1;
+}
+
+uint8_t flyArtChromaKey::download(void)
+{
+    Ui_artChromaKeyDialog *w=(Ui_artChromaKeyDialog *)_cookie;
+    param.c1en=MYCHECK(C1en)->isChecked();
+    param.c2en=MYCHECK(C2en)->isChecked();
+    param.c3en=MYCHECK(C3en)->isChecked();
+    param.c1dist=((float)MYSPIN(C1dist)->value()) / 100.0;
+    param.c1slope=((float)MYSPIN(C1slope)->value()) / 100.0;
+    param.c2dist=((float)MYSPIN(C2dist)->value()) / 100.0;
+    param.c2slope=((float)MYSPIN(C2slope)->value()) / 100.0;
+    param.c3dist=((float)MYSPIN(C3dist)->value()) / 100.0;
+    param.c3slope=((float)MYSPIN(C3slope)->value()) / 100.0;
+    param.spill=MYCOMBOX(Spill)->currentIndex();
+
+    drawScene();
+    return 1;
+}
+void flyArtChromaKey::drawScene()
+{
+    #define YUVmapSize (124)
+    uint8_t * uvplane = (uint8_t*)malloc(YUVmapSize*YUVmapSize);
+    QImage * img = new QImage(YUVmapSize,YUVmapSize,QImage::Format_RGB32);
+    if(scene && uvplane && img)
+    {
+        bool cen[3];
+        float cu[3];
+        float cv[3];
+        float cdist[3];
+        float cslope[3];
+        cen[0] = param.c1en;
+        cu[0] = param.c1u;
+        cv[0] = param.c1v;
+        cdist[0] = param.c1dist;
+        cslope[0] = param.c1slope;
+        cen[1] = param.c2en;
+        cu[1] = param.c2u;
+        cv[1] = param.c2v;
+        cdist[1] = param.c2dist;
+        cslope[1] = param.c2slope;
+        cen[2] = param.c3en;
+        cu[2] = param.c3u;
+        cv[2] = param.c3v;
+        cdist[2] = param.c3dist;
+        cslope[2] = param.c3slope;
+        float fi,fj;
+        float diff,slp;
+        uint8_t uvcurr,uvnew;
+        if (cen[0] || cen[1] || cen[2])
+            memset(uvplane, 0, YUVmapSize*YUVmapSize);
+        else
+            memset(uvplane, 255, YUVmapSize*YUVmapSize);    // if no one enabled --> show full colors
+
+        for (int c=0; c<3; c++)
+        {
+            if (!cen[c]) continue;
+            for (int i=0; i<YUVmapSize; i++) for(int j=0; j<YUVmapSize; j++)
+            {
+                fi = ((float)i-YUVmapSize/2.0)/(YUVmapSize/2.0);
+                fj = ((float)j-YUVmapSize/2.0)/(YUVmapSize/2.0);
+                diff = std::sqrt(((cu[c]-fi)*(cu[c]-fi) + (cv[c]-fj)*(cv[c]-fj))) - cdist[c];
+                if (diff <= 0) uvplane[i*YUVmapSize+j] = 255;
+                else {
+                    uvcurr = uvplane[i*YUVmapSize+j];
+                    if ((diff > cslope[c]) || (cslope[c] == 0.0)) uvnew = 0;
+                    else {
+                        slp = (diff / cslope[c]);
+                        if (slp < 0) slp = 0;
+                        if (slp > 1) slp = 1;
+                        uvnew = std::floor(255.0 - 255.0*slp);
+                    }
+                    if (uvnew > uvcurr) uvplane[i*YUVmapSize+j] = uvnew;
+                }
+            }
+        }
+
+        int rgb[3],yuv[3];
+
+        for (int i=0; i<YUVmapSize; i++) for(int j=0; j<YUVmapSize; j++)
+        {
+            fi = ((float)uvplane[i*YUVmapSize+j]/255.0)*((float)i-YUVmapSize/2.0)/(YUVmapSize/2.0);
+            fj = ((float)uvplane[i*YUVmapSize+j]/255.0)*((float)j-YUVmapSize/2.0)/(YUVmapSize/2.0);
+            yuv[0] = uvplane[i*YUVmapSize+j]>>1;
+            yuv[1] = std::floor(fi*128.0);
+            yuv[2] = std::floor(fj*128.0);
+            yuv2rgb(rgb, yuv);
+            img->setPixel(i,(YUVmapSize-1-j),qRgb(rgb[0],rgb[1],rgb[2]));
+        }
+        scene->clear();
+        scene->addPixmap( QPixmap::fromImage(*img)); 
+    }
+    if (img) delete img;
+    img = NULL;
+    if (uvplane) free(uvplane);
+    uvplane = NULL;
+}
+void flyArtChromaKey::setTabOrder(void)
+{
+    Ui_artChromaKeyDialog *w=(Ui_artChromaKeyDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSHME(x) controls.push_back(w->x);
+    PUSHME(pushButtonImage)
+    PUSHME(checkBoxTest)
+    PUSHME(comboBoxSpill)
+#undef PUSHME
+#define PUSHME(x) controls.push_back(MYCHECK(x##en));  controls.push_back(w->pushButton##x); \
+                  controls.push_back(MYSPIN(x##dist)); controls.push_back(MYSPIN(x##slope));
+    PUSHME(C1)
+    PUSHME(C2)
+    PUSHME(C3)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtChromaKey(artChromaKey *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artChromaKeyWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/Q_artChromaKey.h Added

@@ -0,0 +1,49 @@
+#ifndef Q_artChromaKey_h
+#define Q_artChromaKey_h
+#include "ui_artChromaKey.h"
+#include "ADM_image.h"
+#include "artChromaKey.h"
+#include "DIA_flyDialogQt4.h"
+#include "DIA_flyArtChromaKey.h"
+#include <QGraphicsScene>
+
+class Ui_artChromaKeyWindow : public QDialog
+{
+    Q_OBJECT
+
+  protected:
+    int lock;
+    std::string            lastFolder;
+    flyArtChromaKey *      myFly;
+    ADM_QCanvas *          canvas;
+    QGraphicsScene *       scene;
+    Ui_artChromaKeyDialog  ui;
+
+    bool                   tryToLoadimage(const char *filename);
+
+  public:
+    Ui_artChromaKeyWindow(QWidget *parent, artChromaKey *param,ADM_coreVideoFilter *in);
+    ~Ui_artChromaKeyWindow();
+
+    std::string         imageName;
+    ADMImage            *image;
+    ADMImage            *testimage;
+
+  public slots:
+    void gather(artChromaKey *param);
+
+  private slots:
+    void sliderUpdate(int foo);
+    void valueChanged(int foo);
+    void testImageChanged(int foo);
+    void pushedC1();
+    void pushedC2();
+    void pushedC3();
+    void imageSelect();
+
+
+  private:
+    void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
+};
+#endif    // Q_artChromaKey_h

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.qrc Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/artChromaKey.ui Added

@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artChromaKeyDialog</class>
+ <widget class="QDialog" name="artChromaKeyDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>609</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Chroma Key</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="4" column="1">
+      <widget class="QPushButton" name="pushButtonC1">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="artChromaKey.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QCheckBox" name="checkBoxC1en">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>Primary</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="5">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC3slope">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2">
+      <widget class="QLineEdit" name="lineEditC1">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QCheckBox" name="checkBoxC3en">
+       <property name="text">
+        <string>Tertiary</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QCheckBox" name="checkBoxC2en">
+       <property name="text">
+        <string>Secondary</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="5">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC1slope">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QPushButton" name="pushButtonC3">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="artChromaKey.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QPushButton" name="pushButtonC2">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="artChromaKey.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="2">
+      <widget class="QLineEdit" name="lineEditC2">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="2">
+      <widget class="QLineEdit" name="lineEditC3">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="5">
+      <widget class="QLabel" name="labelSlope">
+       <property name="text">
+        <string>Cutoff slope</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" colspan="2">
+      <widget class="QLabel" name="labelChroma">
+       <property name="text">
+        <string>Pick Chroma</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="5">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC2slope">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="6" rowspan="3">
+      <widget class="QGraphicsView" name="graphicsViewUV">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>128</width>
+         <height>128</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>128</width>
+         <height>128</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QPushButton" name="pushButtonImage">
+       <property name="text">
+        <string>Select image</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" colspan="3">
+      <widget class="QCheckBox" name="checkBoxTest">
+       <property name="text">
+        <string>Show calibration background</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <widget class="QComboBox" name="comboBoxSpill">
+       <item>
+        <property name="text">
+         <string>No spill control</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Weighted alpha</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>AVG alpha</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>RMS alpha</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>MIN alpha</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="1" colspan="6">
+      <widget class="QLineEdit" name="lineEditImage">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="3" colspan="2">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC1dist">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="3" colspan="2">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC2dist">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="3" colspan="2">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderC3dist">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="3" colspan="2">
+      <widget class="QLabel" name="labelDistance">
+       <property name="text">
+        <string>Distance</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="4">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="5">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>pushButtonImage</tabstop>
+  <tabstop>checkBoxTest</tabstop>
+  <tabstop>comboBoxSpill</tabstop>
+  <tabstop>checkBoxC1en</tabstop>
+  <tabstop>pushButtonC1</tabstop>
+  <tabstop>lineEditC1</tabstop>
+  <tabstop>horizontalSliderC1dist</tabstop>
+  <tabstop>horizontalSliderC1slope</tabstop>
+  <tabstop>checkBoxC2en</tabstop>
+  <tabstop>pushButtonC2</tabstop>
+  <tabstop>lineEditC2</tabstop>
+  <tabstop>horizontalSliderC2dist</tabstop>
+  <tabstop>horizontalSliderC2slope</tabstop>
+  <tabstop>checkBoxC3en</tabstop>
+  <tabstop>pushButtonC3</tabstop>
+  <tabstop>lineEditC3</tabstop>
+  <tabstop>horizontalSliderC3dist</tabstop>
+  <tabstop>horizontalSliderC3slope</tabstop>
+  <tabstop>graphicsViewUV</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
+ <resources>
+  <include location="artChromaKey.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artChromaKeyDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artChromaKeyDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artChromaKey/qt4/color.png Added

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artColorEffect/ADM_vidArtColorEffect.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artColorEffect/qt4/Q_artColorEffect.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artColorEffect/qt4/Q_artColorEffect.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.cpp Added

@@ -0,0 +1,232 @@
+/***************************************************************************
+                          DynThreshold filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artDynThreshold.h"
+#include "artDynThreshold_desc.cpp"
+#include "ADM_vidArtDynThreshold.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getArtDynThreshold(artDynThreshold *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtDynThreshold,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtDynThreshold,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artDynThreshold",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artDynThreshold","Dynamic Threshold"),            // Display name
+                                      QT_TRANSLATE_NOOP("artDynThreshold","Adaptive luma thresholding ") // Description
+                                  );
+
+/**
+    \fn ArtDynThresholdProcess_C
+*/
+void ADMVideoArtDynThreshold::ArtDynThresholdProcess_C(ADMImage *img, uint32_t levels, float offset)
+{
+    if (!img) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int stride;
+    uint8_t * ptr;
+    unsigned int hyst[256];
+    unsigned int sum = width*height;
+    uint8_t luma[256];
+
+    if (levels < 2) levels = 2;
+    if (levels > 16) levels = 16;
+    if (offset < -1) offset = -1;
+    if (offset > 1) offset = 1;
+
+    memset(hyst, 0, 256*sizeof(unsigned int));
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+        img->expandColorRange();
+
+    // Y plane
+    // create hystogram
+    stride=img->GetPitch(PLANAR_Y);
+    ptr=img->GetWritePtr(PLANAR_Y);
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            hyst[ptr[x]]++;
+        }
+        ptr+=stride;
+    }
+
+    // create luma
+    int acum = 0;
+    int step = 1;
+    uint8_t l = 0;
+    for (int i=0; i<256; i++)
+    {
+        acum += hyst[i];
+        if (acum > (((step+offset)*sum)/levels))
+        {
+            int ll = ((step*256)/(levels-1)) - 1;
+            l = ((ll>255) ? 255 : ll); 
+            step++;
+        }
+        luma[i] = l;
+    }
+
+    //apply luma
+    stride=img->GetPitch(PLANAR_Y);
+    ptr=img->GetWritePtr(PLANAR_Y);
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            ptr[x] = luma[ptr[x]];
+        }
+        ptr+=stride;
+    }
+
+    // blacken UV planes
+   for (int p=1; p<3; p++)
+    {
+        stride=img->GetPitch((ADM_PLANE)p);
+        ptr=img->GetWritePtr((ADM_PLANE)p);
+        memset(ptr, 128, (height/2)*stride);
+    }
+
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtDynThreshold::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtDynThreshold(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoArtDynThreshold::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255,"Levels:%d, Offset:%.2f", _param.levels,_param.offset);
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtDynThreshold::ADMVideoArtDynThreshold(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artDynThreshold_param,&_param))
+        reset(&_param);
+    update();
+}
+/**
+    \fn reset
+*/
+void ADMVideoArtDynThreshold::reset(artDynThreshold *cfg)
+{
+    cfg->levels = 2;
+    cfg->offset = 0.0;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoArtDynThreshold::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoArtDynThreshold::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoArtDynThreshold::update(void)
+{
+    _levels=valueLimit(_param.levels,2,16);
+    _offset=valueLimit(_param.offset,-1.0,1.0);
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtDynThreshold::~ADMVideoArtDynThreshold()
+{
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtDynThreshold::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artDynThreshold_param,&_param);
+}
+
+void ADMVideoArtDynThreshold::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artDynThreshold_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtDynThreshold::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtDynThresholdProcess_C(image, _levels, _offset);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/ADM_vidArtDynThreshold.h Added

@@ -0,0 +1,48 @@
+/***************************************************************************
+                          DynThreshold filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoArtDynThreshold
+*/
+class  ADMVideoArtDynThreshold:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    artDynThreshold     _param;
+    uint32_t         _levels;
+    float            _offset;
+  public:
+    ADMVideoArtDynThreshold(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtDynThreshold();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static  void         ArtDynThresholdProcess_C(ADMImage *img, uint32_t levels, float offset);
+    static  void         reset(artDynThreshold *cfg);
+
+  private:
+    float   valueLimit(float val, float min, float max);
+    int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/artDynThreshold_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/cli/DIA_artDynThreshold.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/DIA_flyArtDynThreshold.cpp Added

@@ -0,0 +1,47 @@
+/**/
+/***************************************************************************
+                          DIA_ArtDynThreshold
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtDynThreshold.h"
+
+#include "ADM_vidArtDynThreshold.h"
+
+/************* COMMON PART *********************/
+/**
+    \fn update
+*/
+uint8_t  flyArtDynThreshold::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtDynThreshold::processYuv(ADMImage *in,ADMImage *out )
+{
+    uint8_t *src,*dst;
+    uint32_t stride;
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoArtDynThreshold::ArtDynThresholdProcess_C(out, param.levels, param.offset);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/DIA_flyArtDynThreshold.h Added

@@ -0,0 +1,36 @@
+/***************************************************************************
+  \fn     DIA_flyArtDynThreshold
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artDynThreshold
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTDynThreshold_H
+#define FLY_ARTDynThreshold_H
+#include "artDynThreshold.h"
+/**
+    \class flyArtDynThreshold
+*/
+class flyArtDynThreshold : public ADM_flyDialogYuv
+{
+
+  public:
+    artDynThreshold  param;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyArtDynThreshold (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider): ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+    virtual    ~flyArtDynThreshold() {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/Q_artDynThreshold.cpp Added

@@ -0,0 +1,178 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_artDynThreshold.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidArtDynThreshold.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artDynThresholdWindow::Ui_artDynThresholdWindow(QWidget *parent, artDynThreshold *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyArtDynThreshold( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(artDynThreshold));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(Levels,1,0)
+        SPINNER(Offset,100,2)
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_artDynThresholdWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artDynThresholdWindow::gather(artDynThreshold *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(artDynThreshold));
+}
+Ui_artDynThresholdWindow::~Ui_artDynThresholdWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_artDynThresholdWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_artDynThresholdWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoArtDynThreshold::reset(&myFly->param);
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_artDynThresholdWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artDynThresholdWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYCHECK(x) w->checkBox##x
+//************************
+uint8_t flyArtDynThreshold::upload(void)
+{
+    Ui_artDynThresholdDialog *w=(Ui_artDynThresholdDialog *)_cookie;
+
+    MYSPIN(Levels)->setValue((int)param.levels);
+    MYSPIN(Offset)->setValue((int)round(param.offset*100.0));
+    return 1;
+}
+uint8_t flyArtDynThreshold::download(void)
+{
+    Ui_artDynThresholdDialog *w=(Ui_artDynThresholdDialog *)_cookie;
+    param.levels=(int)MYSPIN(Levels)->value();
+    param.offset=((float)MYSPIN(Offset)->value() / 100.0);
+    return 1;
+}
+void flyArtDynThreshold::setTabOrder(void)
+{
+    Ui_artDynThresholdDialog *w=(Ui_artDynThresholdDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    PUSH_SPIN(Levels)
+    PUSH_SPIN(Offset)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtDynThreshold(artDynThreshold *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artDynThresholdWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/Q_artDynThreshold.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artDynThreshold/qt4/artDynThreshold.ui Added

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artDynThresholdDialog</class>
+ <widget class="QDialog" name="artDynThresholdDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dynamic Threshold</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="0" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderLevels">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>16</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelLevels">
+       <property name="text">
+        <string>Levels</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelOffset">
+       <property name="text">
+        <string>Offset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderOffset">
+       <property name="minimum">
+        <number>-100</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>20</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artDynThresholdDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artDynThresholdDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.cpp Added

@@ -0,0 +1,284 @@
+/***************************************************************************
+                          Grid filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artGrid.h"
+#include "artGrid_desc.cpp"
+#include "ADM_vidArtGrid.h"
+
+extern uint8_t DIA_getArtGrid(artGrid *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtGrid,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtGrid,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artGrid",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artGrid","Grid"),            // Display name
+                                      QT_TRANSLATE_NOOP("artGrid","Video wall effect.") // Description
+                                  );
+/**
+    \fn ArtGridProcess_C
+*/
+void ADMVideoArtGrid::ArtGridProcess_C(ADMImage *img, ADMImage *tmp, uint32_t size, bool roll)
+{
+    if (!img || !tmp) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    uint8_t * plane[3], * tplane[3];
+    int stride[3], tstride[3];
+    int p;
+    uint8_t * ptr, * iptr;
+    int * line;
+
+    if (size <= 1) return;    // nop
+    if (size > 8) size = 8;
+    int wg[3];
+    int hg[3];
+    wg[0] = (width/(size*2))*2;
+    wg[2] = wg[1] = wg[0]/2;
+    hg[0] = (height/(size*2))*2;
+    hg[2] = hg[1] = hg[0]/2;
+
+    line = (int*)malloc(wg[0]*sizeof(int));
+    if (!line) return;
+
+    img->GetPitches(stride);
+    img->GetWritePlanes(plane);
+    tmp->GetPitches(tstride);
+    tmp->GetWritePlanes(tplane);
+
+    //roll
+    if (roll)
+    {
+        for (p=0; p<3; p++)
+        {
+            for (int y=(size-1); y>=0; y--)
+            {
+                for (int x=(size-1); x>=0; x--)
+                {
+                    if ((x==0) && (y==0)) break;
+                    if (x==0)
+                    {
+                        for(int l=0; l<hg[p]; l++)
+                        {
+                            memcpy(&tplane[p][(y*hg[p]+l)*tstride[p] + x*wg[p]], &tplane[p][((y-1)*hg[p]+l)*tstride[p] + (size-1)*wg[p]], wg[p]);
+                        }
+                    } else {
+                        for(int l=0; l<hg[p]; l++)
+                        {
+                            memcpy(&tplane[p][(y*hg[p]+l)*tstride[p] + x*wg[p]], &tplane[p][(y*hg[p]+l)*tstride[p] + (x-1)*wg[p]], wg[p]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // scale
+    for (p=0; p<3; p++)
+    {
+        int xc,yc,xp,yp;
+        xc=0;
+        yc=0;
+        xp=0;
+        yp=0;
+        memset(line,0,wg[p]*sizeof(int));
+        for (int y=0; y<(hg[p]*size); y++)
+        {
+            xc=0;
+            xp=0;
+            for (int x=0; x<(wg[p]*size); x++)
+            {
+                line[xp] += plane[p][x];
+                xc++;
+                if (xc == size)
+                {
+                    xc = 0;
+                    xp++;
+                }
+            }
+            yc++;
+            if (yc == size)
+            {
+                yc = 0;
+                for (int x=0; x<wg[p]; x++)
+                {
+                    tplane[p][yp*tstride[p] + x] = line[x] / (size*size);
+                }
+                memset(line,0,wg[p]*sizeof(int));
+                yp++;
+            }
+            plane[p] += stride[p];
+        }
+    }
+
+    //duplicate
+    if (roll)
+    {
+        uint64_t keep = img->Pts;
+        ADM_colorRange range = img->_range;
+        img->duplicate(tmp);
+        img->Pts = keep;
+        img->_range = range;
+    } else {
+        img->GetWritePlanes(plane);
+        img->blacken();
+        for (p=0; p<3; p++)
+        {
+            for (int y=0; y<size; y++)
+            {
+                for (int x=0; x<size; x++)
+                {
+                    for(int l=0; l<hg[p]; l++)
+                    {
+                        memcpy(&plane[p][(y*hg[p]+l)*stride[p] + x*wg[p]], &tplane[p][l*tstride[p]], wg[p]);
+                    }
+                }
+            }
+        }
+    }
+
+    free(line);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtGrid::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtGrid(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoArtGrid::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255,"Grid size: %dx%d, Roll previous frames: %d", _param.size, _param.size, (_param.roll ? 1:0));
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtGrid::ADMVideoArtGrid(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artGrid_param,&_param))
+        reset(&_param);
+    work=new ADMImageDefault(info.width,info.height);
+    work->blacken();
+    update();
+}
+/**
+    \fn reset
+*/
+void ADMVideoArtGrid::reset(artGrid *cfg)
+{
+    cfg->size = 2;
+    cfg->roll = false;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoArtGrid::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoArtGrid::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoArtGrid::update(void)
+{
+    _size=valueLimit(_param.size,1,8);
+    _roll=_param.roll;
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtGrid::~ADMVideoArtGrid()
+{
+    if(work) delete work;
+    work=NULL;
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtGrid::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artGrid_param,&_param);
+}
+
+void ADMVideoArtGrid::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artGrid_param, &_param);
+}
+
+/**
+    \fn goToTime
+*/
+bool ADMVideoArtGrid::goToTime(uint64_t usec)
+{
+    if(_roll)
+        work->blacken();
+    return previousFilter->goToTime(usec);
+}
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtGrid::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtGridProcess_C(image, work,_size, _roll);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/ADM_vidArtGrid.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+                          Grid filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoArtGrid
+*/
+class  ADMVideoArtGrid:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    artGrid         _param;
+    uint32_t        _size;
+    bool            _roll;
+    ADMImage        *work;
+  public:
+    ADMVideoArtGrid(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtGrid();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+    virtual bool         goToTime(uint64_t usec);
+
+    static  void         ArtGridProcess_C(ADMImage *img, ADMImage *tmp, uint32_t size, bool work);
+    static  void         reset(artGrid *cfg);
+
+  private:
+    float   valueLimit(float val, float min, float max);
+    int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/artGrid.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/artGrid.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/artGrid_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/artGrid_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/cli/DIA_artGrid.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/qt4/DIA_flyArtGrid.cpp Added

@@ -0,0 +1,77 @@
+/**/
+/***************************************************************************
+                          DIA_ArtGrid
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtGrid.h"
+
+#include "ADM_vidArtGrid.h"
+
+/************* COMMON PART *********************/
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+flyArtGrid::flyArtGrid (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    work=  new ADMImageDefault(_w,_h);
+    work->blacken();
+}
+/**
+    \fn dtor
+*/
+flyArtGrid::~flyArtGrid()
+{
+    delete work;
+    work=NULL;
+}
+/**
+    \fn update
+*/
+uint8_t  flyArtGrid::update(void)
+{
+    return 1;
+}
+/**
+    \fn goToTime
+*/
+bool flyArtGrid::goToTime(uint64_t time)
+{
+    if(param.roll)
+        work->blacken();
+    return ADM_flyDialog::goToTime(time);
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtGrid::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoArtGrid::ArtGridProcess_C(out, work, param.size, param.roll);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/qt4/DIA_flyArtGrid.h Added

@@ -0,0 +1,39 @@
+/***************************************************************************
+  \fn     DIA_flyArtGrid
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artGrid
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTGrid_H
+#define FLY_ARTGrid_H
+#include "artGrid.h"
+/**
+    \class flyArtGrid
+*/
+class flyArtGrid : public ADM_flyDialogYuv
+{
+  private:
+    ADMImage   *work;
+  public:
+    artGrid    param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       blacken(void) { work->blacken(); }
+    void       setTabOrder(void);
+               flyArtGrid (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+    virtual    ~flyArtGrid() ;
+    virtual bool goToTime(uint64_t time);
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/qt4/Q_artGrid.cpp Added

@@ -0,0 +1,209 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_artGrid.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidArtGrid.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artGridWindow::Ui_artGridWindow(QWidget *parent, artGrid *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyArtGrid( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(artGrid));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSpinBox(int)));
+        SPINNER(Size)
+
+#define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        CHKBOX(Roll);
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_artGridWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artGridWindow::gather(artGrid *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(artGrid));
+}
+Ui_artGridWindow::~Ui_artGridWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.spinBox##x->blockSignals(true); \
+        ui.spinBox##x->setValue(ui.horizontalSlider##x->value()); \
+        ui.spinBox##x->blockSignals(false);
+void Ui_artGridWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Size);
+    myFly->download();
+    myFly->blacken();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue(ui.spinBox##x->value()); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_artGridWindow::valueChangedSpinBox(int foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Size);
+    myFly->download();
+    myFly->blacken();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_artGridWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoArtGrid::reset(&myFly->param);
+    myFly->upload();
+    myFly->blacken();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_artGridWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artGridWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSLIDER(x) w->horizontalSlider##x
+#define MYSPIN(x) w->spinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADSPIN(x, value) \
+        w->spinBox##x->blockSignals(true); \
+        w->spinBox##x->setValue(value); \
+        w->spinBox##x->blockSignals(false);
+//************************
+uint8_t flyArtGrid::upload(void)
+{
+    Ui_artGridDialog *w=(Ui_artGridDialog *)_cookie;
+
+    MYSLIDER(Size)->setValue((int)param.size);
+    UPLOADSPIN(Size, param.size);
+    MYCHECK(Roll)->setChecked(param.roll);
+    return 1;
+}
+uint8_t flyArtGrid::download(void)
+{
+    Ui_artGridDialog *w=(Ui_artGridDialog *)_cookie;
+    param.size=(int)MYSLIDER(Size)->value();
+    param.roll=MYCHECK(Roll)->isChecked();
+    return 1;
+}
+void flyArtGrid::setTabOrder(void)
+{
+    Ui_artGridDialog *w=(Ui_artGridDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    PUSH_SLIDER(Size)
+    PUSH_SPIN(Size)
+    PUSH_TOG(Roll)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtGrid(artGrid *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artGridWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/qt4/Q_artGrid.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artGrid/qt4/artGrid.ui Added

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artGridDialog</class>
+ <widget class="QDialog" name="artGridDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Grid</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="0" column="1">
+      <widget class="QSlider" name="horizontalSliderSize">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>8</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelHScatter">
+       <property name="text">
+        <string>Grid size</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="2">
+      <widget class="QSpinBox" name="spinBoxSize">
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>8</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkBoxRoll">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Roll previous frames</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artGridDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artGridDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.cpp Added

@@ -0,0 +1,329 @@
+/***************************************************************************
+                          Mirror filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artMirror.h"
+#include "artMirror_desc.cpp"
+#include "ADM_vidArtMirror.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getArtMirror(artMirror *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtMirror,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtMirror,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artMirror",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artMirror","Mirror"),            // Display name
+                                      QT_TRANSLATE_NOOP("artMirror","Mirror horizontally or vertically.") // Description
+                                  );
+/**
+    \fn ArtMirrorProcess_C
+*/
+void ADMVideoArtMirror::ArtMirrorProcess_C(ADMImage *img, uint32_t method, float displacement)
+{
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int stride[3];
+    uint8_t * ptr[3];
+    uint8_t * src, * dst;
+    int displ;
+    int x,y;
+    float pixel;
+/*case 0	"Horizontal, Keep left, ";
+case 1	"Horizontal, Keep right, ";
+case 2	"Vertical, Keep top, ";
+case 3	"Vertical, Keep bottom, ";*/
+
+    img->GetPitches(stride);
+    img->GetWritePlanes(ptr);
+
+    if (method & 0x2)    // Vertical
+    {
+        displ = (int)std::round((displacement * (float)height)/2.0);
+        displ = valueLimit(displ, 0, height/2);
+        displ = (displ >> 1) << 1;    // must be even
+
+        if (method & 0x1)    // Keep bottom
+        {
+            if (displ > 0)    // apply displacement
+            {
+                for(y=(height-1);y>=(height/2);y--)
+                {
+                    memcpy(ptr[0]+y*stride[0], ptr[0]+(y-displ)*stride[0], width);
+                }
+                for(y=(height/2-1);y>=(height/4);y--)
+                {
+                    memcpy(ptr[1]+y*stride[1], ptr[1]+(y-displ/2)*stride[1], (width/2));
+                    memcpy(ptr[2]+y*stride[2], ptr[2]+(y-displ/2)*stride[2], (width/2));
+                }
+            }
+            for (y=0; y<(height/2);y++) {
+                memcpy(ptr[0]+y*stride[0], ptr[0]+((height-1)-y)*stride[0], width);
+            }
+            for (y=0; y<(height/4);y++) {
+                memcpy(ptr[1]+y*stride[1], ptr[1]+((height/2-1)-y)*stride[1], (width/2));
+                memcpy(ptr[2]+y*stride[2], ptr[2]+((height/2-1)-y)*stride[2], (width/2));
+            }
+        } else {    // Keep top
+            if (displ > 0)    // apply displacement
+            {
+                for(y=0;y<(height/2);y++)
+                {
+                    memcpy(ptr[0]+y*stride[0], ptr[0]+(y+displ)*stride[0], width);
+                }
+                for(y=0;y<(height/4);y++)
+                {
+                    memcpy(ptr[1]+y*stride[1], ptr[1]+(y+displ/2)*stride[1], (width/2));
+                    memcpy(ptr[2]+y*stride[2], ptr[2]+(y+displ/2)*stride[2], (width/2));
+                }
+            }
+            for (y=(height/2); y<height;y++) {
+                memcpy(ptr[0]+y*stride[0], ptr[0]+((height-1)-y)*stride[0], width);
+            }
+            for (y=(height/4); y<(height/2);y++) {
+                memcpy(ptr[1]+y*stride[1], ptr[1]+((height/2-1)-y)*stride[1], (width/2));
+                memcpy(ptr[2]+y*stride[2], ptr[2]+((height/2-1)-y)*stride[2], (width/2));
+            }
+        } 
+    } else {    // Horizontal
+        displ = (int)std::round((displacement * (float)width)/2.0);
+        displ = valueLimit(displ, 0, width/2);
+        displ = (displ >> 1) << 1;    // must be even
+
+        if (method & 0x1)    // Keep right
+        {
+            if (displ > 0)    // apply displacement
+            {
+                for(y=0;y<height;y++)
+                {
+                    memmove(ptr[0]+y*stride[0]+width/2, ptr[0]+y*stride[0]+(width/2-displ), (width/2));
+                }
+                for(y=0;y<(height/2);y++)
+                {
+                    memmove(ptr[1]+y*stride[1]+width/4, ptr[1]+y*stride[1]+(width/4-displ/2), (width/4));
+                    memmove(ptr[2]+y*stride[2]+width/4, ptr[2]+y*stride[2]+(width/4-displ/2), (width/4));
+                }
+            }
+            for(y=0;y<height;y++)
+            {
+                src = ptr[0]+y*stride[0]+(width/2);
+                dst = ptr[0]+y*stride[0]+(width/2)-1;
+                for (x=0; x<(width/2); x++)
+                {
+                    *dst = *src;
+                    dst--; src++;
+                }
+            }
+            for(y=0;y<(height/2);y++)
+            {
+                src = ptr[1]+y*stride[1]+(width/4);
+                dst = ptr[1]+y*stride[1]+(width/4)-1;
+                for (x=0; x<(width/4); x++)
+                {
+                    *dst = *src;
+                    dst--; src++;
+                }
+                src = ptr[2]+y*stride[2]+(width/4);
+                dst = ptr[2]+y*stride[2]+(width/4)-1;
+                for (x=0; x<(width/4); x++)
+                {
+                    *dst = *src;
+                    dst--; src++;
+                }
+            }
+        } else {    // Keep left
+            {
+                for(y=0;y<height;y++)
+                {
+                    memmove(ptr[0]+y*stride[0], ptr[0]+y*stride[0]+displ, (width/2));
+                }
+                for(y=0;y<(height/2);y++)
+                {
+                    memmove(ptr[1]+y*stride[1], ptr[1]+y*stride[1]+displ/2, (width/4));
+                    memmove(ptr[2]+y*stride[2], ptr[2]+y*stride[2]+displ/2, (width/4));
+                }
+            }
+            for(y=0;y<height;y++)
+            {
+                src = ptr[0]+y*stride[0];
+                dst = ptr[0]+y*stride[0]+(width-1);
+                for (x=0; x<(width/2); x++)
+                {
+                    *dst = *src;
+                    dst--; src++;
+                }
+            }
+            for(y=0;y<(height/2);y++)
+            {
+                src = ptr[1]+y*stride[1];
+                dst = ptr[1]+y*stride[1]+(width/2-1);
+                for (x=0; x<(width/4); x++)
+                {
+                    *dst = *src;
+                    dst--; src++;
+                }
+                src = ptr[2]+y*stride[2];
+                dst = ptr[2]+y*stride[2]+(width/2-1);
+                for (x=0; x<(width/4); x++)
+                {
+                    *dst = *src;
+                    dst--; src++;
+                }
+            }
+        } 
+    }
+
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtMirror::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtMirror(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoArtMirror::getConfiguration(void)
+{
+    static char s[256];
+    const char *m;
+    switch(_param.method)
+    {
+        case 0:
+                m = "Horizontal, Keep left, ";
+            break;
+        case 1:
+                m = "Horizontal, Keep right, ";
+            break;
+        case 2:
+                m = "Vertical, Keep top, ";
+            break;
+        default:
+        case 3:
+                m = "Vertical, Keep bottom, ";
+            break;
+    }
+    snprintf(s,255,"%s Displacement: %.2f",m,_param.displacement);
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtMirror::ADMVideoArtMirror(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artMirror_param,&_param))
+    {
+        _param.method = 0;
+        _param.displacement = 0.0;
+    }
+    update();
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoArtMirror::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoArtMirror::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoArtMirror::update(void)
+{
+    _method=_param.method;
+    if (_method > 3) _method = 3;
+    _displacement=valueLimit(_param.displacement,0.0,1.0);
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtMirror::~ADMVideoArtMirror()
+{
+    
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtMirror::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artMirror_param,&_param);
+}
+
+void ADMVideoArtMirror::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artMirror_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtMirror::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtMirrorProcess_C(image, _method, _displacement);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/ADM_vidArtMirror.h Added

@@ -0,0 +1,46 @@
+/***************************************************************************
+                          Mirror filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoArtMirror
+*/
+class  ADMVideoArtMirror:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    artMirror       _param;
+    uint32_t        _method;
+    float           _displacement;
+  public:
+    ADMVideoArtMirror(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtMirror();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static void          ArtMirrorProcess_C(ADMImage *img, uint32_t method, float displacement);
+
+  private:
+    static float   valueLimit(float val, float min, float max);
+    static int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/artMirror.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/artMirror.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/artMirror_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/artMirror_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/cli/DIA_artMirror.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/qt4/DIA_flyArtMirror.cpp Added

@@ -0,0 +1,46 @@
+/**/
+/***************************************************************************
+                          DIA_ArtMirror
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtMirror.h"
+
+#include "ADM_vidArtMirror.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyArtMirror::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtMirror::processYuv(ADMImage *in,ADMImage *out )
+{
+    uint8_t *src,*dst;
+    uint32_t stride;
+
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoArtMirror::ArtMirrorProcess_C(out, param.method ,param.displacement);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/qt4/DIA_flyArtMirror.h Added

@@ -0,0 +1,34 @@
+/***************************************************************************
+  \fn     DIA_flyArtMirror
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artMirror
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTMirror_H
+#define FLY_ARTMirror_H
+#include "artMirror.h"
+/**
+    \class flyArtMirror
+*/
+class flyArtMirror : public ADM_flyDialogYuv
+{
+
+  public:
+    artMirror  param;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    flyArtMirror (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/qt4/Q_artMirror.cpp Added

@@ -0,0 +1,142 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_artMirror.h"
+#include "ADM_toolkitQt.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artMirrorWindow::Ui_artMirrorWindow(QWidget *parent, artMirror *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyArtMirror( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(artMirror));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout);
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        connect(ui.comboBoxMethod, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(Displacement,100,2)
+
+        setModal(true);
+}
+void Ui_artMirrorWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artMirrorWindow::gather(artMirror *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(artMirror));
+}
+Ui_artMirrorWindow::~Ui_artMirrorWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_artMirrorWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_artMirrorWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artMirrorWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYCHECK(x) w->checkBox##x
+//************************
+uint8_t flyArtMirror::upload(void)
+{
+    Ui_artMirrorDialog *w=(Ui_artMirrorDialog *)_cookie;
+    MYCOMBOX(Method)->setCurrentIndex(param.method);
+    MYSPIN(Displacement)->setValue((int)round(param.displacement*100.0));
+    return 1;
+}
+uint8_t flyArtMirror::download(void)
+{
+    Ui_artMirrorDialog *w=(Ui_artMirrorDialog *)_cookie;
+    param.method=MYCOMBOX(Method)->currentIndex();
+    param.displacement=((float)MYSPIN(Displacement)->value()) / 100.0;
+    return 1;
+}
+
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtMirror(artMirror *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artMirrorWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/qt4/Q_artMirror.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artMirror/qt4/artMirror.ui Added

@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artMirrorDialog</class>
+ <widget class="QDialog" name="artMirrorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Mirror</string>
+  </property>
+  <layout class="QGridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="2" column="0" colspan="2">
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="4" column="1">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="1" column="2">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderDisplacement">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Displacement</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QComboBox" name="comboBoxMethod">
+       <item>
+        <property name="text">
+         <string>Horizontal - keep left</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Horizontal - keep right</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Vertical - keep top</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Vertical - keep bottom</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>comboBoxMethod</tabstop>
+  <tabstop>horizontalSliderDisplacement</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artMirrorDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artMirrorDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artPixelize/qt4/Q_artPixelize.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPixelize/qt4/Q_artPixelize.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.cpp Added

@@ -0,0 +1,207 @@
+/***************************************************************************
+                          Posterize filter ported from frei0r
+    Algorithm:
+        Copyright 2006 Jerry Huxtable
+        Copyright 2012 Janne Liljeblad
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "artPosterize.h"
+#include "artPosterize_desc.cpp"
+#include "ADM_vidArtPosterize.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getArtPosterize(artPosterize *param, ADM_coreVideoFilter *in);
+
+
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoArtPosterize,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoArtPosterize,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_ART,            // Category
+                                      "artPosterize",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("artPosterize","Posterize"),            // Display name
+                                      QT_TRANSLATE_NOOP("artPosterize","Ported from frei0r.") // Description
+                                  );
+
+/**
+    \fn ArtPosterizeCreateBuffers
+*/
+void ADMVideoArtPosterize::ArtPosterizeCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv)
+{
+    *rgbBufStride = ADM_IMAGE_ALIGN(w * 4);
+    *rgbBufRaw = new ADM_byteBuffer();
+    if (*rgbBufRaw)
+        (*rgbBufRaw)->setSize(*rgbBufStride * h);
+    *convertYuvToRgb = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_YV12,ADM_PIXFRMT_RGB32A);
+    *convertRgbToYuv = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_RGB32A,ADM_PIXFRMT_YV12);
+    *rgbBufImage = new ADMImageRef(w,h);
+    if (*rgbBufImage)
+    {
+        (*rgbBufImage)->_pixfrmt = ADM_PIXFRMT_RGB32A;
+        (*rgbBufImage)->_planes[0] = (*rgbBufRaw)->at(0);
+        (*rgbBufImage)->_planes[1] = (*rgbBufImage)->_planes[2] = NULL;
+        (*rgbBufImage)->_planeStride[0] = *rgbBufStride;
+        (*rgbBufImage)->_planeStride[1] = (*rgbBufImage)->_planeStride[2] = 0;
+    }
+}
+/**
+    \fn ArtPosterizeDestroyBuffers
+*/
+void ADMVideoArtPosterize::ArtPosterizeDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (convertYuvToRgb) delete convertYuvToRgb;
+    if (convertRgbToYuv) delete convertRgbToYuv;
+    if (rgbBufRaw) rgbBufRaw->clean();
+    if (rgbBufImage) delete rgbBufImage;
+    if (rgbBufRaw) delete rgbBufRaw;
+}
+/**
+    \fn ArtPosterizeProcess_C
+*/
+void ADMVideoArtPosterize::ArtPosterizeProcess_C(ADMImage *img, int w, int h, unsigned int levels, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (!img || !rgbBufRaw || !rgbBufImage || !convertYuvToRgb || !convertRgbToYuv) return;
+    uint8_t * line;
+    int i;
+    uint8_t levels_table[256];
+
+
+    if (levels < 2) levels = 2;
+    if (levels > 255) levels = 255;
+
+    for (i = 0; i < 256; i++)
+    {
+        levels_table[i] = 255 * (levels*i / 256) / (levels-1);
+    }
+
+    convertYuvToRgb->convertImage(img,rgbBufRaw->at(0));
+
+    for(int y=0; y<h; y++) {
+        line = rgbBufRaw->at(y*rgbBufStride);
+        for(int x=0; x<w; x++) {
+            line[x*4 + 0] = levels_table[line[x*4 + 0]];
+            line[x*4 + 1] = levels_table[line[x*4 + 1]];
+            line[x*4 + 2] = levels_table[line[x*4 + 2]];
+        }
+    }
+
+    convertRgbToYuv->convertImage(rgbBufImage,img);
+
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoArtPosterize::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getArtPosterize(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoArtPosterize::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255," Levels: %d",_param.levels);
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoArtPosterize::ADMVideoArtPosterize(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,artPosterize_param,&_param))
+    {
+        _param.levels = 64;
+    }
+    ArtPosterizeCreateBuffers(info.width,info.height, &(_rgbBufStride), &(_rgbBufRaw), &(_rgbBufImage), &(_convertYuvToRgb), &(_convertRgbToYuv));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoArtPosterize::update(void)
+{
+    _levels=_param.levels;
+    if (_levels > 255) _levels = 255;
+    if (_levels < 2) _levels = 2;
+}
+/**
+    \fn dtor
+*/
+ADMVideoArtPosterize::~ADMVideoArtPosterize()
+{
+    ArtPosterizeDestroyBuffers(_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoArtPosterize::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, artPosterize_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoArtPosterize::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, artPosterize_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoArtPosterize::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ArtPosterizeProcess_C(image,info.width,info.height,_levels,_rgbBufStride,_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/ADM_vidArtPosterize.h Added

@@ -0,0 +1,52 @@
+/***************************************************************************
+                          Posterize filter ported from frei0r
+    Algorithm:
+        Copyright 2006 Jerry Huxtable
+        Copyright 2012 Janne Liljeblad
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+
+/**
+    \class ADMVideoArtPosterize
+*/
+class  ADMVideoArtPosterize:public ADM_coreVideoFilter
+{
+
+  protected:
+    void                  update(void);
+    artPosterize        _param;
+    uint32_t              _levels;
+    int                   _rgbBufStride;
+    ADM_byteBuffer *      _rgbBufRaw;
+    ADMImageRef *         _rgbBufImage;
+    ADMColorScalerFull *  _convertYuvToRgb;
+    ADMColorScalerFull *  _convertRgbToYuv;
+  public:
+    ADMVideoArtPosterize(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoArtPosterize();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface        
+
+    static void ArtPosterizeCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv);
+    static void ArtPosterizeDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+    static void ArtPosterizeProcess_C(ADMImage *img, int w, int h, unsigned int levels, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/artPosterize_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/cli/DIA_artPosterize.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/DIA_flyArtPosterize.cpp Added

@@ -0,0 +1,45 @@
+/**/
+/***************************************************************************
+                          DIA_flyArtPosterize
+                             -------------------
+
+			   Ui for Posterize
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyArtPosterize.h"
+#include "ADM_vidArtPosterize.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyArtPosterize::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyArtPosterize::processYuv(ADMImage *in,ADMImage *out )
+{
+    uint8_t *src,*dst;
+    uint32_t stride;
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoArtPosterize::ArtPosterizeProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),param.levels, rgbBufStride, rgbBufRaw, rgbBufImage, convertYuvToRgb, convertRgbToYuv);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/DIA_flyArtPosterize.h Added

@@ -0,0 +1,39 @@
+/***************************************************************************
+  \fn     DIA_flyArtPosterize
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for artPosterize
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ARTPosterize_H
+#define FLY_ARTPosterize_H
+#include "artPosterize.h"
+/**
+    \class flyArtPosterize
+*/
+class flyArtPosterize : public ADM_flyDialogYuv
+{
+  public:
+    artPosterize         param;
+    int                    rgbBufStride;
+    ADM_byteBuffer *       rgbBufRaw;
+    ADMImageRef *          rgbBufImage;
+    ADMColorScalerFull *   convertYuvToRgb;
+    ADMColorScalerFull *   convertRgbToYuv;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyArtPosterize (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/Q_artPosterize.cpp Added

@@ -0,0 +1,190 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_artPosterize.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidArtPosterize.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_artPosterizeWindow::Ui_artPosterizeWindow(QWidget *parent, artPosterize *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyArtPosterize( this,width, height,in,canvas,ui.horizontalSlider);
+        ADMVideoArtPosterize::ArtPosterizeCreateBuffers(width,height, &(myFly->rgbBufStride), &(myFly->rgbBufRaw), &(myFly->rgbBufImage), &(myFly->convertYuvToRgb), &(myFly->convertRgbToYuv));
+        memcpy(&(myFly->param),param,sizeof(artPosterize));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSpinBox(int)));
+        SPINNER(Levels)
+
+        setModal(true);
+}
+void Ui_artPosterizeWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_artPosterizeWindow::gather(artPosterize *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(artPosterize));
+}
+Ui_artPosterizeWindow::~Ui_artPosterizeWindow()
+{
+    if(myFly) {
+        ADMVideoArtPosterize::ArtPosterizeDestroyBuffers(myFly->rgbBufRaw, myFly->rgbBufImage, myFly->convertYuvToRgb, myFly->convertRgbToYuv);
+        delete myFly;
+    }
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.spinBox##x->blockSignals(true); \
+        ui.spinBox##x->setValue(ui.horizontalSlider##x->value()); \
+        ui.spinBox##x->blockSignals(false);
+void Ui_artPosterizeWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Levels);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue(ui.spinBox##x->value()); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_artPosterizeWindow::valueChangedSpinBox(int foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Levels);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_artPosterizeWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_artPosterizeWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSLIDER(x) w->horizontalSlider##x
+#define MYSPIN(x) w->spinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADSPIN(x, value) \
+        w->spinBox##x->blockSignals(true); \
+        w->spinBox##x->setValue(value); \
+        w->spinBox##x->blockSignals(false);
+//************************
+uint8_t flyArtPosterize::upload(void)
+{
+    Ui_artPosterizeDialog *w=(Ui_artPosterizeDialog *)_cookie;
+    MYSLIDER(Levels)->setValue((int)param.levels);
+    UPLOADSPIN(Levels, param.levels);
+    return 1;
+}
+uint8_t flyArtPosterize::download(void)
+{
+    Ui_artPosterizeDialog *w=(Ui_artPosterizeDialog *)_cookie;
+    param.levels=(int)MYSLIDER(Levels)->value();
+    return 1;
+}
+void flyArtPosterize::setTabOrder(void)
+{
+    Ui_artPosterizeDialog *w=(Ui_artPosterizeDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSHSLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSHSPIN(x) controls.push_back(MYSPIN(x));
+    PUSHSLIDER(Levels)
+    PUSHSPIN(Levels)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getArtPosterize(artPosterize *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_artPosterizeWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/Q_artPosterize.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artPosterize/qt4/artPosterize.ui Added

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>artPosterizeDialog</class>
+ <widget class="QDialog" name="artPosterizeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Posterize</string>
+  </property>
+  <layout class="QGridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="5" column="0" colspan="4">
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="3">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0" colspan="4">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="8" column="0" colspan="4">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item row="2" column="0" rowspan="2" colspan="4">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Levels</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSlider" name="horizontalSliderLevels">
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>64</number>
+       </property>
+       <property name="pageStep">
+        <number>20</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QSpinBox" name="spinBoxLevels">
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>64</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>horizontalSliderLevels</tabstop>
+  <tabstop>spinBoxLevels</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>artPosterizeDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>artPosterizeDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.cpp Changed

@@ -23,6 +23,10 @@
 #include "artVHS_desc.cpp"
 #include "ADM_vidArtVHS.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 extern uint8_t DIA_getArtVHS(artVHS *param, ADM_coreVideoFilter *in);
 
 // Add the hook to make it valid plugin
@@ -38,7 +42,7 @@
 /**
     \fn ArtVHSProcess_C
 */
-void ADMVideoArtVHS::ArtVHSProcess_C(ADMImage *img, float lumaBW, float chromaBW, float unSync, float unSyncFilter, bool lumaNoDelay, bool chromaNoDelay)
+void ADMVideoArtVHS::ArtVHSProcess_C(ADMImage *img, float lumaBW, float chromaBW, float unSync, float unSyncFilter, bool lumaNoDelay, bool chromaNoDelay, float noise, int * noiseBuffer4k)
 {
     int width=img->GetWidth(PLANAR_Y); 
     int height=img->GetHeight(PLANAR_Y);
@@ -51,7 +55,15 @@
     float hShift;
     int lineShift;
     float syncrc;
-
+    uint32_t rng_state;
+    uint32_t rn;
+    uint64_t rng_product;
+    
+    float limitL = 0;
+    float limitH = 255;
+    float limitcL = 0;
+    float limitcH = 255;
+    
     // 
     lumaBW = std::exp(lumaBW*0.69314) - 1.0;
     lumaBW *= lumaBW;
@@ -61,11 +73,41 @@
     if (chromaBW < 0.0001) chromaBW = 0.0001;
     //unSyncFilter = std::exp(unSyncFilter*0.69314) - 1.0;
     unSyncFilter = std::sqrt(std::sqrt(unSyncFilter));
+    
+    rng_state = img->Pts;
+    if (rng_state == 0)
+        rng_state = 123456789;
+    
+    for (int i=0; i<4096; i++)
+    {
+        double u1, u2;
+        do {
+            rng_product = (uint64_t)rng_state * 48271;
+            rng_state = (rng_product & 0x7fffffff) + (rng_product >> 31);
+            rng_state = (rng_state & 0x7fffffff) + (rng_state >> 31);
+            rn = rng_state & 0xFFFF;
+            u1 = rn;
 
-#if 0
+            rng_product = (uint64_t)rng_state * 48271;
+            rng_state = (rng_product & 0x7fffffff) + (rng_product >> 31);
+            rng_state = (rng_state & 0x7fffffff) + (rng_state >> 31);
+            rn = rng_state & 0xFFFF;
+            u2 = rn;
+        } while (u1 == 0.0);
+        u1 /= 0xFFFF;
+        u2 /= 0xFFFF;
+        double mag = noise * 128.0 * std::sqrt(-2.0 * std::log(u1)) * std::cos(2.0 * M_PI * u2);
+        noiseBuffer4k[i] = mag+0.49;
+    }
+    
     if(img->_range == ADM_COL_RANGE_MPEG)
-        img->expandColorRange();
-#endif
+    {
+        limitL = 16;
+        limitH = 235;
+        limitcL = 16;
+        limitcH = 239;
+    }
+    
     // Y plane
     stride=img->GetPitch(PLANAR_Y);
     ptr=img->GetWritePtr(PLANAR_Y);
@@ -87,9 +129,19 @@
                     random -= ptr[x]&0x03;
                 }
             }
+            rng_product = (uint64_t)rng_state * 48271;
+            rng_state = (rng_product & 0x7fffffff) + (rng_product >> 31);
+            rng_state = (rng_state & 0x7fffffff) + (rng_state >> 31);
+            rn = rng_state & 0xFFF;
             pixel = ptr[x];
+            pixel += noiseBuffer4k[rn];
             rc = smf*pixel + smfi*rc;
-            ptr[x] = (uint8_t)std::round(rc);
+            pixel = rc;
+            if (pixel < limitL)
+                pixel = limitL;
+            if (pixel > limitH)
+                pixel = limitH;
+            ptr[x] = (uint8_t)std::round(pixel);
         }
         if (lumaNoDelay)
         {
@@ -131,10 +183,21 @@
             rc = 0;
             for (int x=0;x<width/2;x++)
             {
+                rng_product = (uint64_t)rng_state * 48271;
+                rng_state = (rng_product & 0x7fffffff) + (rng_product >> 31);
+                rng_state = (rng_state & 0x7fffffff) + (rng_state >> 31);
+                rn = rng_state & 0xFFF;
+
                 pixel = ptr[x];
                 pixel -= 128;
+                pixel += noiseBuffer4k[rn];
                 rc = smf*pixel + smfi*rc;
-                ptr[x] = (uint8_t)std::round( (rc ) + 128);
+                pixel = rc + 128.0;
+                if (pixel < limitcL)
+                    pixel = limitcL;
+                if (pixel > limitcH)
+                    pixel = limitcH;
+                ptr[x] = (uint8_t)std::round(pixel);
             }
             if (chromaNoDelay)
             {
@@ -169,7 +232,7 @@
 const char   *ADMVideoArtVHS::getConfiguration(void)
 {
     static char s[256];
-    snprintf(s,255," LumaBW: %.2f%s, ChromaBW: %.2f%s, UnSync: %.2f filter: %.2f",_param.lumaBW, (_param.lumaNoDelay ? " nodelay" : ""), _param.chromaBW, (_param.chromaNoDelay ? " nodelay" : ""), _param.unSync,_param.unSyncFilter);
+    snprintf(s,255," LumaBW: %.2f%s, ChromaBW: %.2f%s, UnSync: %.2f filter: %.2f, Noise: %.2f",_param.lumaBW, (_param.lumaNoDelay ? " nodelay" : ""), _param.chromaBW, (_param.chromaNoDelay ? " nodelay" : ""), _param.unSync,_param.unSyncFilter, _param.noise);
     return s;
 }
 /**
@@ -180,6 +243,7 @@
     if(!couples || !ADM_paramLoad(couples,artVHS_param,&_param))
         reset(&_param);
     update();
+    _noiseBuffer4k = new int [4096];
 }
 /**
     \fn reset
@@ -192,6 +256,7 @@
     cfg->chromaNoDelay = false;
     cfg->unSync = 3.0;
     cfg->unSyncFilter = 0.7;
+    cfg->noise = 0.0;
 }
 /**
     \fn valueLimit
@@ -213,13 +278,14 @@
     _chromaNoDelay=_param.chromaNoDelay;
     _unSync=valueLimit(_param.unSync, 0.0, 16.0);
     _unSyncFilter=valueLimit(_param.unSyncFilter, 0.0, 1.0);
+    _noise=valueLimit(_param.noise, 0.0, 1.0);
 }
 /**
     \fn dtor
 */
 ADMVideoArtVHS::~ADMVideoArtVHS()
 {
-    
+    delete [] _noiseBuffer4k;
 }
 /**
     \fn getCoupledConf
@@ -260,7 +326,7 @@
     */
     if(!previousFilter->getNextFrame(fn,image)) return false;
 
-    ArtVHSProcess_C(image, _lumaBW, _chromaBW, _unSync, _unSyncFilter, _lumaNoDelay, _chromaNoDelay);
+    ArtVHSProcess_C(image, _lumaBW, _chromaBW, _unSync, _unSyncFilter, _lumaNoDelay, _chromaNoDelay, _noise, _noiseBuffer4k);
 
     return 1;
 }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/ADM_vidArtVHS.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS.conf -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS.conf Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS_desc.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS_json.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/artVHS_json.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/DIA_flyArtVHS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/DIA_flyArtVHS.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/DIA_flyArtVHS.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/DIA_flyArtVHS.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/Q_artVHS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/Q_artVHS.cpp Changed

@@ -44,7 +44,7 @@
         myFly=new flyArtVHS( this,width, height,in,canvas,ui.horizontalSlider);
         memcpy(&(myFly->param),param,sizeof(artVHS));
         myFly->_cookie=&ui;
-        myFly->addControl(ui.toolboxLayout);
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
         myFly->setTabOrder();
         myFly->upload();
         myFly->sliderChanged();
@@ -56,6 +56,7 @@
         SPINNER(ChromaBW,100)
         SPINNER(UnSync,10)
         SPINNER(UnSyncFilter,100)
+        SPINNER(Noise,100)
 
 #define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
         CHKBOX(LumaNoDelay);
@@ -128,6 +129,7 @@
     MYSPIN(ChromaBW)->setValue((int)round(param.chromaBW*100.0));
     MYSPIN(UnSync)->setValue((int)round(param.unSync*10.0));
     MYSPIN(UnSyncFilter)->setValue((int)round(param.unSyncFilter*100.0));
+    MYSPIN(Noise)->setValue((int)round(param.noise*100.0));
     MYCHECK(LumaNoDelay)->setChecked(param.lumaNoDelay);
     MYCHECK(ChromaNoDelay)->setChecked(param.chromaNoDelay);
     return 1;
@@ -139,6 +141,7 @@
     param.chromaBW=((float)MYSPIN(ChromaBW)->value()) / 100.0;
     param.unSync=((float)MYSPIN(UnSync)->value()) / 10.0;
     param.unSyncFilter=((float)MYSPIN(UnSyncFilter)->value()) / 100.0;
+    param.noise=((float)MYSPIN(Noise)->value()) / 100.0;
     param.lumaNoDelay=MYCHECK(LumaNoDelay)->isChecked();
     param.chromaNoDelay=MYCHECK(ChromaNoDelay)->isChecked();
     return 1;
@@ -155,6 +158,7 @@
     TPUSH(ChromaNoDelay)
     SPUSH(UnSync)
     SPUSH(UnSyncFilter)
+    SPUSH(Noise)
 
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/artVHS.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVHS/qt4/artVHS.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
-    <height>475</height>
+    <width>708</width>
+    <height>485</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -43,10 +43,24 @@
      <property name="bottomMargin">
       <number>0</number>
      </property>
-     <item row="2" column="0">
-      <widget class="QLabel" name="labelLuma">
+     <item row="2" column="2">
+      <widget class="QCheckBox" name="checkBoxLumaNoDelay">
        <property name="text">
-        <string>Luma bandwidth</string>
+        <string>Use zero delay filter for luma</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="labelChroma">
+       <property name="text">
+        <string>Chroma bandwidth</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QCheckBox" name="checkBoxChromaNoDelay">
+       <property name="text">
+        <string>Use zero delay filter for chroma</string>
        </property>
       </widget>
      </item>
@@ -63,6 +77,19 @@
        </property>
       </widget>
      </item>
+     <item row="4" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderUnSync">
+       <property name="maximum">
+        <number>160</number>
+       </property>
+       <property name="pageStep">
+        <number>20</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="3">
       <spacer name="horizontalSpacerPanel">
        <property name="orientation">
@@ -76,13 +103,6 @@
        </property>
       </spacer>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="labelChroma">
-       <property name="text">
-        <string>Chroma bandwidth</string>
-       </property>
-      </widget>
-     </item>
      <item row="3" column="1">
       <widget class="ADM_SliderIndicator" name="horizontalSliderChromaBW">
        <property name="maximum">
@@ -93,54 +113,51 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="labelSync">
+     <item row="5" column="0">
+      <widget class="QLabel" name="labelFilter">
        <property name="text">
-        <string>Sync error</string>
+        <string>Sync error filter</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="ADM_SliderIndicator" name="horizontalSliderUnSync">
+     <item row="5" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderUnSyncFilter">
        <property name="maximum">
-        <number>160</number>
+        <number>99</number>
        </property>
        <property name="pageStep">
-        <number>20</number>
+        <number>10</number>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="2">
-      <widget class="QCheckBox" name="checkBoxChromaNoDelay">
+     <item row="4" column="0">
+      <widget class="QLabel" name="labelSync">
        <property name="text">
-        <string>Use zero delay filter for chroma</string>
+        <string>Sync error</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="2">
-      <widget class="QCheckBox" name="checkBoxLumaNoDelay">
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelLuma">
        <property name="text">
-        <string>Use zero delay filter for luma</string>
+        <string>Luma bandwidth</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="labelFilter">
+     <item row="6" column="0">
+      <widget class="QLabel" name="labelNoise">
        <property name="text">
-        <string>Sync error filter</string>
+        <string>Noise</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="ADM_SliderIndicator" name="horizontalSliderUnSyncFilter">
+     <item row="6" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderNoise">
        <property name="maximum">
-        <number>99</number>
-       </property>
-       <property name="pageStep">
-        <number>10</number>
+        <number>100</number>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVignette/qt4/Q_artVignette.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVignette/qt4/Q_artVignette.cpp Changed

@@ -47,13 +47,15 @@
         myFly->filterH = height;
         myFly->filterMask = new float[width*height];
         myFly->_cookie=&ui;
-        myFly->addControl(ui.toolboxLayout);
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
         myFly->setTabOrder();
         myFly->upload();
         myFly->sliderChanged();
 
         connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
-#define SPINNER(x) connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChangedSpinBox(double)));
         SPINNER(Aspect);
         SPINNER(Center);
         SPINNER(Soft);
@@ -83,10 +85,32 @@
     if(canvas) delete canvas;
     canvas=NULL;
 }
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.doubleSpinBox##x->blockSignals(true); \
+        ui.doubleSpinBox##x->setValue((float)ui.horizontalSlider##x->value() / 100.0); \
+        ui.doubleSpinBox##x->blockSignals(false);
 void Ui_artVignetteWindow::valueChanged( int f )
 {
     if(lock) return;
     lock++;
+    COPY_VALUE_TO_SPINBOX(Aspect);
+    COPY_VALUE_TO_SPINBOX(Center);
+    COPY_VALUE_TO_SPINBOX(Soft);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue((int)round(ui.doubleSpinBox##x->value() * 100.0)); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_artVignetteWindow::valueChangedSpinBox(double foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Aspect);
+    COPY_VALUE_TO_SLIDER(Center);
+    COPY_VALUE_TO_SLIDER(Soft);
     myFly->download();
     myFly->sameImage();
     lock--;
@@ -118,15 +142,23 @@
 }
 
 #define MYSPIN(x) w->horizontalSlider##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
 #define MYCHECK(x) w->checkBox##x
+#define UPLOADDBLSPIN(x, value) \
+        w->doubleSpinBox##x->blockSignals(true); \
+        w->doubleSpinBox##x->setValue(value); \
+        w->doubleSpinBox##x->blockSignals(false);
 //************************
 
 uint8_t flyArtVignette::upload(void)
 {
     Ui_artVignetteDialog *w=(Ui_artVignetteDialog *)_cookie;
     MYSPIN(Aspect)->setValue((int)round(param.aspect * 100.0));
+    UPLOADDBLSPIN(Aspect, param.aspect);
     MYSPIN(Center)->setValue((int)round(param.center * 100.0));
+    UPLOADDBLSPIN(Center, param.center);
     MYSPIN(Soft)->setValue((int)round(param.soft * 100.0));
+    UPLOADDBLSPIN(Soft, param.soft);
     ADMVideoArtVignette::ArtVignetteCreateMask(filterMask, filterW, filterH, param.aspect, param.center, param.soft);
     return 1;
 }
@@ -143,10 +175,14 @@
 {
     Ui_artVignetteDialog *w=(Ui_artVignetteDialog *)_cookie;
     std::vector<QWidget *> controls;
-#define PUSHME(x) controls.push_back(MYSPIN(x));
-    PUSHME(Aspect)
-    PUSHME(Center)
-    PUSHME(Soft)
+#define PUSHSLIDER(x) controls.push_back(MYSPIN(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+    PUSHSLIDER(Aspect)
+    PUSHDBLSPIN(Aspect)
+    PUSHSLIDER(Center)
+    PUSHDBLSPIN(Center)
+    PUSHSLIDER(Soft)
+    PUSHDBLSPIN(Soft)
 
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVignette/qt4/Q_artVignette.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVignette/qt4/Q_artVignette.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/artVignette/qt4/artVignette.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/artVignette/qt4/artVignette.ui Changed

@@ -88,7 +88,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
+     <item row="0" column="3">
       <spacer name="panelSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -101,6 +101,36 @@
        </property>
       </spacer>
      </item>
+     <item row="0" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxAspect">
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxCenter">
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxSoft">
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/DIA_flyAsharp.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/DIA_flyAsharp.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/DIA_flyAsharp.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/DIA_flyAsharp.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.cpp Changed

@@ -42,13 +42,12 @@
 
     memcpy(&(myCrop->param),param,sizeof(asharp));
     myCrop->_cookie=&ui;
-    myCrop->addControl(ui.toolboxLayout);
+    myCrop->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
     myCrop->setTabOrder();
     myCrop->upload();
     myCrop->sliderChanged();
 
     connect(ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
-    connect(ui.checkBoxFullPreview,SIGNAL(stateChanged(int)),this,SLOT(toggleFullPreview(int)));
 #define SPINNER(x) connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChanged(double))); \
                    connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSlider(int)));
     SPINNER(Threshold)
@@ -93,14 +92,6 @@
     myCrop->sameImage();
     lock--;
 }
-void Ui_asharpWindow::toggleFullPreview(int state)
-{
-    if(lock) return;
-    lock++;
-    myCrop->fullpreview = state != Qt::Unchecked;
-    myCrop->sameImage();
-    lock--;
-}
 void Ui_asharpWindow::reset(void)
 {
     if(lock) return;
@@ -218,7 +209,6 @@
     controls.push_back(MYSLIDER(Block));
     controls.push_back(MYSPIN(Block));
     controls.push_back(MYCHKBOX(HQBF));
-    controls.push_back(MYCHKBOX(FullPreview));
 
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/qt4/asharp.ui Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/black/ADM_vidBlack.cpp Changed

@@ -43,7 +43,7 @@
 DECLARE_VIDEO_FILTER(AVDM_black,
                      1,0,0,              // Version
                      ADM_UI_ALL,         // UI
-                     VF_TRANSFORM,            // Category
+                     VF_TRANSITION,            // Category
                      "black",            // internal name (must be uniq!)
                      QT_TRANSLATE_NOOP("black","Black"),            // Display name
                      QT_TRANSLATE_NOOP("black","Replace a section by black.") // Description
@@ -97,8 +97,8 @@
     if(!setup || !ADM_paramLoad(setup,black_param,&param))
     {
         // Default value
-        param.startBlack=0; 
-        param.endBlack=0;
+        param.startBlack=info.markerA / 1000LL; 
+        param.endBlack=info.markerB / 1000LL;
     }
     nextFrame=0;
 }
@@ -149,10 +149,10 @@
   
   image->copyInfo(next);  
   bool out_of_scope=false;
-  uint64_t absPts=next->Pts+getAbsoluteStartTime();
+  uint32_t absPtsMs=(next->Pts+getAbsoluteStartTime())/1000LL;
   
-  if(absPts<param.startBlack*1000LL) out_of_scope=true;
-  if(absPts>=param.endBlack*1000LL)   out_of_scope=true;
+  if(absPtsMs < param.startBlack) out_of_scope=true;
+  if(absPtsMs >= param.endBlack)  out_of_scope=true;
   
   if( out_of_scope)
   {

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.conf Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder_desc.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.cpp Changed

@@ -20,7 +20,6 @@
 #include "ADM_default.h"
 #include "ADM_image.h"
 #include "DIA_flyBlackenBorders.h"
-#include "ui_blackenBorders.h"
 
 #if 0 
     #define aprintf printf
@@ -48,6 +47,44 @@
     delete rubber;
     rubber=NULL;
 }
+/**
+ * \fn initRubber
+ * \brief To be called on show event
+ */
+void flyBlacken::initRubber(void)
+{
+    rubber->rubberband->show(); // must be called first
+    rubber->rubberband->setVisible(!rubber_is_hidden);
+    rubber->nestedIgnore = 0;
+}
+/**
+ * \fn adjustRubber
+ */
+void flyBlacken::adjustRubber(int x, int y, int w, int h)
+{
+    rubber->move(x,y);
+    rubber->resize(w,h);
+}
+/**
+ * \fn lockRubber
+ */
+int flyBlacken::lockRubber(bool lock)
+{
+    int old = rubber->nestedIgnore;
+    if(lock)
+        rubber->nestedIgnore++;
+    else
+        rubber->nestedIgnore--;
+    return old;
+}
+/**
+ * \fn hideRubber
+ */
+void flyBlacken::hideRubber(bool hide)
+{
+    rubber_is_hidden = hide;
+    rubber->rubberband->setVisible(!hide);
+}
 
 /**
  * \fn blank
@@ -205,17 +242,5 @@
   
     return true; 
 }
-/**
- * \fn blockChanges
- * @param block
- * @return 
- */
-#define APPLY_TO_ALL(x) {w->spinBoxLeft->x;w->spinBoxRight->x;w->spinBoxTop->x;w->spinBoxBottom->x;rubber->x;}
-bool flyBlacken::blockChanges(bool block)
-{
-    Ui_blackenDialog *w=(Ui_blackenDialog *)_cookie;
-    APPLY_TO_ALL(blockSignals(block));
-    return true;
-}
 //EOF

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/DIA_flyBlackenBorders.h Changed

@@ -1,22 +1,27 @@
 #pragma once
 class flyBlacken : public ADM_flyDialogRgb
 {
-  friend class Ui_blackenWindow;
-  public:
-   uint32_t   left,right,top,bottom;
-   bool       rubber_is_hidden;
-  public:
-   uint8_t    processRgb(uint8_t *imageIn, uint8_t *imageOut);
-   uint8_t    download(void);
-   uint8_t    upload(void) {return upload(true,true);}
-   uint8_t    upload(bool redraw, bool rubber);
-   void       setTabOrder(void);
-              flyBlacken (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+public:
+    uint32_t    left,right,top,bottom;
+    bool        rubber_is_hidden;
+
+    float       getZoomValue(void) { return _zoom; }
+    void        initRubber(void);
+    void        adjustRubber(int x, int y, int w, int h);
+    void        hideRubber(bool hide);
+    int         lockRubber(bool lock);
+    bool        blockChanges(bool block);
+
+    uint8_t     processRgb(uint8_t *imageIn, uint8_t *imageOut);
+    uint8_t     download(void);
+    uint8_t     upload(void) {return upload(true,true);}
+    void        setTabOrder(void);
+                flyBlacken(QDialog *parent, uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
                                     ADM_QCanvas *canvas, ADM_QSlider *slider);
-              ~flyBlacken();
+                ~flyBlacken();
 protected:
-                ADM_rubberControl *rubber;
-    bool        blockChanges(bool block);
+    ADM_rubberControl *rubber;
+    uint8_t     upload(bool redraw, bool rubber);
     bool        bandResized(int x,int y,int w, int h);
     bool        bandMoved(int x,int y,int w, int h);
     int         _ox,_oy,_ow,_oh;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.cpp Changed

@@ -14,6 +14,7 @@
 #include <QPushButton>
 #include "Q_blackenBorders.h"
 #include "ADM_toolkitQt.h"
+#include "ADM_QSettings.h"
 
 //
 //	Video is in RGB Colorspace
@@ -24,16 +25,15 @@
  */
 Ui_blackenWindow::Ui_blackenWindow(QWidget* parent, blackenBorder *param,ADM_coreVideoFilter *in) : QDialog(parent)
 {
-    uint32_t width,height;
-    ui.setupUi(this);    
+    ui.setupUi(this);
     lock=0;
     // Allocate space for green-ised video
-    width=in->getInfo()->width;
-    height=in->getInfo()->height;
+    inputWidth = in->getInfo()->width;
+    inputHeight = in->getInfo()->height;
+
+    canvas = new ADM_QCanvas(ui.graphicsView,inputWidth,inputHeight);
+    myBlacken = new flyBlacken( this,inputWidth,inputHeight,in,canvas,ui.horizontalSlider);
 
-    canvas=new ADM_QCanvas(ui.graphicsView,width,height);
-    
-    myBlacken=new flyBlacken( this,width, height,in,canvas,ui.horizontalSlider);
     myBlacken->left=param->left&0xffffe;
     myBlacken->right=param->right&0xffffe;
     myBlacken->top=param->top&0xffffe;
@@ -44,8 +44,19 @@
     myBlacken->upload();
     myBlacken->sliderChanged();
 
-    myBlacken->rubber->nestedIgnore=1;
-    myBlacken->rubber_is_hidden=param->rubber_is_hidden;
+    bool rubberIsHidden = false;
+    QSettings *qset = qtSettingsCreate();
+    if(qset)
+    {
+        qset->beginGroup("blackenBorder");
+        rubberIsHidden = qset->value("rubberIsHidden", false).toBool();
+        qset->endGroup();
+        delete qset;
+        qset = NULL;
+    }
+
+    //myBlacken->rubber->nestedIgnore=1;
+    myBlacken->rubber_is_hidden = rubberIsHidden;
     ui.checkBoxRubber->setChecked(myBlacken->rubber_is_hidden);
 
     connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
@@ -73,12 +84,23 @@
  */
 Ui_blackenWindow::~Ui_blackenWindow()
 {
-  if(myBlacken) 
-      delete myBlacken;
-  myBlacken=NULL; 
-  if(canvas) 
-      delete canvas;
-  canvas=NULL;
+    if(myBlacken)
+    {
+        QSettings *qset = qtSettingsCreate();
+        if(qset)
+        {
+            qset->beginGroup("blackenBorder");
+            qset->setValue("rubberIsHidden", myBlacken->rubber_is_hidden);
+            qset->endGroup();
+            delete qset;
+            qset = NULL;
+        }
+        delete myBlacken;
+        myBlacken=NULL;
+    }
+    if(canvas)
+        delete canvas;
+    canvas=NULL;
 }
 /**
  * \fn sliderUpdate
@@ -97,7 +119,6 @@
     param->right=myBlacken->right;
     param->top=myBlacken->top;
     param->bottom=myBlacken->bottom;
-    param->rubber_is_hidden=myBlacken->rubber_is_hidden;
 }
 /**
  * \fn toggleRubber
@@ -107,8 +128,7 @@
     bool visible=true;
     if(checkState)
         visible=false;
-    myBlacken->rubber->rubberband->setVisible(visible);
-    myBlacken->rubber_is_hidden=!visible;
+    myBlacken->hideRubber(!visible);
 }
 /**
  * \fn valueChanged
@@ -117,10 +137,10 @@
 {
     if(lock) return;
     lock++;
-    myBlacken->rubber->nestedIgnore++;
+    myBlacken->lockRubber(true);
     myBlacken->download();
     myBlacken->sameImage();
-    myBlacken->rubber->nestedIgnore--;
+    myBlacken->lockRubber(false);
     lock--;
 }
 /**
@@ -148,17 +168,17 @@
     uint32_t graphicsViewHeight = canvas->parentWidget()->height();
     myBlacken->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
     myBlacken->adjustCanvasPosition();
-    
-     int x=(int)((double)myBlacken->left*myBlacken->_zoom);
-    int y=(int)((double)myBlacken->top*myBlacken->_zoom);
-    int w=(int)((double)(myBlacken->_w-(myBlacken->left+myBlacken->right))*myBlacken->_zoom);
-    int h=(int)((double)(myBlacken->_h-(myBlacken->top+myBlacken->bottom))*myBlacken->_zoom);
+
+    float zoom = myBlacken->getZoomValue();
+    int x = zoom * myBlacken->left;
+    int y = zoom * myBlacken->top;
+    int w = zoom * (inputWidth-(myBlacken->left+myBlacken->right));
+    int h = zoom * (inputHeight-(myBlacken->top+myBlacken->bottom));
 
     myBlacken->blockChanges(true);
-    myBlacken->rubber->nestedIgnore++;
-    myBlacken->rubber->move(x,y);
-    myBlacken->rubber->resize(w,h);
-    myBlacken->rubber->nestedIgnore--;
+    myBlacken->lockRubber(true);
+    myBlacken->adjustRubber(x,y,w,h);
+    myBlacken->lockRubber(false);
     myBlacken->blockChanges(false);
 }
 /**
@@ -166,16 +186,25 @@
  */
 void Ui_blackenWindow::showEvent(QShowEvent *event)
 {
-    myBlacken->rubber->rubberband->show(); // must be called first
+    myBlacken->initRubber(); // must be called first
     QDialog::showEvent(event);
     myBlacken->adjustCanvasPosition();
     canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
-    myBlacken->rubber->nestedIgnore=0;
-    if(myBlacken->rubber_is_hidden)
-        myBlacken->rubber->rubberband->hide();
 }
 
 //************************
+/**
+ * \fn blockChanges
+ * @param block
+ * @return
+ */
+#define APPLY_TO_ALL(x) {w->spinBoxLeft->x;w->spinBoxRight->x;w->spinBoxTop->x;w->spinBoxBottom->x;rubber->x;}
+bool flyBlacken::blockChanges(bool block)
+{
+    Ui_blackenDialog *w=(Ui_blackenDialog *)_cookie;
+    APPLY_TO_ALL(blockSignals(block));
+    return true;
+}
 uint8_t flyBlacken::upload(bool redraw, bool toRubber)
 {
 Ui_blackenDialog *w=(Ui_blackenDialog *)_cookie;
@@ -193,8 +222,7 @@
     if(toRubber)
     {
         rubber->nestedIgnore++;
-        rubber->move(_zoom*(float)left,_zoom*(float)top);
-        rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+        adjustRubber(_zoom * left, _zoom * top, _zoom * (_w-left-right), _zoom * (_h-top-bottom));
         rubber->nestedIgnore--;
     }
     if(!redraw)
@@ -232,8 +260,7 @@
            {
                blockChanges(true);
                rubber->nestedIgnore++;
-               rubber->move(_zoom*(float)left,_zoom*(float)top);
-               rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+               adjustRubber(_zoom * left, _zoom * top, _zoom * (_w-left-right), _zoom * (_h-top-bottom));
                rubber->nestedIgnore--;
                blockChanges(false);
            }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt5/Q_blackenBorders.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blend/ADM_vidBlendFrames.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.cpp Added

@@ -0,0 +1,520 @@
+/***************************************************************************
+                          Blur filter ported from frei0r
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "blur.h"
+#include "blur_desc.cpp"
+#include "ADM_vidBlur.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getBlur(blur *param, ADM_coreVideoFilter *in);
+
+
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoBlur,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoBlur,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_SHARPNESS,            // Category
+                                      "blur",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("blur","Blur"),            // Display name
+                                      QT_TRANSLATE_NOOP("blur","Blur selected area.") // Description
+                                  );
+
+
+static const uint16_t g_stack_blur8_mul[255] = 
+    {
+        512,512,456,512,328,456,335,512,405,328,271,456,388,335,292,512,
+        454,405,364,328,298,271,496,456,420,388,360,335,312,292,273,512,
+        482,454,428,405,383,364,345,328,312,298,284,271,259,496,475,456,
+        437,420,404,388,374,360,347,335,323,312,302,292,282,273,265,512,
+        497,482,468,454,441,428,417,405,394,383,373,364,354,345,337,328,
+        320,312,305,298,291,284,278,271,265,259,507,496,485,475,465,456,
+        446,437,428,420,412,404,396,388,381,374,367,360,354,347,341,335,
+        329,323,318,312,307,302,297,292,287,282,278,273,269,265,261,512,
+        505,497,489,482,475,468,461,454,447,441,435,428,422,417,411,405,
+        399,394,389,383,378,373,368,364,359,354,350,345,341,337,332,328,
+        324,320,316,312,309,305,301,298,294,291,287,284,281,278,274,271,
+        268,265,262,259,257,507,501,496,491,485,480,475,470,465,460,456,
+        451,446,442,437,433,428,424,420,416,412,408,404,400,396,392,388,
+        385,381,377,374,370,367,363,360,357,354,350,347,344,341,338,335,
+        332,329,326,323,320,318,315,312,310,307,304,302,299,297,294,292,
+        289,287,285,282,280,278,275,273,271,269,267,265,263,261,259
+    };
+
+static const uint8_t g_stack_blur8_shr[255] = 
+    {
+          9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17, 
+         17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 
+         19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20,
+         20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21,
+         21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+         21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 
+         22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+         22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 
+         23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
+    };
+
+/**
+    \fn BlurCreateBuffers
+*/
+void ADMVideoBlur::BlurCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv)
+{
+    *rgbBufStride = ADM_IMAGE_ALIGN(w * 4);
+    *rgbBufRaw = new ADM_byteBuffer();
+    if (*rgbBufRaw)
+        (*rgbBufRaw)->setSize(*rgbBufStride * h);
+    *convertYuvToRgb = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_YV12,ADM_PIXFRMT_RGB32A);
+    *convertRgbToYuv = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_RGB32A,ADM_PIXFRMT_YV12);
+    *rgbBufImage = new ADMImageRef(w,h);
+    if (*rgbBufImage)
+    {
+        (*rgbBufImage)->_pixfrmt = ADM_PIXFRMT_RGB32A;
+        (*rgbBufImage)->_planes[0] = (*rgbBufRaw)->at(0);
+        (*rgbBufImage)->_planes[1] = (*rgbBufImage)->_planes[2] = NULL;
+        (*rgbBufImage)->_planeStride[0] = *rgbBufStride;
+        (*rgbBufImage)->_planeStride[1] = (*rgbBufImage)->_planeStride[2] = 0;
+    }
+}
+/**
+    \fn BlurDestroyBuffers
+*/
+void ADMVideoBlur::BlurDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (convertYuvToRgb) delete convertYuvToRgb;
+    if (convertRgbToYuv) delete convertRgbToYuv;
+    if (rgbBufRaw) rgbBufRaw->clean();
+    if (rgbBufImage) delete rgbBufImage;
+    if (rgbBufRaw) delete rgbBufRaw;
+}
+/**
+    \fn BoxBlurLine_C
+*/
+void ADMVideoBlur::BoxBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius)
+{
+    uint_fast32_t div;
+    uint_fast32_t mul_sum;
+    uint_fast32_t shr_sum;
+
+    uint_fast32_t l, p, i;
+    uint_fast32_t stack_ptr;
+
+    const uint8_t * src_pix_ptr;
+          uint8_t * dst_pix_ptr;
+    uint8_t *     stack_pix_ptr;
+
+    uint_fast32_t sum_r = 0;
+    uint_fast32_t sum_g = 0;
+    uint_fast32_t sum_b = 0;
+
+    uint_fast32_t lm  = len - 1;
+
+    if ((radius > 0) && (len > 1))
+    {
+        div = radius * 2 + 1;
+        shr_sum = 14;
+        mul_sum = (1 << shr_sum)/div;
+
+        for(i = 0; i <= radius; i++)
+        {
+            if ((radius - i) > lm)
+                src_pix_ptr = line + pixPitch*lm;
+            else
+                src_pix_ptr = line + pixPitch*(radius - i);    // fix flickering at the T/L edges, by reflecting the image backward
+            stack_pix_ptr    = (uint8_t *)&stack[i];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_r       += src_pix_ptr[0];
+            sum_g       += src_pix_ptr[1];
+            sum_b       += src_pix_ptr[2];
+        }
+        src_pix_ptr = line;
+        for(i = 1; i <= radius; i++)
+        {
+            if(i <= lm) src_pix_ptr += pixPitch; 
+            stack_pix_ptr = (uint8_t *)&stack[i + radius];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_r        += src_pix_ptr[0];
+            sum_g        += src_pix_ptr[1];
+            sum_b        += src_pix_ptr[2];
+        }
+
+        stack_ptr = 0;
+        p = radius;
+        if(p > lm) p = lm;
+        src_pix_ptr = line + pixPitch*p;
+        dst_pix_ptr = line;
+        for(l = 0; l < len; l++)
+        {
+            sum_r += src_pix_ptr[0];
+            sum_g += src_pix_ptr[1];
+            sum_b += src_pix_ptr[2];
+
+            stack_pix_ptr = (uint8_t *)&stack[stack_ptr];
+
+            sum_r  -= stack_pix_ptr[0];
+            sum_g  -= stack_pix_ptr[1];
+            sum_b  -= stack_pix_ptr[2];
+
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+
+            stack_ptr++;
+            if(stack_ptr >= div) stack_ptr = 0;
+
+            dst_pix_ptr[0] = (sum_r * mul_sum) >> shr_sum;
+            dst_pix_ptr[1] = (sum_g * mul_sum) >> shr_sum;
+            dst_pix_ptr[2] = (sum_b * mul_sum) >> shr_sum;
+            dst_pix_ptr   += pixPitch;
+
+            if(p < lm) 
+                src_pix_ptr += pixPitch;
+            else if(p < lm*2) 
+                src_pix_ptr -= pixPitch;    // fix flickering at the B/R edges, by reflecting the image backward
+            ++p;
+        }
+    }
+}
+/**
+    \fn StackBlurLine_C
+*/
+void ADMVideoBlur::StackBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius)
+{
+    uint_fast32_t div;
+    uint_fast32_t mul_sum;
+    uint_fast32_t shr_sum;
+
+    uint_fast32_t l, p, i;
+    uint_fast32_t stack_ptr;
+    uint_fast32_t stack_start;
+
+    const uint8_t * src_pix_ptr;
+          uint8_t * dst_pix_ptr;
+    uint8_t *     stack_pix_ptr;
+
+    uint_fast32_t sum_r = 0;
+    uint_fast32_t sum_g = 0;
+    uint_fast32_t sum_b = 0;
+    uint_fast32_t sum_in_r = 0;
+    uint_fast32_t sum_in_g = 0;
+    uint_fast32_t sum_in_b = 0;
+    uint_fast32_t sum_out_r = 0;
+    uint_fast32_t sum_out_g = 0;
+    uint_fast32_t sum_out_b = 0;
+
+    uint_fast32_t lm  = len - 1;
+
+    if ((radius > 0) && (len > 1))
+    {
+        div = radius * 2 + 1;
+        mul_sum = g_stack_blur8_mul[radius];
+        shr_sum = g_stack_blur8_shr[radius];
+
+        for(i = 0; i <= radius; i++)
+        {
+            if ((radius - i) > lm)
+                src_pix_ptr = line + pixPitch*lm;
+            else
+                src_pix_ptr = line + pixPitch*(radius - i);    // fix flickering at the T/L edges, by reflecting the image backward
+            stack_pix_ptr    = (uint8_t *)&stack[i];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_out_r       += src_pix_ptr[0];
+            sum_r           += src_pix_ptr[0] * (i + 1);
+            sum_out_g       += src_pix_ptr[1];
+            sum_g           += src_pix_ptr[1] * (i + 1);
+            sum_out_b       += src_pix_ptr[2];
+            sum_b           += src_pix_ptr[2] * (i + 1);
+        }
+        src_pix_ptr = line;
+        for(i = 1; i <= radius; i++)
+        {
+            if(i <= lm) src_pix_ptr += pixPitch; 
+            stack_pix_ptr = (uint8_t *)&stack[i + radius];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_in_r        += src_pix_ptr[0];
+            sum_r           += src_pix_ptr[0] * (radius + 1 - i);
+            sum_in_g        += src_pix_ptr[1];
+            sum_g           += src_pix_ptr[1] * (radius + 1 - i);
+            sum_in_b        += src_pix_ptr[2];
+            sum_b           += src_pix_ptr[2] * (radius + 1 - i);
+        }
+
+        stack_ptr = radius;
+        p = radius;
+        if(p > lm) p = lm;
+        src_pix_ptr = line + pixPitch*p;
+        dst_pix_ptr = line;
+        for(l = 0; l < len; l++)
+        {
+            dst_pix_ptr[0] = (sum_r * mul_sum) >> shr_sum;
+            dst_pix_ptr[1] = (sum_g * mul_sum) >> shr_sum;
+            dst_pix_ptr[2] = (sum_b * mul_sum) >> shr_sum;
+            dst_pix_ptr   += pixPitch;
+
+            sum_r -= sum_out_r;
+            sum_g -= sum_out_g;
+            sum_b -= sum_out_b;
+   
+            stack_start = stack_ptr + div - radius;
+            if(stack_start >= div) stack_start -= div;
+            stack_pix_ptr = (uint8_t *)&stack[stack_start];
+
+            sum_out_r -= stack_pix_ptr[0];
+            sum_out_g -= stack_pix_ptr[1];
+            sum_out_b -= stack_pix_ptr[2];
+
+            if(p < lm) 
+                src_pix_ptr += pixPitch;
+            else if(p < lm*2) 
+                src_pix_ptr -= pixPitch;    // fix flickering at the B/R edges, by reflecting the image backward
+            ++p;
+
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+
+            sum_in_r += src_pix_ptr[0];
+            sum_in_g += src_pix_ptr[1];
+            sum_in_b += src_pix_ptr[2];
+            sum_r    += sum_in_r;
+            sum_g    += sum_in_g;
+            sum_b    += sum_in_b;
+
+            ++stack_ptr;
+            if(stack_ptr >= div) stack_ptr = 0;
+            stack_pix_ptr = (uint8_t *)&stack[stack_ptr];
+
+            sum_in_r  -= stack_pix_ptr[0];
+            sum_out_r += stack_pix_ptr[0];
+            sum_in_g  -= stack_pix_ptr[1];
+            sum_out_g += stack_pix_ptr[1];
+            sum_in_b  -= stack_pix_ptr[2];
+            sum_out_b += stack_pix_ptr[2];
+        }
+    }
+}
+/**
+    \fn BlurProcess_C
+*/
+void ADMVideoBlur::BlurProcess_C(ADMImage *img, int w, int h, blur param, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (!img || !rgbBufRaw || !rgbBufImage || !convertYuvToRgb || !convertRgbToYuv) return;
+    uint8_t * line;
+
+    unsigned int radius = param.radius;
+    if (radius > 254) radius = 254;
+    if (radius < 1) return;	// nothing to do
+
+    unsigned int algorithm = param.algorithm;
+    if (algorithm > 2) algorithm = 2;
+
+    int left = param.left;
+    int right = param.right;
+    int top = param.top;
+    int bottom = param.bottom;
+
+    if ((left < 0) || (left >= w)) return;
+    if ((right < 0) || (right >= w)) return;
+    if ((top < 0) || (top >= h)) return;
+    if ((bottom < 0) || (bottom >= h)) return;
+    if ((left+right) >= w) return;
+    if ((top+bottom) >= h) return;
+
+    uint32_t * stack = (uint32_t *)malloc(512 * sizeof(uint32_t));    // max 254*2+1=509 needed
+    if (!stack) return;
+
+    convertYuvToRgb->convertImage(img,rgbBufRaw->at(0));
+
+    int x, y;
+    uint8_t * rgbPtr = rgbBufRaw->at(0) + left*4 + top*rgbBufStride;
+    w -= (left+right);
+    h -= (top+bottom);
+
+    if (algorithm == 0) {    // Box blur
+        for(y = 0; y < h; y++)
+        {
+            BoxBlurLine_C((rgbPtr + y*rgbBufStride), w, 4, stack, radius);
+        };
+
+        for(x = 0; x < w; x++)
+        {
+            BoxBlurLine_C((rgbPtr + x*4), h, rgbBufStride, stack, radius);
+        };
+    } else
+    if (algorithm == 1) {    // Gaussian blur
+        for(y = 0; y < h; y++)
+        {
+            StackBlurLine_C((rgbPtr + y*rgbBufStride), w, 4, stack, radius);
+        };
+
+        for(x = 0; x < w; x++)
+        {
+            StackBlurLine_C((rgbPtr + x*4), h, rgbBufStride, stack, radius);
+        };
+    } else
+    if (algorithm == 2) {    // Gaussian blur 2 pass
+        radius = (int)((float)radius / 1.4142135623730950488);
+        for(y = 0; y < h; y++)
+        {
+            StackBlurLine_C((rgbPtr + y*rgbBufStride), w, 4, stack, radius);
+        };
+
+        for(x = 0; x < w; x++)
+        {
+            StackBlurLine_C((rgbPtr + x*4), h, rgbBufStride, stack, radius);
+        };
+
+        radius++;
+        if (radius > 254) radius = 254;
+        for(y = 0; y < h; y++)
+        {
+            StackBlurLine_C((rgbPtr + y*rgbBufStride), w, 4, stack, radius);
+        };
+
+        for(x = 0; x < w; x++)
+        {
+            StackBlurLine_C((rgbPtr + x*4), h, rgbBufStride, stack, radius);
+        };
+    }
+
+    convertRgbToYuv->convertImage(rgbBufImage,img);
+
+    free(stack);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoBlur::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getBlur(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoBlur::getConfiguration(void)
+{
+    static char s[256];
+    const char * algo=NULL;
+    switch(_param.algorithm) {
+        default:
+        case 0: algo="Box";
+            break;
+        case 1: algo="Near Gaussian";
+            break;
+        case 2: algo="Gaussian 2 pass";
+            break;
+    }
+    snprintf(s,255,"%s blur, Radius: %d. Left: %u, right: %u, top: %u, bottom: %u ",algo,_param.radius, (unsigned int)_param.left, (unsigned int)_param.right, (unsigned int)_param.top, (unsigned int)_param.bottom);
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoBlur::ADMVideoBlur(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,blur_param,&_param))
+    {
+        // Default value
+        _param.left=0;
+        _param.right=0;
+        _param.top=0;
+        _param.bottom=0;
+        _param.rubber_is_hidden=false;
+        _param.algorithm = 0;
+        _param.radius = 1;
+    }
+    BlurCreateBuffers(info.width,info.height, &(_rgbBufStride), &(_rgbBufRaw), &(_rgbBufImage), &(_convertYuvToRgb), &(_convertRgbToYuv));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoBlur::update(void)
+{
+}
+/**
+    \fn dtor
+*/
+ADMVideoBlur::~ADMVideoBlur()
+{
+    BlurDestroyBuffers(_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoBlur::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, blur_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoBlur::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, blur_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoBlur::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    BlurProcess_C(image,info.width,info.height,_param,_rgbBufStride,_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/ADM_vidBlur.h Added

@@ -0,0 +1,55 @@
+/***************************************************************************
+                          Blur filter ported from frei0r
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+
+/**
+    \class ADMVideoBlur
+*/
+class  ADMVideoBlur:public ADM_coreVideoFilter
+{
+
+  protected:
+    void                  update(void);
+    blur                  _param;
+    int                   _rgbBufStride;
+    ADM_byteBuffer *      _rgbBufRaw;
+    ADMImageRef *         _rgbBufImage;
+    ADMColorScalerFull *  _convertYuvToRgb;
+    ADMColorScalerFull *  _convertRgbToYuv;
+  public:
+    ADMVideoBlur(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoBlur();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface        
+
+    static void BlurCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv);
+    static void BlurDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+    static void BlurProcess_C(ADMImage *img, int w, int h, blur param, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+
+  private:
+    static void BoxBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius);
+    static void StackBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/blur.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/blur.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/blur_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/blur_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/cli/DIA_blur.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/qt4/DIA_flyBlur.cpp Added

@@ -0,0 +1,184 @@
+/**/
+/***************************************************************************
+                          DIA_flyBlur
+                             -------------------
+
+			   Ui for Blur
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyBlur.h"
+#include "ADM_vidBlur.h"
+
+/************* COMMON PART *********************/
+
+/**
+ */
+flyBlur::flyBlur (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+  {
+    rubber=new ADM_rubberControl(this,canvas);
+    _ox=0;
+    _oy=0;
+    _ow=width;
+    _oh=height;
+  }
+/**
+ * 
+ */
+flyBlur::~flyBlur()
+{
+    delete rubber;
+    rubber=NULL;
+}
+
+static int bound(int val, int other, int maxx)
+{
+   int r=(int)maxx-(int)(val+other);
+   if(r<0) 
+        r=0;
+   return r;
+}
+
+/**
+ * \fn bandResized
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @return 
+ */
+bool    flyBlur::bandResized(int x,int y,int w, int h)
+{
+
+    //aprintf("Rubber resized: x=%d, y=%d, w=%d, h=%d\n",x,y,w,h);
+    //aprintf("Debug: old values: x=%d, y=%d, w=%d, h=%d\n",_ox,_oy,_ow,_oh);
+
+    double halfzoom=_zoom/2-0.01;
+    // try to recalculate values only if these values were actually modified by moving the handles
+    bool leftHandleMoved=false;
+    bool rightHandleMoved=false;
+    if((x+w)==(_ox+_ow) && (y+h)==(_oy+_oh))
+        leftHandleMoved=true;
+    if(x==_ox && y==_oy)
+        rightHandleMoved=true;
+
+    _ox=x;
+    _oy=y;
+    _ow=w;
+    _oh=h;
+
+    bool ignore=false;
+    if(leftHandleMoved && rightHandleMoved) // bogus event
+        ignore=true;
+
+    int normX, normY, normW, normH;
+    normX=(int)(((double)x+halfzoom)/_zoom);
+    normY=(int)(((double)y+halfzoom)/_zoom);
+    normW=(int)(((double)w+halfzoom)/_zoom);
+    normH=(int)(((double)h+halfzoom)/_zoom);
+
+    // resize the rubberband back into bounds once the user tries to drag handles out of sight
+    bool resizeRubber=false;
+    if(normX<0 || normY<0 || normX+normW>_w || normY+normH>_h)
+    {
+        resizeRubber=true;
+        //aprintf("rubberband out of bounds, will be resized back\n");
+    }
+
+    if(ignore)
+    {
+        upload(false,resizeRubber);
+        return false;
+    }
+
+    if(rightHandleMoved)
+    {
+        right=bound(normX,normW,_w);
+        bottom=bound(normY,normH,_h);
+    }
+
+    if(normX<0) normX=0;
+    if(normY<0) normY=0;
+
+    if(leftHandleMoved)
+    {
+        top=normY;
+        left=normX;
+    }
+
+    upload(false,resizeRubber);
+    sameImage();
+  
+    return true; 
+}
+/**
+ * \fn bandMoved
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @return 
+ */
+bool    flyBlur::bandMoved(int x,int y,int w, int h)
+{
+    double halfzoom=_zoom/2-0.01;
+
+    int normX, normY, normW, normH;
+    normX=(int)(((double)x+halfzoom)/_zoom);
+    normY=(int)(((double)y+halfzoom)/_zoom);
+    normW=(int)(((double)w+halfzoom)/_zoom);
+    normH=(int)(((double)h+halfzoom)/_zoom);
+
+    // bound checks are done in rubber control
+
+    right=bound(normX,normW,_w);
+    bottom=bound(normY,normH,_h);
+
+    if(normX<0) normX=0;
+    if(normY<0) normY=0;
+
+    top=normY;
+    left=normX;
+
+    upload(false,false);
+    sameImage();
+  
+    return true; 
+}
+
+
+uint8_t  flyBlur::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyBlur::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    param.left = left;
+    param.top = top;
+    param.right = right;
+    param.bottom = bottom;
+    // Do it!
+    ADMVideoBlur::BlurProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),param, rgbBufStride, rgbBufRaw, rgbBufImage, convertYuvToRgb, convertRgbToYuv);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/qt4/DIA_flyBlur.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+  \fn     DIA_flyBlur
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for blur
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_BLUR_H
+#define FLY_BLUR_H
+#include "blur.h"
+/**
+    \class flyBlur
+*/
+class flyBlur : public ADM_flyDialogYuv
+{
+  friend class Ui_blurWindow;
+  public:
+    blur         param;
+    int                    rgbBufStride;
+    ADM_byteBuffer *       rgbBufRaw;
+    ADMImageRef *          rgbBufImage;
+    ADMColorScalerFull *   convertYuvToRgb;
+    ADMColorScalerFull *   convertRgbToYuv;
+    uint32_t   left,right,top,bottom;
+    bool       rubber_is_hidden;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void) {return upload(true,true);}
+    uint8_t    upload(bool redraw, bool rubber);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyBlur (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+              ~flyBlur();
+  protected:
+                ADM_rubberControl *rubber;
+    bool        blockChanges(bool block);
+    bool        bandResized(int x,int y,int w, int h);
+    bool        bandMoved(int x,int y,int w, int h);
+    int         _ox,_oy,_ow,_oh;
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/qt4/Q_blur.cpp Added

@@ -0,0 +1,334 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_blur.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidBlur.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_blurWindow::Ui_blurWindow(QWidget *parent, blur *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyBlur( this,width, height,in,canvas,ui.horizontalSlider);
+        ADMVideoBlur::BlurCreateBuffers(width,height, &(myFly->rgbBufStride), &(myFly->rgbBufRaw), &(myFly->rgbBufImage), &(myFly->convertYuvToRgb), &(myFly->convertRgbToYuv));
+        memcpy(&(myFly->param),param,sizeof(blur));
+        myFly->left=param->left;
+        myFly->right=param->right;
+        myFly->top=param->top;
+        myFly->bottom=param->bottom;
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        myFly->rubber->nestedIgnore=1;
+        myFly->rubber_is_hidden=param->rubber_is_hidden;
+        ui.checkBoxRubber->setChecked(myFly->rubber_is_hidden);
+        myFly->rubber->rubberband->setVisible(!myFly->rubber_is_hidden);
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        connect( ui.checkBoxRubber,SIGNAL(stateChanged(int)),this,SLOT(toggleRubber(int)));
+#define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSpinBox(int))); ui.spinBox##x->setKeyboardTracking(true);
+        SPINNER(Left);
+        SPINNER(Right);
+        SPINNER(Top);
+        SPINNER(Bottom);
+#undef SPINNER
+        connect(ui.comboBoxAlgorithm, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSpinBox(int)));
+        SPINNER(Radius)
+
+        QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+        setModal(true);
+}
+void Ui_blurWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_blurWindow::gather(blur *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(blur));
+    param->left=myFly->left;
+    param->right=myFly->right;
+    param->top=myFly->top;
+    param->bottom=myFly->bottom;
+    param->rubber_is_hidden=myFly->rubber_is_hidden;
+}
+Ui_blurWindow::~Ui_blurWindow()
+{
+    if(myFly) {
+        ADMVideoBlur::BlurDestroyBuffers(myFly->rgbBufRaw, myFly->rgbBufImage, myFly->convertYuvToRgb, myFly->convertRgbToYuv);
+        delete myFly;
+    }
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.spinBox##x->blockSignals(true); \
+        ui.spinBox##x->setValue(ui.horizontalSlider##x->value()); \
+        ui.spinBox##x->blockSignals(false);
+void Ui_blurWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Radius);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue(ui.spinBox##x->value()); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_blurWindow::valueChangedSpinBox(int foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Radius);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+/**
+ * \fn reset
+ */
+void Ui_blurWindow::reset( bool f )
+{
+    myFly->left=0;
+    myFly->right=0;
+    myFly->bottom=0;
+    myFly->top=0;
+    lock++;
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+/**
+ * \fn toggleRubber
+ */
+void Ui_blurWindow::toggleRubber(int checkState)
+{
+    bool visible=true;
+    if(checkState)
+        visible=false;
+    myFly->rubber->rubberband->setVisible(visible);
+    myFly->rubber_is_hidden=!visible;
+}
+void Ui_blurWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+
+    int x=(int)((double)myFly->left*myFly->_zoom);
+    int y=(int)((double)myFly->top*myFly->_zoom);
+    int w=(int)((double)(myFly->_w-(myFly->left+myFly->right))*myFly->_zoom);
+    int h=(int)((double)(myFly->_h-(myFly->top+myFly->bottom))*myFly->_zoom);
+
+    myFly->blockChanges(true);
+    myFly->rubber->nestedIgnore++;
+    myFly->rubber->move(x,y);
+    myFly->rubber->resize(w,h);
+    myFly->rubber->nestedIgnore--;
+    myFly->blockChanges(false);
+}
+
+void Ui_blurWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+    myFly->rubber->nestedIgnore=0;
+    if(myFly->rubber_is_hidden)
+        myFly->rubber->rubberband->hide();
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSLIDER(x) w->horizontalSlider##x
+#define MYSPIN(x) w->spinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADSPIN(x, value) \
+        w->spinBox##x->blockSignals(true); \
+        w->spinBox##x->setValue(value); \
+        w->spinBox##x->blockSignals(false);
+//************************
+uint8_t flyBlur::upload(bool redraw, bool toRubber)
+{
+    if(!redraw)
+    {
+        blockChanges(true);
+    }
+
+    Ui_blurDialog *w=(Ui_blurDialog *)_cookie;
+    MYCOMBOX(Algorithm)->setCurrentIndex(param.algorithm);
+    MYSLIDER(Radius)->setValue((int)param.radius);
+    UPLOADSPIN(Radius, param.radius);
+
+    w->spinBoxLeft->setValue(left);
+    w->spinBoxRight->setValue(right);
+    w->spinBoxTop->setValue(top);
+    w->spinBoxBottom->setValue(bottom);
+
+    if(toRubber)
+    {
+        rubber->nestedIgnore++;
+        rubber->move(_zoom*(float)left,_zoom*(float)top);
+        rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+        rubber->nestedIgnore--;
+    }
+
+    if(!redraw)
+    {
+        blockChanges(false);
+    }
+
+    return 1;
+}
+uint8_t flyBlur::download(void)
+{
+    int reject=0;
+    Ui_blurDialog *w=(Ui_blurDialog *)_cookie;
+    param.algorithm=MYCOMBOX(Algorithm)->currentIndex();
+    param.radius=(int)MYSLIDER(Radius)->value();
+
+#define SPIN_GET(x,y) x=w->spinBox##y->value();
+    SPIN_GET(left,Left);
+    SPIN_GET(right,Right);
+    SPIN_GET(top,Top);
+    SPIN_GET(bottom,Bottom);
+
+    if((top+bottom)>_h)
+        {
+                top=bottom=0;
+                reject=1;
+        }
+    if((left+right)>_w)
+        {
+                left=right=0;
+                reject=1;
+        }
+    if(reject)
+        upload();
+    else
+   {
+       blockChanges(true);
+       rubber->nestedIgnore++;
+       rubber->move(_zoom*(float)left,_zoom*(float)top);
+       rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+       rubber->nestedIgnore--;
+       blockChanges(false);
+   }
+    return 1;
+}
+void flyBlur::setTabOrder(void)
+{
+    Ui_blurDialog *w=(Ui_blurDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSHCOMBOX(x) controls.push_back(MYCOMBOX(x));
+#define PUSHSLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(w->checkBox##x);
+    PUSH_SPIN(Left)
+    PUSH_SPIN(Right)
+    PUSH_SPIN(Top)
+    PUSH_SPIN(Bottom)
+    PUSH_TOG(Rubber)
+
+    PUSHCOMBOX(Algorithm)
+    PUSHSLIDER(Radius)
+    PUSH_SPIN(Radius)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+ * \fn blockChanges
+ * @param block
+ * @return 
+ */
+#define APPLY_TO_ALL(x) {w->spinBoxLeft->x;w->spinBoxRight->x;w->spinBoxTop->x;w->spinBoxBottom->x;rubber->x;}
+bool flyBlur::blockChanges(bool block)
+{
+    Ui_blurDialog *w=(Ui_blurDialog *)_cookie;
+    APPLY_TO_ALL(blockSignals(block));
+    return true;
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getBlur(blur *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_blurWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/qt4/Q_blur.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/blur/qt4/blur.ui Added

@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>blurDialog</class>
+ <widget class="QDialog" name="blurDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>720</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Blur</string>
+  </property>
+  <layout class="QGridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="3" column="0" colspan="2">
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" rowspan="2" colspan="2">
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="1" column="7">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>radius</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>99999</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelLeft">
+       <property name="text">
+        <string>Left:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
+        <number>99999</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelTop">
+       <property name="text">
+        <string>Top:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
+        <number>99999</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="labelBottom">
+       <property name="text">
+        <string>Bottom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
+        <number>99999</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="labelRight">
+       <property name="text">
+        <string>Right:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QCheckBox" name="checkBoxRubber">
+       <property name="text">
+        <string>&amp;Hide Rubber Band</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="6">
+      <widget class="QComboBox" name="comboBoxAlgorithm">
+       <item>
+        <property name="text">
+         <string>Box blur</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Near Gaussian</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Gaussian 2 pass</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="8">
+      <widget class="QSlider" name="horizontalSliderRadius">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>200</number>
+       </property>
+       <property name="pageStep">
+        <number>20</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="8">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="9">
+      <widget class="QSpinBox" name="spinBoxRadius">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>200</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>blurDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>blurDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp Changed

@@ -182,7 +182,7 @@
     double fps1000=configuration.newFpsNum*1000;
     fps1000/=configuration.newFpsDen;
     // 1 update frame increment...
-    info.frameIncrement=ADM_Fps1000FromUs( (uint64_t)fps1000);
+    info.frameIncrement=ADM_UsecFromFps1000((uint64_t)fps1000);
 
     // 2 update duration
     double timing=previousFilter->getInfo()->totalDuration;
@@ -192,6 +192,20 @@
     timing/=configuration.oldFpsDen;
     info.totalDuration=(uint64_t)timing;
 
+    timing=previousFilter->getInfo()->markerA;
+    timing*=configuration.oldFpsNum;
+    timing*=configuration.newFpsDen;
+    timing/=configuration.newFpsNum;
+    timing/=configuration.oldFpsDen;
+    info.markerA=(uint64_t)timing;
+
+    timing=previousFilter->getInfo()->markerB;
+    timing*=configuration.oldFpsNum;
+    timing*=configuration.newFpsDen;
+    timing/=configuration.newFpsNum;
+    timing/=configuration.oldFpsDen;
+    info.markerB=(uint64_t)timing;
+
     // 3 update timebase
     info.timeBaseDen=configuration.newFpsNum;
     info.timeBaseNum=configuration.newFpsDen;
@@ -212,22 +226,17 @@
 
 
 ADM_assert(nbPredefined == 6);
-  
-   diaMenuEntry tFps[]={
-#define Z(x)                 {x,     predefinedFps[x].desc}
-                    Z(0),Z(1),Z(2),Z(3),Z(4),Z(5)
 
-          };
-    
-    
+#define Z(x) {x, predefinedFps[x].desc, NULL}
+    diaMenuEntry tFps[]={Z(0),Z(1),Z(2),Z(3),Z(4),Z(5)};
 
     diaElemMenu mFps(&(configuration.oldMode),   QT_TRANSLATE_NOOP("changeFps","Source Fps:"), 6,tFps);
-    diaElemFloat fps(&oldFrac,QT_TRANSLATE_NOOP("changeFps","Source frame rate:"),1,240.,NULL,3);
+    diaElemFloat fps(&oldFrac,QT_TRANSLATE_NOOP("changeFps","Source frame rate:"),1,1000.,NULL,3);
 
     mFps.link(tFps+0,1,&fps); // only activate entry in custom mode
 
     diaElemMenu targetmFps(&(configuration.newMode),   QT_TRANSLATE_NOOP("changeFps","Destination Fps:"), 6,tFps);
-    diaElemFloat targetfps(&newFrac,QT_TRANSLATE_NOOP("changeFps","Destination frame rate:"),1,200.);
+    diaElemFloat targetfps(&newFrac,QT_TRANSLATE_NOOP("changeFps","Destination frame rate:"),1,1000.);
 
     targetmFps.link(tFps+0,1,&targetfps); // only activate entry in custom mode

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/chromaShift/qt4/Q_chromashift.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.cpp Added

@@ -0,0 +1,451 @@
+/***************************************************************************
+                          ColorBalance filter 
+    Algorithm:
+        Copyright 2009 Maksim Golovkin (m4ks1k@gmail.com)
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "colorBalance.h"
+#include "colorBalance_desc.cpp"
+#include "ADM_vidColorBalance.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getColorBalance(colorBalance *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoColorBalance,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoColorBalance,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_COLORS,            // Category
+                                      "colorBalance",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("colorBalance","Color balance"),            // Display name
+                                      QT_TRANSLATE_NOOP("colorBalance","Adjust shadow, midtone and highlight.") // Description
+                                  );
+
+/**
+    \fn gaussSLESolve
+*/
+void ADMVideoColorBalance::gaussSLESolve(size_t size, double* A, double *solution)
+{
+    int extSize = size + 1;
+    //direct way: tranform matrix A to triangular form
+    for(int row = 0; row < size; row++) {
+        int col = row;
+        int lastRowToSwap = size - 1;
+        while (A[row * extSize + col] == 0 && lastRowToSwap > row) { //checking if current and lower rows can be swapped
+            for(int i = 0; i < extSize; i++) {
+                double tmp = A[row * extSize + i];
+                A[row * extSize + i] = A[lastRowToSwap * extSize + i];
+                A[lastRowToSwap * extSize + i] = tmp;
+            }
+            lastRowToSwap--;
+        }
+        double coeff = A[row * extSize + col];
+        for(int j = 0; j < extSize; j++)  
+            A[row * extSize + j] /= coeff;
+        if (lastRowToSwap > row) {
+            for(int i = row + 1; i < size; i++) {
+                double rowCoeff = -A[i * extSize + col];
+                for(int j = col; j < extSize; j++)
+                    A[i * extSize + j] += A[row * extSize + j] * rowCoeff;
+            }
+        }
+    }
+    //backward way: find solution from last to first
+    memset(solution, 0, size*sizeof(double));
+    for(int i = size - 1; i >= 0; i--) {
+        solution[i] = A[i * extSize + size];// 
+        for(int j = size - 1; j > i; j--) {
+            solution[i] -= solution[j] * A[i * extSize + j];
+        }
+    }
+}
+/**
+    \fn calcParabolaCoeffs
+*/
+void ADMVideoColorBalance::calcParabolaCoeffs(double* points, double *coeffs)
+{
+    double m[12];
+    for(int i = 0; i < 3; i++) {
+        int offset = i * 2;
+        m[i * 4] = points[offset] * points[offset];
+        m[i * 4 + 1] = points[offset];
+        m[i * 4 + 2] = 1;
+        m[i * 4 + 3] = points[offset + 1];
+    }
+    gaussSLESolve(3, m, coeffs);
+}
+/**
+    \fn parabola
+*/
+float ADMVideoColorBalance::parabola(double x, double* coeffs)
+{
+    return (float)((coeffs[0] * x + coeffs[1]) * x + coeffs[2]);
+}
+/**
+    \fn quadraticCurve
+*/
+void ADMVideoColorBalance::quadraticCurve(int * map, float loPoint, float mdPoint, float hiPoint, float curveMin, float curveMax, bool limitedRange, float frMul, float lrMul, float lrOffset)
+{
+    double points[6], coeffs[3];
+    points[0] = 0.0;
+    points[1] = loPoint;
+    points[2] = 0.5;
+    points[3] = mdPoint;
+    points[4] = 1.0;
+    points[5] = hiPoint;
+    calcParabolaCoeffs(points, coeffs);
+
+    if (limitedRange)
+    {
+        for(int i = 0; i < 220; i++)
+        {
+            map[i+16] = std::round(valueLimit(parabola(i / 219., coeffs), curveMin, curveMax) * lrMul + lrOffset);
+        }
+        for(int i = 0; i < 16; i++)
+        {
+            map[i] = map[16];
+        }
+        for(int i = 236; i < 256; i++)
+        {
+            map[i] = map[235];
+        }
+    } else {
+        for(int i = 0; i < 256; i++)
+        {
+            map[i] = std::round(valueLimit(parabola(i / 255., coeffs), curveMin, curveMax) * frMul);
+        }
+    }
+}
+/**
+    \fn ColorBalanceProcess_C
+*/
+void ADMVideoColorBalance::ColorBalanceProcess_C(ADMImage *img, colorBalance cfg)
+{
+    if (!img) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    uint8_t * ptr, * ptrU, *ptrV, * plane[3];
+    int stride[3];
+    int limitL = 0;
+    int limitH = 255;
+    int limitcL = 0;
+    int limitcH = 255;
+
+    int * buf = (int*)malloc(256*4*sizeof(int));
+    if (!buf) return;
+    int * mapY = &buf[0*256];
+    int * mapU = &buf[1*256];
+    int * mapV = &buf[2*256];
+    int * mapS = &buf[3*256];
+
+    img->GetReadPlanes(plane);
+    img->GetPitches(stride);
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+    {
+        limitL = 16;
+        limitH = 235;
+        limitcL = 16;
+        limitcH = 239;
+    }
+
+    cfg.loLuma = valueLimit(cfg.loLuma,0.0,1.0);
+    cfg.mdLuma = valueLimit(cfg.mdLuma,0.0,1.0);
+    cfg.hiLuma = valueLimit(cfg.hiLuma,0.0,1.0);
+    cfg.loShift = valueLimit(cfg.loShift,0.0,1.0);
+    cfg.mdShift = valueLimit(cfg.mdShift,0.0,1.0);
+    cfg.hiShift = valueLimit(cfg.hiShift,0.0,1.0);
+    cfg.loSaturation = valueLimit(cfg.loSaturation,-1.0,1.0)+1.0;
+    cfg.mdSaturation = valueLimit(cfg.mdSaturation,-1.0,1.0)+1.0;
+    cfg.hiSaturation = valueLimit(cfg.hiSaturation,-1.0,1.0)+1.0;
+
+    // Luma MAP
+    quadraticCurve(mapY, cfg.loLuma, cfg.mdLuma, cfg.hiLuma, 0.0, 1.0, (img->_range == ADM_COL_RANGE_MPEG), 255.0, 220.0, 16.0);
+
+    // Chroma MAP
+    double vecU[3],vecV[3];
+    vecU[0] = std::sin(cfg.loAngle*(M_PI/180.0))*cfg.loShift;    // WTF?? why U need sine?
+    vecV[0] = std::cos(cfg.loAngle*(M_PI/180.0))*cfg.loShift;
+    vecU[1] = std::sin(cfg.mdAngle*(M_PI/180.0))*cfg.mdShift;
+    vecV[1] = std::cos(cfg.mdAngle*(M_PI/180.0))*cfg.mdShift;
+    vecU[2] = std::sin(cfg.hiAngle*(M_PI/180.0))*cfg.hiShift;
+    vecV[2] = std::cos(cfg.hiAngle*(M_PI/180.0))*cfg.hiShift;
+    quadraticCurve(mapU, vecU[0], vecU[1], vecU[2], -1.0, 1.0, (img->_range == ADM_COL_RANGE_MPEG), 128.0, 112.0, 0.0);
+    quadraticCurve(mapV, vecV[0], vecV[1], vecV[2], -1.0, 1.0, (img->_range == ADM_COL_RANGE_MPEG), 128.0, 112.0, 0.0);
+
+    // Saturation MAP
+    quadraticCurve(mapS, cfg.loSaturation, cfg.mdSaturation, cfg.hiSaturation, 0.0, 2.0, (img->_range == ADM_COL_RANGE_MPEG), 256.0, 256.0, 0.0);
+
+
+    // Chroma corrections
+    ptr = plane[0];
+    ptrU = plane[1];
+    ptrV = plane[2];
+    int lumas[4];
+    int pixel, sumpixel;
+    for(int y=0;y<height/2;y++)
+    {
+        for (int x=0;x<width/2;x++)
+        {
+            lumas[0] = *(ptr + 2*x);
+            lumas[1] = *(ptr + 2*x + 1);
+            lumas[2] = *(ptr + stride[0] + 2*x);
+            lumas[3] = *(ptr + stride[0] + 2*x + 1);
+
+            pixel = ptrU[x];
+            pixel -= 128;
+            sumpixel = 0;
+            for (int i=0; i<4; i++)
+            {
+                sumpixel += (((pixel + mapU[lumas[i]]) * mapS[lumas[i]]) >> 8);
+            }
+            pixel = sumpixel >> 2;
+            pixel += 128;
+            ptrU[x] = valueLimit(pixel,limitcL,limitcH);
+
+
+            pixel = ptrV[x];
+            pixel -= 128;
+            sumpixel = 0;
+            for (int i=0; i<4; i++)
+            {
+                sumpixel += (((pixel + mapV[lumas[i]]) * mapS[lumas[i]]) >> 8);
+            }
+            pixel = sumpixel >> 2;
+            pixel += 128;
+            ptrV[x] = valueLimit(pixel,limitcL,limitcH);
+        }
+        ptr += 2*stride[0];
+        ptrU += stride[1];
+        ptrV += stride[2];
+    }
+
+    // Luma corrections
+    ptr = plane[0];
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            ptr[x] = mapY[ptr[x]];
+        }
+        ptr += stride[0];
+    }
+
+    free(buf);
+}
+/**
+    \fn ColorBalanceRanges_C
+*/
+void ADMVideoColorBalance::ColorBalanceRanges_C(ADMImage *img)
+{
+    if (!img) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    uint8_t * ptr, * plane[3];
+    int stride[3];
+
+    img->GetReadPlanes(plane);
+    img->GetPitches(stride);
+
+    for (int p=1; p<3; p++)
+    {
+        for(int y=0;y<height/2;y++)
+        {
+            memset(plane[p],128,width/2);
+            plane[p] += stride[p];
+        }
+    }
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+    {
+        ptr = plane[0];
+        for(int y=0;y<height;y++)
+        {
+            for (int x=0;x<width;x++)
+            {
+                if (ptr[x] < 89)
+                    ptr[x] = 16;
+                else if (ptr[x] < 163)
+                    ptr[x] = 126;
+                else
+                    ptr[x] = 235;
+            }
+            ptr += stride[0];
+        }
+    } else {
+        ptr = plane[0];
+        for(int y=0;y<height;y++)
+        {
+            for (int x=0;x<width;x++)
+            {
+                if (ptr[x] < 85)
+                    ptr[x] = 0;
+                else if (ptr[x] < 170)
+                    ptr[x] = 127;
+                else
+                    ptr[x] = 255;
+            }
+            ptr += stride[0];
+        }
+    }
+
+}
+/**
+    \fn configure
+*/
+bool ADMVideoColorBalance::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getColorBalance(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoColorBalance::getConfiguration(void)
+{
+    static char s[2560];
+    snprintf(s,2559,"              [Luma; Angle; Shift; Saturation]\nShadow:   [%.2f; %.0f; %.2f; %.2f]\nMidtone:  [%.2f; %.0f; %.2f; %.2f]\nHighlight: [%.2f; %.0f; %.2f; %.2f]\n", 
+                                        _param.loLuma, _param.loAngle, _param.loShift, _param.loSaturation, 
+                                        _param.mdLuma, _param.mdAngle, _param.mdShift, _param.mdSaturation, 
+                                        _param.hiLuma, _param.hiAngle, _param.hiShift, _param.hiSaturation );
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoColorBalance::ADMVideoColorBalance(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,colorBalance_param,&_param))
+        reset(&_param);
+    update();
+}
+/**
+    \fn reset
+*/
+void ADMVideoColorBalance::reset(colorBalance *cfg)
+{
+    cfg->loLuma = 0.0;
+    cfg->mdLuma = 0.5;
+    cfg->hiLuma = 1.0;
+    cfg->loAngle = 150.0;
+    cfg->mdAngle = 150.0;
+    cfg->hiAngle = 150.0;
+    cfg->loShift = 0.0;
+    cfg->mdShift = 0.0;
+    cfg->hiShift = 0.0;
+    cfg->loSaturation = 0.0;
+    cfg->mdSaturation = 0.0;
+    cfg->hiSaturation = 0.0;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoColorBalance::valueLimit(float val, float min, float max)
+{
+    if (val < min) return min;
+    if (val > max) return max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoColorBalance::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) return min;
+    if (val > max) return max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoColorBalance::update(void)
+{
+    _internalparam.loLuma = valueLimit(_param.loLuma,0.0,1.0);
+    _internalparam.mdLuma = valueLimit(_param.mdLuma,0.0,1.0);
+    _internalparam.hiLuma = valueLimit(_param.hiLuma,0.0,1.0);
+    _internalparam.loAngle = _param.loAngle;
+    _internalparam.mdAngle = _param.mdAngle;
+    _internalparam.hiAngle = _param.hiAngle;
+    _internalparam.loShift = valueLimit(_param.loShift,0.0,1.0);
+    _internalparam.mdShift = valueLimit(_param.mdShift,0.0,1.0);
+    _internalparam.hiShift = valueLimit(_param.hiShift,0.0,1.0);
+    _internalparam.loSaturation = valueLimit(_param.loSaturation,-1.0,1.0);
+    _internalparam.mdSaturation = valueLimit(_param.mdSaturation,-1.0,1.0);
+    _internalparam.hiSaturation = valueLimit(_param.hiSaturation,-1.0,1.0);
+}
+/**
+    \fn dtor
+*/
+ADMVideoColorBalance::~ADMVideoColorBalance()
+{
+
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoColorBalance::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, colorBalance_param,&_param);
+}
+
+void ADMVideoColorBalance::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, colorBalance_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoColorBalance::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ColorBalanceProcess_C(image, _internalparam);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/ADM_vidColorBalance.h Added

@@ -0,0 +1,53 @@
+/***************************************************************************
+                          ColorBalance filter 
+    Algorithm:
+        Copyright 2009 Maksim Golovkin (m4ks1k@gmail.com)
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoColorBalance
+*/
+class  ADMVideoColorBalance:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    colorBalance     _param;
+    colorBalance     _internalparam;
+  public:
+    ADMVideoColorBalance(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoColorBalance();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static  void         ColorBalanceProcess_C(ADMImage *img, colorBalance cfg);
+    static  void         ColorBalanceRanges_C(ADMImage *img);
+    static  void         reset(colorBalance *cfg);
+
+  private:
+    static float         valueLimit(float val, float min, float max);
+    static int32_t       valueLimit(int32_t val, int32_t min, int32_t max);
+    static void          gaussSLESolve(size_t size, double* A, double *solution);
+    static void          calcParabolaCoeffs(double* points, double *coeffs);
+    static float         parabola(double x, double* coeffs);
+    static void          quadraticCurve(int * map, float loPoint, float mdPoint, float hiPoint, float curveMin, float curveMax, bool limitedRange, float frMul, float lrMul, float lrOffset);
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/cli/DIA_colorBalance.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance_desc.cpp Added

@@ -0,0 +1,16 @@
+// automatically generated by admSerialization.py, do not edit!
+extern const ADM_paramList colorBalance_param[]={
+ {"loLuma",offsetof(colorBalance,loLuma),"float",ADM_param_float},
+ {"mdLuma",offsetof(colorBalance,mdLuma),"float",ADM_param_float},
+ {"hiLuma",offsetof(colorBalance,hiLuma),"float",ADM_param_float},
+ {"loAngle",offsetof(colorBalance,loAngle),"float",ADM_param_float},
+ {"mdAngle",offsetof(colorBalance,mdAngle),"float",ADM_param_float},
+ {"hiAngle",offsetof(colorBalance,hiAngle),"float",ADM_param_float},
+ {"loShift",offsetof(colorBalance,loShift),"float",ADM_param_float},
+ {"mdShift",offsetof(colorBalance,mdShift),"float",ADM_param_float},
+ {"hiShift",offsetof(colorBalance,hiShift),"float",ADM_param_float},
+ {"loSaturation",offsetof(colorBalance,loSaturation),"float",ADM_param_float},
+ {"mdSaturation",offsetof(colorBalance,mdSaturation),"float",ADM_param_float},
+ {"hiSaturation",offsetof(colorBalance,hiSaturation),"float",ADM_param_float},
+{NULL,0,NULL}
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/colorBalance_json.cpp Added

@@ -0,0 +1,29 @@
+// automatically generated by admSerialization.py, do not edit!
+#include "ADM_default.h"
+#include "ADM_paramList.h"
+#include "ADM_coreJson.h"
+#include "colorBalance.h"
+bool  colorBalance_jserialize(const char *file, const colorBalance *key){
+admJson json;
+json.addFloat("loLuma",key->loLuma);
+json.addFloat("mdLuma",key->mdLuma);
+json.addFloat("hiLuma",key->hiLuma);
+json.addFloat("loAngle",key->loAngle);
+json.addFloat("mdAngle",key->mdAngle);
+json.addFloat("hiAngle",key->hiAngle);
+json.addFloat("loShift",key->loShift);
+json.addFloat("mdShift",key->mdShift);
+json.addFloat("hiShift",key->hiShift);
+json.addFloat("loSaturation",key->loSaturation);
+json.addFloat("mdSaturation",key->mdSaturation);
+json.addFloat("hiSaturation",key->hiSaturation);
+return json.dumpToFile(file);
+};
+bool  colorBalance_jdeserialize(const char *file, const ADM_paramList *tmpl,colorBalance *key){
+admJsonToCouple json;
+CONFcouple *c=json.readFromFile(file);
+if(!c) {ADM_error("Cannot read json file");return false;}
+bool r= ADM_paramLoadPartial(c,tmpl,key);
+delete c;
+return r;
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/DIA_flyColorBalance.cpp Added

@@ -0,0 +1,46 @@
+/**/
+/***************************************************************************
+                          DIA_ColorBalance
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "DIA_flyColorBalance.h"
+#include "ADM_vidColorBalance.h"
+
+
+/**
+    \fn update
+*/
+uint8_t  flyColorBalance::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyColorBalance::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    if (showRanges)
+        ADMVideoColorBalance::ColorBalanceRanges_C(out);
+    else
+        ADMVideoColorBalance::ColorBalanceProcess_C(out, param);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/DIA_flyColorBalance.h Added

@@ -0,0 +1,37 @@
+/***************************************************************************
+  \fn     DIA_flyColorBalance
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for colorBalance
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_ColorBalance_H
+#define FLY_ColorBalance_H
+#include "colorBalance.h"
+/**
+    \class flyColorBalance
+*/
+class flyColorBalance : public ADM_flyDialogYuv
+{
+
+  public:
+    colorBalance  param;
+    bool          showRanges;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyColorBalance (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider)  : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+    virtual    ~flyColorBalance() {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.cpp Added

@@ -0,0 +1,319 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_colorBalance.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidColorBalance.h"
+#include <cmath>
+#include <QPalette>
+#include <QColor>
+#ifndef M_PI
+    #define M_PI 3.14159265358979323846
+#endif
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+
+Ui_colorBalanceWindow::Ui_colorBalanceWindow(QWidget *parent, colorBalance *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        peekRangesBtn=new QPushButton();
+        peekRangesBtn->setObjectName(QString("peekRangesBtn"));
+        peekRangesBtn->setAutoRepeat(false);
+        peekRangesBtn->setText(QApplication::translate("colorBalance", "Peek Ranges", 0));
+        peekRangesBtn->setToolTip(QApplication::translate("colorBalance", "Show shadow, midtone and highlight areas in black,gray and white colors", 0));
+
+        myFly=new flyColorBalance( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(colorBalance));
+        myFly->showRanges = false;
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn + ControlOption::UserWidgetBeforePeekBtn, peekRangesBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x,y,z) ui.slider##x->setScale(1,y,z); \
+        connect( ui.slider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(LoLuma,100,2)
+        SPINNER(MdLuma,100,2)
+        SPINNER(HiLuma,100,2)
+        SPINNER(LoChromaShift,100,2)
+        SPINNER(MdChromaShift,100,2)
+        SPINNER(HiChromaShift,100,2)
+        SPINNER(LoSaturation,100,2)
+        SPINNER(MdSaturation,100,2)
+        SPINNER(HiSaturation,100,2)
+
+#define DIAL(x) connect( ui.dial##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        DIAL(LoHue)
+        DIAL(MdHue)
+        DIAL(HiHue)
+
+        connect( peekRangesBtn,SIGNAL(pressed()),this,SLOT(peekRangesPressed()));
+        connect( peekRangesBtn,SIGNAL(released()),this,SLOT(peekRangesReleased()));
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_colorBalanceWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_colorBalanceWindow::gather(colorBalance *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(colorBalance));
+}
+Ui_colorBalanceWindow::~Ui_colorBalanceWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL;
+    //delete peekRangesBtn;	// deleted as child of the window
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_colorBalanceWindow::rgb2yuv(int * yuv, int * rgb)
+{
+    yuv[0] = std::round( 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]);
+    yuv[1] = std::round(-0.169*rgb[0] - 0.331*rgb[1] + 0.500*rgb[2]);
+    yuv[2] = std::round( 0.500*rgb[0] - 0.419*rgb[1] - 0.081*rgb[2]);
+    if (yuv[0] <   0) yuv[0] = 0;
+    if (yuv[0] > 255) yuv[0] = 255;
+    if (yuv[1] < -128) yuv[1] = -128;
+    if (yuv[1] >  127) yuv[1] = 127;
+    if (yuv[2] < -128) yuv[2] = -128;
+    if (yuv[2] >  127) yuv[2] = 127;
+}
+void Ui_colorBalanceWindow::yuv2rgb(int * rgb, int * yuv)
+{
+    rgb[0] = std::round(yuv[0]                +   1.4*yuv[2]);
+    rgb[1] = std::round(yuv[0] - 0.343*yuv[1] - 0.711*yuv[2]);
+    rgb[2] = std::round(yuv[0] + 1.765*yuv[1]               );
+    for (int i=0; i<3; i++)
+    {
+        if (rgb[i] < 0) rgb[i] = 0;
+        if (rgb[i] > 255) rgb[i] = 255;
+    }
+}
+void Ui_colorBalanceWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_colorBalanceWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoColorBalance::reset(&myFly->param);
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_colorBalanceWindow::peekRangesPressed(void)
+{
+    myFly->showRanges = true;
+    if(lock) return;
+    lock++;
+    myFly->sameImage();
+    lock--;
+}
+void Ui_colorBalanceWindow::peekRangesReleased(void)
+{
+    myFly->showRanges = false;
+    if(lock) return;
+    lock++;
+    myFly->sameImage();
+    lock--;
+}
+void Ui_colorBalanceWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_colorBalanceWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+void Ui_colorBalanceWindow::setHueColor(QDial * d, int angle)
+{
+    int rgb[3],yuv[3];
+    yuv[0] = 160;//96;
+    yuv[1] = cos(M_PI*(angle/180.0))*127;
+    yuv[2] = sin(M_PI*(angle/180.0))*127;
+    yuv2rgb(rgb, yuv);
+    QPalette pal = d->palette();
+    pal.setColor(QPalette::Button, QColor(rgb[0],rgb[1],rgb[2]));
+    d->setAutoFillBackground(true);
+    d->setPalette(pal);
+    d->show();
+    angle = 270-angle;
+    while (angle < 0) angle += 360;
+    d->setValue(angle);
+
+}
+
+int Ui_colorBalanceWindow::getHueColor(QDial * d)
+{
+    int angle = d->value();
+    angle = 270-angle;
+    while (angle < 0) angle += 360;
+    int rgb[3],yuv[3];
+    yuv[0] = 160;//96;
+    yuv[1] = cos(M_PI*(angle/180.0))*127;
+    yuv[2] = sin(M_PI*(angle/180.0))*127;
+    yuv2rgb(rgb, yuv);
+    QPalette pal = d->palette();
+    pal.setColor(QPalette::Button, QColor(rgb[0],rgb[1],rgb[2]));
+    d->setAutoFillBackground(true);
+    d->setPalette(pal);
+    d->show();
+    return angle;
+}
+
+#define MYSPIN(x) w->slider##x
+#define MYDIAL(x) w->dial##x
+#define MYCHECK(x) w->checkBox##x
+//************************
+uint8_t flyColorBalance::upload(void)
+{
+    Ui_colorBalanceDialog *w=(Ui_colorBalanceDialog *)_cookie;
+
+    MYSPIN(LoLuma)->setValue((int)round(param.loLuma*100.0));
+    MYSPIN(MdLuma)->setValue((int)round(param.mdLuma*100.0));
+    MYSPIN(HiLuma)->setValue((int)round(param.hiLuma*100.0));
+    Ui_colorBalanceWindow::setHueColor(MYDIAL(LoHue), (int)round(param.loAngle));
+    Ui_colorBalanceWindow::setHueColor(MYDIAL(MdHue), (int)round(param.mdAngle));
+    Ui_colorBalanceWindow::setHueColor(MYDIAL(HiHue), (int)round(param.hiAngle));
+    MYSPIN(LoChromaShift)->setValue((int)round(param.loShift*100.0));
+    MYSPIN(MdChromaShift)->setValue((int)round(param.mdShift*100.0));
+    MYSPIN(HiChromaShift)->setValue((int)round(param.hiShift*100.0));
+    MYSPIN(LoSaturation)->setValue((int)round(param.loSaturation*100.0));
+    MYSPIN(MdSaturation)->setValue((int)round(param.mdSaturation*100.0));
+    MYSPIN(HiSaturation)->setValue((int)round(param.hiSaturation*100.0));
+
+    return 1;
+}
+uint8_t flyColorBalance::download(void)
+{
+    Ui_colorBalanceDialog *w=(Ui_colorBalanceDialog *)_cookie;
+
+    param.loLuma=((float)MYSPIN(LoLuma)->value()) / 100.0;
+    param.mdLuma=((float)MYSPIN(MdLuma)->value()) / 100.0;
+    param.hiLuma=((float)MYSPIN(HiLuma)->value()) / 100.0;
+    param.loAngle=Ui_colorBalanceWindow::getHueColor(MYDIAL(LoHue));
+    param.mdAngle=Ui_colorBalanceWindow::getHueColor(MYDIAL(MdHue));
+    param.hiAngle=Ui_colorBalanceWindow::getHueColor(MYDIAL(HiHue));
+    param.loShift=((float)MYSPIN(LoChromaShift)->value()) / 100.0;
+    param.mdShift=((float)MYSPIN(MdChromaShift)->value()) / 100.0;
+    param.hiShift=((float)MYSPIN(HiChromaShift)->value()) / 100.0;
+    param.loSaturation=((float)MYSPIN(LoSaturation)->value()) / 100.0;
+    param.mdSaturation=((float)MYSPIN(MdSaturation)->value()) / 100.0;
+    param.hiSaturation=((float)MYSPIN(HiSaturation)->value()) / 100.0;
+
+    return 1;
+}
+void flyColorBalance::setTabOrder(void)
+{
+    Ui_colorBalanceDialog *w=(Ui_colorBalanceDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_DIAL(x) controls.push_back(MYDIAL(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    PUSH_SPIN(LoLuma)
+    PUSH_DIAL(LoHue)
+    PUSH_SPIN(LoChromaShift)
+    PUSH_SPIN(LoSaturation)
+
+    PUSH_SPIN(MdLuma)
+    PUSH_DIAL(MdHue)
+    PUSH_SPIN(MdChromaShift)
+    PUSH_SPIN(MdSaturation)
+
+    PUSH_SPIN(HiLuma)
+    PUSH_DIAL(HiHue)
+    PUSH_SPIN(HiChromaShift)
+    PUSH_SPIN(HiSaturation)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getColorBalance(colorBalance *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_colorBalanceWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/Q_colorBalance.h Added

@@ -0,0 +1,41 @@
+#ifndef Q_colorBalance_h
+#define Q_colorBalance_h
+#include "ui_colorBalance.h"
+#include "colorBalance.h"
+#include "DIA_flyDialogQt4.h"
+#include "DIA_flyColorBalance.h"
+
+class Ui_colorBalanceWindow : public QDialog
+{
+    Q_OBJECT
+
+  protected:
+    int lock;
+    flyColorBalance *     myFly;
+    ADM_QCanvas *      canvas;
+    QPushButton *      peekRangesBtn;
+    Ui_colorBalanceDialog ui;
+
+  public:
+    Ui_colorBalanceWindow(QWidget *parent, colorBalance *param,ADM_coreVideoFilter *in);
+    ~Ui_colorBalanceWindow();
+    static void rgb2yuv(int * yuv, int * rgb);
+    static void yuv2rgb(int * rgb, int * yuv);
+    static void setHueColor(QDial * d, int angle);
+    static int  getHueColor(QDial * d);
+
+  public slots:
+    void gather(colorBalance *param);
+
+  private slots:
+    void sliderUpdate(int foo);
+    void valueChanged(int foo);
+    void reset(void);
+    void peekRangesPressed(void);
+    void peekRangesReleased(void);
+
+  private:
+    void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
+};
+#endif    // Q_colorBalance_h

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorBalance/qt4/colorBalance.ui Added

@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>colorBalanceDialog</class>
+ <widget class="QDialog" name="colorBalanceDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>906</width>
+    <height>414</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Color balance</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="0" column="4">
+      <widget class="QGroupBox" name="groupBoxHighlight">
+       <property name="title">
+        <string>Highlight</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_4">
+        <item row="0" column="0" rowspan="2">
+         <widget class="ADM_SliderIndicator" name="sliderHiLuma">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" rowspan="2" colspan="3">
+         <widget class="QDial" name="dialHiHue">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>125</width>
+            <height>125</height>
+           </size>
+          </property>
+          <property name="maximum">
+           <number>359</number>
+          </property>
+          <property name="pageStep">
+           <number>18</number>
+          </property>
+          <property name="wrapping">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="4">
+         <spacer name="horizontalSpacer_7">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="3" column="5">
+         <widget class="QLabel" name="labelHiSaturation">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Saturation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" colspan="5">
+         <widget class="ADM_SliderIndicator" name="sliderHiChromaShift">
+          <property name="minimum">
+           <number>0</number>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0" colspan="5">
+         <widget class="ADM_SliderIndicator" name="sliderHiSaturation">
+          <property name="minimum">
+           <number>-100</number>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="5">
+         <widget class="QLabel" name="labelHiChromaShift">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Chroma shift</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QGroupBox" name="groupBoxShadow">
+       <property name="title">
+        <string>Shadow</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0" rowspan="2">
+         <widget class="ADM_SliderIndicator" name="sliderLoLuma">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" rowspan="2" colspan="3">
+         <widget class="QDial" name="dialLoHue">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>125</width>
+            <height>125</height>
+           </size>
+          </property>
+          <property name="maximum">
+           <number>359</number>
+          </property>
+          <property name="pageStep">
+           <number>18</number>
+          </property>
+          <property name="wrapping">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="4">
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="2" column="0" colspan="5">
+         <widget class="ADM_SliderIndicator" name="sliderLoChromaShift">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0" colspan="5">
+         <widget class="ADM_SliderIndicator" name="sliderLoSaturation">
+          <property name="minimum">
+           <number>-100</number>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="5">
+         <widget class="QLabel" name="labelLoSaturation">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Saturation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="5">
+         <widget class="QLabel" name="labelLoChromaShift">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Chroma shift</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QGroupBox" name="groupBoxMidtone">
+       <property name="title">
+        <string>Midtone</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="4">
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="0" rowspan="2">
+         <widget class="ADM_SliderIndicator" name="sliderMdLuma">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" rowspan="2" colspan="3">
+         <widget class="QDial" name="dialMdHue">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>125</width>
+            <height>125</height>
+           </size>
+          </property>
+          <property name="maximum">
+           <number>359</number>
+          </property>
+          <property name="pageStep">
+           <number>18</number>
+          </property>
+          <property name="wrapping">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" colspan="5">
+         <widget class="ADM_SliderIndicator" name="sliderMdChromaShift">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0" colspan="5">
+         <widget class="ADM_SliderIndicator" name="sliderMdSaturation">
+          <property name="minimum">
+           <number>-100</number>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="5">
+         <widget class="QLabel" name="labelMdSaturation">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Saturation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="5">
+         <widget class="QLabel" name="labelMdChromaShift">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Chroma shift</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="3">
+      <widget class="Line" name="line_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>colorBalanceDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>257</x>
+     <y>470</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>colorBalanceDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>325</x>
+     <y>470</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/Q_colorTemp.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/Q_colorTemp.cpp Changed

@@ -44,16 +44,17 @@
         myFly=new flyColorTemp( this,width, height,in,canvas,ui.horizontalSlider);
         memcpy(&(myFly->param),param,sizeof(colorTemp));
         myFly->_cookie=&ui;
-        myFly->addControl(ui.toolboxLayout);
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
         myFly->setTabOrder();
         myFly->upload();
         myFly->sliderChanged();
 
         connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
-#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
-        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
-        SPINNER(Temperature,100,2)
-        SPINNER(Angle,1,0)
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChangedSpinBox(double)));
+        SPINNER(Temperature)
+        SPINNER(Angle)
 
         QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
         connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
@@ -76,10 +77,30 @@
     if(canvas) delete canvas;
     canvas=NULL;
 }
+#define COPY_VALUE_TO_SPINBOX(x,y) \
+        ui.doubleSpinBox##x->blockSignals(true); \
+        ui.doubleSpinBox##x->setValue((float)ui.horizontalSlider##x->value() / y); \
+        ui.doubleSpinBox##x->blockSignals(false);
 void Ui_colorTempWindow::valueChanged( int f )
 {
     if(lock) return;
     lock++;
+    COPY_VALUE_TO_SPINBOX(Temperature, 100.0);
+    COPY_VALUE_TO_SPINBOX(Angle, 1.0);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x,y) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue((int)round(ui.doubleSpinBox##x->value() * y)); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_colorTempWindow::valueChangedSpinBox(double foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Temperature, 100.0);
+    COPY_VALUE_TO_SLIDER(Angle, 1.0);
     myFly->download();
     myFly->sameImage();
     lock--;
@@ -112,13 +133,20 @@
 }
 
 #define MYSPIN(x) w->horizontalSlider##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
 #define MYCHECK(x) w->checkBox##x
+#define UPLOADDBLSPIN(x, value) \
+        w->doubleSpinBox##x->blockSignals(true); \
+        w->doubleSpinBox##x->setValue(value); \
+        w->doubleSpinBox##x->blockSignals(false);
 //************************
 uint8_t flyColorTemp::upload(void)
 {
     Ui_colorTempDialog *w=(Ui_colorTempDialog *)_cookie;
     MYSPIN(Temperature)->setValue((int)round(param.temperature*100.0));
+    UPLOADDBLSPIN(Temperature, param.temperature);
     MYSPIN(Angle)->setValue((int)param.angle);
+    UPLOADDBLSPIN(Angle, param.angle);
     return 1;
 }
 uint8_t flyColorTemp::download(void)
@@ -132,9 +160,12 @@
 {
     Ui_colorTempDialog *w=(Ui_colorTempDialog *)_cookie;
     std::vector<QWidget *> controls;
-#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
-    PUSH_SPIN(Temperature)
-    PUSH_SPIN(Angle)
+#define PUSHSLIDER(x) controls.push_back(MYSPIN(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+    PUSHSLIDER(Temperature)
+    PUSHDBLSPIN(Temperature)
+    PUSHSLIDER(Angle)
+    PUSHDBLSPIN(Angle)
 
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/Q_colorTemp.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/Q_colorTemp.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/colorTemp.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorTemp/qt4/colorTemp.ui Changed

@@ -58,7 +58,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="ADM_SliderIndicator" name="horizontalSliderTemperature">
+      <widget class="QSlider" name="horizontalSliderTemperature">
        <property name="minimum">
         <number>-100</number>
        </property>
@@ -74,7 +74,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="ADM_SliderIndicator" name="horizontalSliderAngle">
+      <widget class="QSlider" name="horizontalSliderAngle">
        <property name="maximum">
         <number>180</number>
        </property>
@@ -86,7 +86,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
+     <item row="1" column="3">
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -99,7 +99,7 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="2">
+     <item row="2" column="3">
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -112,6 +112,26 @@
        </property>
       </spacer>
      </item>
+     <item row="1" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxTemperature">
+       <property name="minimum">
+        <double>-1.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxAngle">
+       <property name="maximum">
+        <double>180.000000000000000</double>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -149,11 +169,6 @@
    <extends>QSlider</extends>
    <header>ADM_toolkitQt.h</header>
   </customwidget>
-  <customwidget>
-   <class>ADM_SliderIndicator</class>
-   <extends>QSlider</extends>
-   <header>ADM_toolkitQt.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/colorYUV/avsColor.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.cpp Changed

@@ -30,7 +30,6 @@
     : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
 {
     scene = sc;
-    previewActivated = true;
     tablesPopulated = false;
     oldCoef = 1.;
     oldOffset = 0;
@@ -51,29 +50,23 @@
         tablesPopulated = true;
     }
 
-    if(!previewActivated)
-    {
-        out->duplicate(in);
-    }
+    out->copyInfo(in);
+    if(param.doLuma)
+        ADMVideoContrast::doContrast(in,out,tableluma,PLANAR_Y);
     else
-    {
-        out->copyInfo(in);
-        if(param.doLuma)
-            ADMVideoContrast::doContrast(in,out,tableluma,PLANAR_Y);
-        else
-            out->copyPlane(in,out,PLANAR_Y);
+        out->copyPlane(in,out,PLANAR_Y);
 
 
-        if(param.doChromaU)
-            ADMVideoContrast::doContrast(in,out,tablechroma,PLANAR_U);
-        else
-            out->copyPlane(in,out,PLANAR_U);
+    if(param.doChromaU)
+        ADMVideoContrast::doContrast(in,out,tablechroma,PLANAR_U);
+    else
+        out->copyPlane(in,out,PLANAR_U);
+
+    if(param.doChromaV)
+        ADMVideoContrast::doContrast(in,out,tablechroma,PLANAR_V);
+    else
+        out->copyPlane(in,out,PLANAR_V);
 
-        if(param.doChromaV)
-            ADMVideoContrast::doContrast(in,out,tablechroma,PLANAR_V);
-        else
-            out->copyPlane(in,out,PLANAR_V);
-    }
     if(!scene) return true;
     
     // Draw luma histogram

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

@@ -46,15 +46,11 @@
         myCrop=new flyContrast( this,width, height,in,canvas,ui.horizontalSlider,scene);
         memcpy(&(myCrop->param),param,sizeof(contrast));
         myCrop->_cookie=&ui;
-        myCrop->addControl(ui.toolboxLayout);
+        myCrop->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
         myCrop->setTabOrder();
         myCrop->upload();
         myCrop->sliderChanged();
 
-        previewState=true;
-        ui.checkBox_Enabled->setChecked(true);
-
-
         connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
 #define SPINNER(x) connect( ui.dial##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
           SPINNER(Brightness);
@@ -75,7 +71,6 @@
           connect( ui.checkBoxU,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
           connect( ui.checkBoxV,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int))); 
           connect( ui.checkBoxY,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));  
-          connect( ui.checkBox_Enabled,SIGNAL(stateChanged(int)),this,SLOT(previewActivated(int)));  
           connect( ui.toolButton__DVD2PC,SIGNAL(pressed()),this,SLOT(dvd2PC()));  
 
         setModal(true);
@@ -123,16 +118,6 @@
 }
 /**
  * 
- * @param a
- */
-void Ui_contrastWindow::previewActivated(int a)
-{
-    previewState=a;
-    myCrop->setState(a);
-    myCrop->sameImage();
-}
-/**
- * 
  * @param f
  */
 void Ui_contrastWindow::valueChanged( int f )
@@ -238,7 +223,6 @@
     PUSH_CHECK(Y)
     PUSH_CHECK(U)
     PUSH_CHECK(V)
-    PUSH_CHECK(_Enabled)
 
     controls.push_back(w->toolButton__DVD2PC);
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/contrast.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>750</width>
-    <height>514</height>
+    <width>721</width>
+    <height>494</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -112,54 +112,34 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <layout class="QGridLayout" name="gridLayout">
-         <item row="2" column="0">
+         <item row="3" column="0">
           <widget class="QCheckBox" name="checkBoxV">
            <property name="text">
             <string>ChromaV</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
+         <item row="2" column="0">
           <widget class="QCheckBox" name="checkBoxU">
            <property name="text">
             <string>ChromaU</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
+         <item row="1" column="0">
           <widget class="QCheckBox" name="checkBoxY">
            <property name="text">
             <string>Luma</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="0" column="0">
           <widget class="QToolButton" name="toolButton__DVD2PC">
            <property name="text">
             <string>MPEG2-&gt;PC</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <spacer name="verticalSpacerChroma">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>0</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="checkBox_Enabled">
-           <property name="text">
-            <string>Process</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp Changed

@@ -32,6 +32,8 @@
                 crop           configuration;
                 ADMImage       *original;
 
+                void            resetConfig(void);
+
  public:
 
                                 CropFilter(  ADM_coreVideoFilter *in,CONFcouple *couples);
@@ -66,15 +68,10 @@
 {
 
         original=new ADMImageDefault(info.width,info.height);
-        if(!couples || !ADM_paramLoad(couples,crop_param,&configuration))
-		{
-            // Default value
-            configuration.top=0;
-            configuration.bottom=0;
-            configuration.left=0;
-            configuration.right=0;
-            configuration.rubber_is_hidden=false;
-            configuration.ar_select=0;
+        resetConfig();
+        if(couples && !ADM_paramLoadPartial(couples,crop_param,&configuration))
+        {
+            resetConfig();
         }
         if(  in->getInfo()->width<(configuration.right+configuration.left))
                 {
@@ -100,7 +97,17 @@
     if(original) delete original;
     original=NULL;
 }
-
+/**
+   \fn resetConfig
+*/
+void CropFilter::resetConfig(void)
+{
+    configuration.top=0;
+    configuration.bottom=0;
+    configuration.left=0;
+    configuration.right=0;
+    configuration.ar_select=0;
+}
 /**
     \fn getNextFrame

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.conf -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.conf Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/crop_desc.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.cpp Changed

@@ -11,15 +11,16 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <cmath>
 #include "DIA_flyDialogQt4.h"
 #include "ADM_default.h"
 #include "ADM_image.h"
 #include "./DIA_flyCrop.h"
 #include "./Q_crop.h"
 #include "ADM_toolkitQt.h"
+#include "ADM_QSettings.h"
 
-uint8_t Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt);
-uint8_t MetricsV( uint8_t *in, uint32_t width,uint32_t height,uint32_t *avg, uint32_t *eqt);
+uint8_t Metrics( uint8_t *in, uint32_t stride, uint32_t length, uint32_t *avg, uint32_t *var, uint32_t * max);
 
 /**
  * 
@@ -148,15 +149,18 @@
 
 static void blank(uint8_t *in, int w, int h, int stride)
 {
+    uint32_t * tmp;
     for(int y=0;y<h;y++)
     {
-        memset(in,0,4*w);
-        uint8_t *green=in+1;
+        tmp = (uint32_t*)in;
         for(int x=0;x<w;x++)
-            green[x<<2]=0xff;
-        uint8_t *alpha=in+3;
-        for(int x=0;x<w;x++)
-            alpha[x<<2]=0xff;
+        {
+            *tmp >>= 2;
+            *tmp &= 0xFF3F3F3F;
+            *tmp |= 0xFF000000;
+            *tmp += (192 << 8);
+            tmp += 1;
+        }
         in+=stride;
     }
 }
@@ -345,8 +349,8 @@
 
     // bound checks are done in rubber control
 
-    right=bound(normX,normW,_w)&0xfffe;
-    bottom=bound(normY,normH,_h)&0xfffe;
+    right=bound(normX&0xfffe,normW,_w)&0xfffe;
+    bottom=bound(normY&0xfffe,normH,_h)&0xfffe;
 
     if(normX<0) normX=0;
     if(normY<0) normY=0;
@@ -375,38 +379,43 @@
      \fn autoRun
     \brief 
 */
-#define THRESH_AVG   30
-#define THRESH_EQT   50
+#define THRESH_AVG   8
+#define THRESH_VAR   30
+#define THRESH_MAX   24
 
-int flyCrop::autoRun(uint8_t *in,int w,int h, int increment)
+int flyCrop::autoRun(uint8_t *in,int w,int h, int increment, int blackLevel)
 {
-    uint32_t avg,eqt;
+    uint32_t avg,var,max;
+    uint32_t prev_avg = 999;
     int y;
-    for(y=0;y<h;y++)	
+    for(y=0;y<h;y++)
     {
-        Metrics(in,w,&avg,&eqt);
-        in+=increment;
-        if(avg> THRESH_AVG || eqt > THRESH_EQT)
-                break;
+        Metrics(in, 1, w, &avg, &var, &max);
+        avg = ((avg <= blackLevel) ? 0 : avg - blackLevel);
+        max = ((max <= blackLevel) ? 0 : max - blackLevel);
+        in += increment;
+        if(avg > (prev_avg+2)*2 || avg> THRESH_AVG || var > THRESH_VAR || max > THRESH_MAX)
+            break;
+        prev_avg = avg;
     }
-    if(y)
-        y=y-1;
-    return y&0xfffe;
+    return y;
 }
-int flyCrop::autoRunV(uint8_t *in, int stride, int w, int increment)
+int flyCrop::autoRunV(uint8_t *in, int stride, int w, int increment, int blackLevel)
 {
-    uint32_t avg,eqt;
+    uint32_t avg,var,max;
+    uint32_t prev_avg = 999;
     int y;
     for(y=0;y<w;y++)
     {
-        MetricsV(in,stride,_h,&avg,&eqt);
-        in+=increment;
-        if(avg> THRESH_AVG || eqt > THRESH_EQT)
-                break;
+        Metrics(in, stride, _h, &avg, &var, &max);
+        avg = ((avg <= blackLevel) ? 0 : avg - blackLevel);
+        max = ((max <= blackLevel) ? 0 : max - blackLevel);
+        in += increment;
+        if(avg > (prev_avg+2)*2 || avg> THRESH_AVG || var > THRESH_VAR || max > THRESH_MAX)
+            break;
+        prev_avg = avg;
     }
-    if(y)
-        y=y-1;
-    return y&0xfffe;
+    return y;
 }
 /**
  * 
@@ -417,11 +426,28 @@
     uint8_t *in;
     in=_yuvBuffer->GetReadPtr(PLANAR_Y);
     int stride=_yuvBuffer->GetPitch(PLANAR_Y);
-
-    top=autoRun(in,_w,((_h>>1)-2),stride);
-    bottom=autoRun(in+stride*(_h-1),_w,((_h>>1)-2),-stride);
-    left=autoRunV(in,stride,((_w>>1)-2),1);
-    right=autoRunV(in+_w-1,stride,((_w>>1)-2),-1);
+    int blackLevel = 0;
+    if(_yuvBuffer->_range == ADM_COL_RANGE_MPEG)
+        blackLevel = 16;
+
+    top=autoRun(in,_w,((_h>>1)-2),stride, blackLevel);
+    bottom=autoRun(in+stride*(_h-1),_w,((_h>>1)-2),-stride, blackLevel);
+    left=autoRunV(in,stride,((_w>>1)-2),1, blackLevel);
+    right=autoRunV(in+_w-1,stride,((_w>>1)-2),-1, blackLevel);
+    if ((top & 1) ^ (bottom & 1))    // both must have the same parity
+    {
+        if (top < bottom)
+            top++;
+        else
+            bottom++;
+    }
+    if ((left & 1) ^ (right & 1))    // both must have the same parity
+    {
+        if (left < right)
+            left++;
+        else
+            right++;
+    }
     upload(false,true);
     sameImage();
     return 1;
@@ -540,6 +566,42 @@
     dim+=QString(" x ");
     dim+=QString::number(_h-top-bottom);
     w->labelSize->setText(dim);
+    
+    static const double arlist[][2] = {
+        {9, 16}, {1, 1}, {6, 5}, {5, 4}, {4, 3}, {11, 8}, {1.43, 1}, {3, 2}, {14, 9}, {16, 10}, {5, 3}, {16, 9}, {1.85, 1}, {1.9, 1}, {2, 1}, {2.2, 1}, {64, 27}, {2.35, 1}, {2.39, 1}, {2.4, 1}, {2.76, 1}, {32, 9}, {18, 5}, {4, 1}
+    };
+    
+    double xx = (_w-left-right);
+    double yy = (_h-top-bottom);
+    
+    double outar = xx/yy;
+    outar = std::round(outar*10000.0) / 10000.0;
+    
+    double mindiff = 9999;
+    int minindex = 0;
+    for (int i=0; i<sizeof(arlist) / sizeof(arlist[0]); i++)
+    {
+        double lsar = arlist[i][0] / arlist[i][1];
+        if (mindiff > std::fabs(lsar - outar))
+        {
+            mindiff = std::fabs(lsar - outar);
+            minindex = i;
+        }
+    }
+    
+    double lsar = arlist[minindex][0] / arlist[minindex][1];
+    if (outar > lsar)
+        mindiff = outar/lsar - 1.0;
+    else
+        mindiff = lsar/outar - 1.0;
+    
+    dim = QString("%1").arg(outar, 0, 'f', 4);
+    w->labelOutArFloat->setText(dim);
+    
+    dim = QString("");
+    if ((mindiff <= 0.005) && (ar_select == 0))
+        dim += QString("(%1:%2)").arg(arlist[minindex][0]).arg(arlist[minindex][1]);
+    w->labelOutArDef->setText(dim);
 }
 
 /**
@@ -590,12 +652,24 @@
 
     myCrop = new flyCrop(this, inputWidth, inputHeight, in, canvas, ui.horizontalSlider);
     myCrop->setCropMargins(param->left, param->right, param->top, param->bottom);
-    myCrop->hideRubber(param->rubber_is_hidden);
+
+    bool rubberIsHidden = false;
+    QSettings *qset = qtSettingsCreate();
+    if(qset)
+    {
+        qset->beginGroup("crop");
+        rubberIsHidden = qset->value("rubberIsHidden", false).toBool();
+        qset->endGroup();
+        delete qset;
+        qset = NULL;
+    }
+
+    myCrop->hideRubber(rubberIsHidden);
     myCrop->_cookie=&ui;
     myCrop->addControl(ui.toolboxLayout);
     myCrop->setTabOrder();
 
-    ui.checkBoxRubber->setChecked(param->rubber_is_hidden);
+    ui.checkBoxRubber->setChecked(rubberIsHidden);
     ui.comboBoxAspectRatio->setCurrentIndex(param->ar_select);
     if(!param->ar_select)
         myCrop->upload(false,true);
@@ -645,16 +719,27 @@
     param->right = right;
     param->top = top;
     param->bottom = bottom;
-    param->rubber_is_hidden = myCrop->stateOfRubber();
     param->ar_select = myCrop->getAspectRatioIndex();
 }
 /**
- * 
+ * \fn dtor
  */
 Ui_cropWindow::~Ui_cropWindow()
 {
-    if(myCrop) delete myCrop;
-    myCrop=NULL; 
+    if(myCrop)
+    {
+        QSettings *qset = qtSettingsCreate();
+        if(qset)
+        {
+            qset->beginGroup("crop");
+            qset->setValue("rubberIsHidden", myCrop->stateOfRubber());
+            qset->endGroup();
+            delete qset;
+            qset = NULL;
+        }
+        delete myCrop;
+        myCrop=NULL;
+    }
     if(canvas) delete canvas;
     canvas=NULL;
 }
@@ -831,6 +916,31 @@
 {
     myCrop->initRubber();
     QDialog::showEvent(event);
+    /* Avoid shifting the layout displaying output aspect ratio
+    by setting a sufficient minimum width based on font metrics. */
+    QFontMetrics fm = ui.labelSize->fontMetrics(); // we may assume that both labels use the same font
+    QString text = QString(QT_TRANSLATE_NOOP("crop","Size: "));
+
+    int w = inputWidth;
+    int h = inputHeight;
+    const char *str[5] = {"0","00","000","0000","00000"};
+
+    int pos = 0;
+    while((w = w / 10) && pos < 4)
+        pos++;
+    text += str[pos];
+    text += " x ";
+    pos = 0;
+    while((h = h / 10) && pos < 4)
+        pos++;
+    text += str[pos];
+
+    ui.labelSize->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    text = "00.0000";
+    ui.labelOutArFloat->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    text = "(0.00:00)";
+    ui.labelOutArDef->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    
     myCrop->adjustCanvasPosition();
     canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
 }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/DIA_flyCrop.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/Q_crop.cpp Changed

@@ -44,52 +44,34 @@
 
 /**
      \fn Metrics
-	\brief Compute the average value of pixels	and eqt is the "ecart type"
+	\brief Compute the average value, variance and maximum of pixels
 */
 
-uint8_t Metrics( uint8_t *in, uint32_t width,uint32_t *avg, uint32_t *eqt)
+uint8_t Metrics( uint8_t *in, uint32_t stride, uint32_t length, uint32_t *avg, uint32_t *var, uint32_t * max)
 {
-
-uint32_t x;
-uint32_t sum=0,eq=0;
-int v;
-              for(x=0;x<width;x++)
-              {
-                      sum+=*(in+x);
-              }
-              sum=sum/width;
-              *avg=sum;
-              for(x=0;x<width;x++)
-              {
-                      v=*(in+x)-sum;
-                      eq+=v*v;
-              }
-              eq=eq/(width*width);
-              *eqt=eq;
-              return 1;
-}
-/**
-     \fn MetricsV
-	\brief Compute the average value of pixels	and eqt is the "ecart type"
-*/
-uint8_t MetricsV( uint8_t *in,uint32_t width, uint32_t height,uint32_t *avg, uint32_t *eqt)
-{
-
-uint32_t x;
-uint32_t sum=0,eq=0;
-int v;
-    for(x=0;x<height;x++)
+    uint8_t * ptr;
+    uint32_t x;
+    uint32_t sum=0,eq=0,m=0;
+    int v;
+    ptr = in;
+    for(x=0; x<length; x++)
     {
-            sum+=*(in+x*width);
+        sum += *ptr;
+        if (m < *ptr)
+            m = *ptr;
+        ptr += stride;
     }
-    sum=sum/height;
-    *avg=sum;
-    for(x=0;x<height;x++)
+    sum /= length;
+    *avg = sum;
+    *max = m;
+    ptr = in;
+    for(x=0;x<length;x++)
     {
-            v=*(in+x*width)-sum;
-            eq+=v*v;
+        v = *ptr - sum;
+        eq += v*v;
+        ptr += stride;
     }
-    eq=eq/(height*height);
-    *eqt=eq;
+    eq /= length;
+    *var = eq;
     return 1;
-}
\ No newline at end of file
+}

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/qt5/crop.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>647</width>
-    <height>300</height>
+    <width>636</width>
+    <height>375</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -46,13 +46,6 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="0" column="3">
-      <widget class="QLabel" name="labelRight">
-       <property name="text">
-        <string>Right:</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="0">
       <widget class="QLabel" name="labelLeft">
        <property name="text">
@@ -60,24 +53,10 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QSpinBox" name="spinBoxLeft">
-       <property name="maximum">
-        <number>16384</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="4">
-      <widget class="QSpinBox" name="spinBoxBottom">
-       <property name="maximum">
-        <number>16384</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="labelTop">
+     <item row="0" column="3">
+      <widget class="QLabel" name="labelRight">
        <property name="text">
-        <string>Top:</string>
+        <string>Right:</string>
        </property>
       </widget>
      </item>
@@ -95,15 +74,8 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="4">
-      <widget class="QSpinBox" name="spinBoxRight">
-       <property name="maximum">
-        <number>16384</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="5">
-      <spacer name="horizontalSpacer_2">
+     <item row="2" column="2">
+      <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -118,6 +90,20 @@
        </property>
       </spacer>
      </item>
+     <item row="2" column="6">
+      <widget class="QLabel" name="labelLockAR">
+       <property name="text">
+        <string>Lock Aspect Ratio:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>16384</number>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="2">
       <spacer name="horizontalSpacer_1">
        <property name="orientation">
@@ -134,8 +120,25 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="2">
-      <spacer name="horizontalSpacer_3">
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelTop">
+       <property name="text">
+        <string>Top:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QCheckBox" name="checkBoxRubber">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>&amp;Hide Rubber Band</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -150,7 +153,14 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="8">
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
+        <number>16384</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="8" colspan="4">
       <spacer name="horizontalSpacer_4">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -166,23 +176,6 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="6">
-      <widget class="QLabel" name="labelSize">
-       <property name="text">
-        <string>Size: </string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="7">
-      <widget class="QCheckBox" name="checkBoxRubber">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>&amp;Hide Rubber Band</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="7">
       <widget class="QComboBox" name="comboBoxAspectRatio">
        <property name="currentText">
@@ -235,13 +228,51 @@
        </item>
       </widget>
      </item>
-     <item row="2" column="6">
-      <widget class="QLabel" name="labelLockAR">
-       <property name="text">
-        <string>Lock Aspect Ratio:</string>
+     <item row="2" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
+        <number>16384</number>
        </property>
       </widget>
      </item>
+     <item row="0" column="7" colspan="5">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="labelSize">
+         <property name="text">
+          <string>Size: </string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelOutArFloat">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelOutArDef">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
    <item>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.cpp Added

@@ -0,0 +1,238 @@
+/***************************************************************************
+                          Deband filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "deband.h"
+#include "deband_desc.cpp"
+#include "ADM_vidDeband.h"
+
+extern uint8_t DIA_getDeband(deband *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoDeband,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoDeband,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_COLORS,            // Category
+                                      "deband",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("deband","Deband"),            // Display name
+                                      QT_TRANSLATE_NOOP("deband","Reduce banding artifacts.") // Description
+                                  );
+/**
+    \fn DebandProcess_C
+*/
+void ADMVideoDeband::DebandProcess_C(ADMImage *img, ADMImage *tmp, uint32_t range, uint32_t lthresh, uint32_t cthresh)
+{
+    if (!img || !tmp) return;
+    
+    tmp->duplicate(img);
+    
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    uint8_t * plane[3], * tplane[3];
+    int stride[3], tstride[3];
+    int p,thr;
+    uint32_t rng_state;
+    uint32_t rn;
+    uint64_t rng_product;
+
+
+    if (range < 1)
+        range = 1;
+    if (range > 100)
+        range = 100;
+
+    img->GetPitches(stride);
+    img->GetWritePlanes(plane);
+    tmp->GetPitches(tstride);
+    tmp->GetWritePlanes(tplane);
+
+    rng_state = img->Pts;
+    if (rng_state == 0)
+        rng_state = 123456789;
+
+    thr = lthresh;
+    for (p=0; p<3; p++)
+    {
+        if (p==1)
+        {
+            width /= 2;
+            height /= 2;
+            range /= 2;
+            if (range < 1)
+                range = 1;
+            thr = cthresh;
+        }
+        
+        if (thr == 0)
+            continue;
+
+        int dx,dy,dxn,dyn, pix, avg;
+        int rx=1,ry=1;
+        bool chkx,chky,tick=false;
+
+        for (int y = 0; y < height; y++)
+        {
+            chky = (y < range) || (y >= (height-range));
+            for (int x = 0; x < width; x++)
+            {
+                chkx = (x < range) || (x >= (width-range));
+                
+                if (range > 1)
+                {
+                    rng_product = (uint64_t)rng_state * 48271;
+                    rng_state = (rng_product & 0x7fffffff) + (rng_product >> 31);
+                    rng_state = (rng_state & 0x7fffffff) + (rng_state >> 31);
+                    rn = rng_state & 0x00FF;
+                    rn *= range;
+                    rn >>= 8;
+                    if (tick)
+                        rx = rn+1;
+                    else
+                        ry = rn+1;
+                    tick = !tick;
+                }
+                
+                dx = x + rx;
+                dy = y + ry;
+                dxn = x - rx;
+                dyn = y - ry;
+                if (chkx || chky)
+                {
+                    if (dx < 0)
+                        dx = 0;
+                    if (dx >= width)
+                        dx = width;
+                    if (dy < 0)
+                        dy = 0;
+                    if (dy >= height)
+                        dy = height;
+                    if (dxn < 0)
+                        dxn = 0;
+                    if (dxn >= width)
+                        dxn = width;
+                    if (dyn < 0)
+                        dyn = 0;
+                    if (dyn >= height)
+                        dyn = height;
+                }
+
+                avg  = tplane[p][dxn +  dyn* tstride[p]];
+                avg += tplane[p][dx  +  dyn* tstride[p]];
+                pix  = tplane[p][x +  y*tstride[p]];
+                avg += tplane[p][dxn +  dy * tstride[p]];
+                avg += tplane[p][dx  +  dy * tstride[p]];
+                pix *= 4;
+                if (abs(avg - pix) < thr)
+                    plane[p][x + y*stride[p]] = avg/4;
+            }
+        }
+    }
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoDeband::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getDeband(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoDeband::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255,"Range: %u; Thresholds: %u, %u", _param.range, _param.lumaThreshold, _param.chromaThreshold);
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoDeband::ADMVideoDeband(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,deband_param,&_param))
+        reset(&_param);
+    work=new ADMImageDefault(info.width,info.height);
+    update();
+}
+/**
+    \fn reset
+*/
+void ADMVideoDeband::reset(deband *cfg)
+{
+    cfg->range = 16;
+    cfg->lumaThreshold = 10;
+    cfg->chromaThreshold = 10;
+}
+
+/**
+    \fn valueLimit
+*/
+uint32_t ADMVideoDeband::valueLimit(uint32_t val, uint32_t min, uint32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoDeband::update(void)
+{
+    _range=valueLimit(_param.range,1,100);
+    _lthresh=valueLimit(_param.lumaThreshold,0,100);
+    _ctresh=valueLimit(_param.chromaThreshold,0,100);
+}
+/**
+    \fn dtor
+*/
+ADMVideoDeband::~ADMVideoDeband()
+{
+    if(work) delete work;
+    work=NULL;
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoDeband::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, deband_param,&_param);
+}
+
+void ADMVideoDeband::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, deband_param, &_param);
+}
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoDeband::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    DebandProcess_C(image, work,_range, _lthresh, _ctresh);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/ADM_vidDeband.h Added

@@ -0,0 +1,44 @@
+/***************************************************************************
+                          Deband filter 
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoDeband
+*/
+class  ADMVideoDeband:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    deband         _param;
+    uint32_t        _range,_lthresh,_ctresh;
+    ADMImage        *work;
+  public:
+    ADMVideoDeband(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoDeband();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static  void         DebandProcess_C(ADMImage *img, ADMImage *tmp, uint32_t range, uint32_t lthresh, uint32_t cthresh);
+    static  void         reset(deband *cfg);
+
+  private:
+    uint32_t valueLimit(uint32_t val, uint32_t min, uint32_t max);
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/cli/DIA_deband.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/deband.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/deband.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/deband_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/deband_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/qt4/DIA_flyDeband.cpp Added

@@ -0,0 +1,67 @@
+/**/
+/***************************************************************************
+                          DIA_Deband
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyDeband.h"
+
+#include "ADM_vidDeband.h"
+
+/************* COMMON PART *********************/
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+flyDeband::flyDeband (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    work=  new ADMImageDefault(_w,_h);
+}
+/**
+    \fn dtor
+*/
+flyDeband::~flyDeband()
+{
+    delete work;
+    work=NULL;
+}
+/**
+    \fn update
+*/
+uint8_t  flyDeband::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyDeband::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoDeband::DebandProcess_C(out, work, param.range, param.lumaThreshold, param.chromaThreshold);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/qt4/DIA_flyDeband.h Added

@@ -0,0 +1,37 @@
+/***************************************************************************
+  \fn     DIA_flyDeband
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for deband
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_DEBAND_H
+#define FLY_DEBAND_H
+#include "deband.h"
+/**
+    \class flyDeband
+*/
+class flyDeband : public ADM_flyDialogYuv
+{
+  private:
+    ADMImage   *work;
+  public:
+    deband    param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyDeband (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+    virtual    ~flyDeband() ;
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/qt4/Q_deband.cpp Added

@@ -0,0 +1,216 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_deband.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidDeband.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_debandWindow::Ui_debandWindow(QWidget *parent, deband *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyDeband( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(deband));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSpinBox(int)));
+        SPINNER(Range)
+        SPINNER(LumaThreshold)
+        SPINNER(ChromaThreshold)
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_debandWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_debandWindow::gather(deband *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(deband));
+}
+Ui_debandWindow::~Ui_debandWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.spinBox##x->blockSignals(true); \
+        ui.spinBox##x->setValue(ui.horizontalSlider##x->value()); \
+        ui.spinBox##x->blockSignals(false);
+void Ui_debandWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Range);
+    COPY_VALUE_TO_SPINBOX(LumaThreshold);
+    COPY_VALUE_TO_SPINBOX(ChromaThreshold);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue(ui.spinBox##x->value()); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_debandWindow::valueChangedSpinBox(int foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Range);
+    COPY_VALUE_TO_SLIDER(LumaThreshold);
+    COPY_VALUE_TO_SLIDER(ChromaThreshold);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_debandWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoDeband::reset(&myFly->param);
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_debandWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_debandWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSLIDER(x) w->horizontalSlider##x
+#define MYSPIN(x) w->spinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADSPIN(x, value) \
+        w->spinBox##x->blockSignals(true); \
+        w->spinBox##x->setValue(value); \
+        w->spinBox##x->blockSignals(false);
+//************************
+uint8_t flyDeband::upload(void)
+{
+    Ui_debandDialog *w=(Ui_debandDialog *)_cookie;
+
+    MYSLIDER(Range)->setValue((int)param.range);
+    UPLOADSPIN(Range, param.range);
+    MYSLIDER(LumaThreshold)->setValue((int)param.lumaThreshold);
+    UPLOADSPIN(LumaThreshold, param.lumaThreshold);
+    MYSLIDER(ChromaThreshold)->setValue((int)param.chromaThreshold);
+    UPLOADSPIN(ChromaThreshold, param.chromaThreshold);
+    return 1;
+}
+uint8_t flyDeband::download(void)
+{
+    Ui_debandDialog *w=(Ui_debandDialog *)_cookie;
+    param.range=(int)MYSLIDER(Range)->value();
+    param.lumaThreshold=(int)MYSLIDER(LumaThreshold)->value();
+    param.chromaThreshold=(int)MYSLIDER(ChromaThreshold)->value();
+    return 1;
+}
+void flyDeband::setTabOrder(void)
+{
+    Ui_debandDialog *w=(Ui_debandDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    PUSH_SLIDER(Range)
+    PUSH_SPIN(Range)
+    PUSH_SLIDER(LumaThreshold)
+    PUSH_SPIN(LumaThreshold)
+    PUSH_SLIDER(ChromaThreshold)
+    PUSH_SPIN(ChromaThreshold)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getDeband(deband *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_debandWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/qt4/Q_deband.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/deband/qt4/deband.ui Added

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>debandDialog</class>
+ <widget class="QDialog" name="debandDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>608</width>
+    <height>426</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Deband</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="1" column="1">
+      <widget class="QSlider" name="horizontalSliderLumaThreshold">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QSpinBox" name="spinBoxRange">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelChromaThreshold">
+       <property name="text">
+        <string>Chroma threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QSpinBox" name="spinBoxChromaThreshold">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelLumaThreshold">
+       <property name="text">
+        <string>Luma threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelRange">
+       <property name="text">
+        <string>Range</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSlider" name="horizontalSliderChromaThreshold">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSlider" name="horizontalSliderRange">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QSpinBox" name="spinBoxLumaThreshold">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>debandDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>debandDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.cpp Added

@@ -0,0 +1,532 @@
+/***************************************************************************
+                          DelogoHQ filter
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "delogoHQ.h"
+#include "delogoHQ_desc.cpp"
+#include "ADM_vidDelogoHQ.h"
+#include "ADM_imageLoader.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getDelogoHQ(delogoHQ *param, ADM_coreVideoFilter *in);
+
+
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoDelogoHQ,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoDelogoHQ,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_SHARPNESS,            // Category
+                                      "delogoHQ",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("delogoHQ","DelogoHQ"),            // Display name
+                                      QT_TRANSLATE_NOOP("delogoHQ","Clean up arbitrary shaped logo.") // Description
+                                  );
+
+/**
+    \fn DelogoHQCreateBuffers
+*/
+void ADMVideoDelogoHQ::DelogoHQCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv)
+{
+    *rgbBufStride = ADM_IMAGE_ALIGN(w * 4);
+    *rgbBufRaw = new ADM_byteBuffer();
+    if (*rgbBufRaw)
+        (*rgbBufRaw)->setSize(*rgbBufStride * h * 2);
+    *convertYuvToRgb = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_YV12,ADM_PIXFRMT_RGB32A);
+    *convertRgbToYuv = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_RGB32A,ADM_PIXFRMT_YV12);
+    *rgbBufImage = new ADMImageRef(w,h);
+    if (*rgbBufImage)
+    {
+        (*rgbBufImage)->_pixfrmt = ADM_PIXFRMT_RGB32A;
+        (*rgbBufImage)->_planes[0] = (*rgbBufRaw)->at(0);
+        (*rgbBufImage)->_planes[1] = (*rgbBufImage)->_planes[2] = NULL;
+        (*rgbBufImage)->_planeStride[0] = *rgbBufStride;
+        (*rgbBufImage)->_planeStride[1] = (*rgbBufImage)->_planeStride[2] = 0;
+    }
+}
+/**
+    \fn DelogoHQDestroyBuffers
+*/
+void ADMVideoDelogoHQ::DelogoHQDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (convertYuvToRgb) delete convertYuvToRgb;
+    if (convertRgbToYuv) delete convertRgbToYuv;
+    if (rgbBufRaw) rgbBufRaw->clean();
+    if (rgbBufImage) delete rgbBufImage;
+    if (rgbBufRaw) delete rgbBufRaw;
+}
+/**
+    \fn BoxBlurLine_C
+*/
+void ADMVideoDelogoHQ::BoxBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius)
+{
+    uint_fast32_t div;
+    uint_fast32_t mul_sum;
+    uint_fast32_t shr_sum;
+
+    uint_fast32_t l, p, i;
+    uint_fast32_t stack_ptr;
+
+    const uint8_t * src_pix_ptr;
+          uint8_t * dst_pix_ptr;
+    uint8_t *     stack_pix_ptr;
+
+    uint_fast32_t sum_r = 0;
+    uint_fast32_t sum_g = 0;
+    uint_fast32_t sum_b = 0;
+
+    uint_fast32_t lm  = len - 1;
+
+    if ((radius > 0) && (len > 1))
+    {
+        div = radius * 2 + 1;
+        shr_sum = 14;
+        mul_sum = (1 << shr_sum)/div;
+
+        for(i = 0; i <= radius; i++)
+        {
+            if ((radius - i) > lm)
+                src_pix_ptr = line + pixPitch*lm;
+            else
+                src_pix_ptr = line + pixPitch*(radius - i);    // fix flickering at the T/L edges, by reflecting the image backward
+            stack_pix_ptr    = (uint8_t *)&stack[i];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_r       += src_pix_ptr[0];
+            sum_g       += src_pix_ptr[1];
+            sum_b       += src_pix_ptr[2];
+        }
+        src_pix_ptr = line;
+        for(i = 1; i <= radius; i++)
+        {
+            if(i <= lm) src_pix_ptr += pixPitch; 
+            stack_pix_ptr = (uint8_t *)&stack[i + radius];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_r        += src_pix_ptr[0];
+            sum_g        += src_pix_ptr[1];
+            sum_b        += src_pix_ptr[2];
+        }
+
+        stack_ptr = 0;
+        p = radius;
+        if(p > lm) p = lm;
+        src_pix_ptr = line + pixPitch*p;
+        dst_pix_ptr = line;
+        for(l = 0; l < len; l++)
+        {
+            sum_r += src_pix_ptr[0];
+            sum_g += src_pix_ptr[1];
+            sum_b += src_pix_ptr[2];
+
+            stack_pix_ptr = (uint8_t *)&stack[stack_ptr];
+
+            sum_r  -= stack_pix_ptr[0];
+            sum_g  -= stack_pix_ptr[1];
+            sum_b  -= stack_pix_ptr[2];
+
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+
+            stack_ptr++;
+            if(stack_ptr >= div) stack_ptr = 0;
+
+            dst_pix_ptr[0] = (sum_r * mul_sum) >> shr_sum;
+            dst_pix_ptr[1] = (sum_g * mul_sum) >> shr_sum;
+            dst_pix_ptr[2] = (sum_b * mul_sum) >> shr_sum;
+            dst_pix_ptr   += pixPitch;
+
+            if(p < lm) 
+                src_pix_ptr += pixPitch;
+            else if(p < lm*2) 
+                src_pix_ptr -= pixPitch;    // fix flickering at the B/R edges, by reflecting the image backward
+            ++p;
+        }
+    }
+}
+/**
+    \fn DelogoHQProcess_C
+*/
+void ADMVideoDelogoHQ::DelogoHQProcess_C(ADMImage *img, int w, int h, int * mask, int * maskHint, uint32_t blur, uint32_t gradient, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv)
+{
+    if (!img || !mask || !rgbBufRaw || !rgbBufImage || !convertYuvToRgb || !convertRgbToYuv) return;
+    uint8_t *p, * q, *s;
+    int i,x,y,t;
+
+    uint32_t * stack = (uint32_t *)malloc(512 * sizeof(uint32_t));    // max 254*2+1=509 needed
+    if (!stack) return;
+
+    if (blur > 250) blur = 250;
+    if (gradient > 100) gradient = 100;
+
+    int maskMinX = 0;
+    int maskMinY = 0;
+    int maskMaxX = (w-1);
+    int maskMaxY = (h-1);
+    if (maskHint)
+    {
+        for (i=0; i<4; i++)
+            if (maskHint[i] < 0) maskHint[i] = 0;
+
+        if (maskHint[0] > (w-1)) maskHint[0] = (w-1);
+        if (maskHint[1] > (h-1)) maskHint[1] = (h-1);
+        if (maskHint[2] > (w-1)) maskHint[2] = (w-1);
+        if (maskHint[3] > (h-1)) maskHint[3] = (h-1);
+        maskMinX = maskHint[0];
+        maskMinY = maskHint[1];
+        maskMaxX = maskHint[2];
+        maskMaxY = maskHint[3];
+    }
+
+    int mAreaX = (maskMaxX - maskMinX);
+    int mAreaY = (maskMaxY - maskMinY);
+    if (mAreaX <= 0) return;    // nothing to do
+    if (mAreaY <= 0) return;    // nothing to do
+
+    convertYuvToRgb->convertImage(img,rgbBufRaw->at(0));
+
+    int currLevel = 1;
+    int radius;
+    int nl,rx,ry;
+    int r,g,b,ravg,gavg,bavg,nsum,lum;
+    radius = 3;
+    do {
+        nl = 0;
+        for(y=maskMinY; y<=maskMaxY; y++)
+        {
+            p = rgbBufRaw->at(y*rgbBufStride);
+            for(x=maskMinX; x<=maskMaxX; x++)
+            {
+                if (mask[y*w+x] == currLevel)
+                {
+                    nl++;
+                    ravg = gavg = bavg = nsum = 0;
+                    for (ry=-radius; ry<=radius; ry++)
+                    {
+                        if ((y+ry) < 0) continue;
+                        if ((y+ry) >= h) continue;
+                        s = rgbBufRaw->at((y+ry)*rgbBufStride);
+                        for (rx=-radius;rx<=radius; rx++)
+                        {
+                            if ((x+rx) < 0) continue;
+                            if ((x+rx) >= w) continue;
+                            if (mask[(y+ry)*w+(x+rx)] < currLevel)
+                            {
+                                r = *(s+(x+rx)*4+0);
+                                g = *(s+(x+rx)*4+1);
+                                b = *(s+(x+rx)*4+2);
+                                lum = r+g+b;
+                                lum = std::sqrt(lum);//= 32;
+                                ravg += r * (lum+currLevel-mask[(y+ry)*w+(x+rx)]);
+                                gavg += g * (lum+currLevel-mask[(y+ry)*w+(x+rx)]);
+                                bavg += b * (lum+currLevel-mask[(y+ry)*w+(x+rx)]);
+                                nsum += (lum+currLevel-mask[(y+ry)*w+(x+rx)]);
+                            }
+                        }
+                    }
+                    if (nsum > 0)
+                    {
+                        ravg /= nsum;
+                        gavg /= nsum;
+                        bavg /= nsum;
+                    }
+                    q = p + x*4;
+                    *(q+0) = ravg;
+                    *(q+1) = gavg;
+                    *(q+2) = bavg;
+                }
+            }
+        }
+        currLevel++;
+    } while (nl > 0);
+
+    memcpy(rgbBufRaw->at(h*rgbBufStride), rgbBufRaw->at(0), h*rgbBufStride);
+
+    if (blur > 0)
+    {
+        //for(y = 0; y < h; y++)
+        for(y=maskMinY; y<=maskMaxY; y++)
+        {
+            //BoxBlurLine_C(rgbBufRaw->at((h+y)*rgbBufStride), w, 4, stack, blur);
+            BoxBlurLine_C(rgbBufRaw->at((h+y)*rgbBufStride+4*maskMinX), (maskMaxX-maskMinX), 4, stack, blur);
+        }
+
+        //for(x = 0; x < w; x++)
+        for(x=maskMinX; x<=maskMaxX; x++)
+        {
+            //BoxBlurLine_C(rgbBufRaw->at(h*rgbBufStride+x*4), h, rgbBufStride, stack, blur);
+            BoxBlurLine_C(rgbBufRaw->at((h+maskMinY)*rgbBufStride+(x)*4), (maskMaxY-maskMinY), rgbBufStride, stack, blur);
+        }
+
+
+        for(y=maskMinY; y<=maskMaxY; y++)
+        {
+            p = rgbBufRaw->at(y*rgbBufStride);
+            s = rgbBufRaw->at((h+y)*rgbBufStride);
+            for(x=maskMinX; x<=maskMaxX; x++)
+            {
+                if (mask[y*w+x] > 0)
+                {
+                    int a,b,c;
+                    //currLevel == max+1
+
+                    c = std::round(256.0-(5.12*gradient*((double)(currLevel - mask[y*w+x]))/currLevel));//std::pow(0.5,mask[y*w+x]*(1.0+gradient)/100.0)*256.0);
+                    if (c < 0) c = 0;
+                    c = (256-c);
+
+                    a = p[x*4+0];
+                    b = s[x*4+0];
+                    a *= c;
+                    b *= (256-c);
+                    a += b;
+                    a >>= 8;
+                    p[x*4+0] = a;
+
+                    a = p[x*4+1];
+                    b = s[x*4+1];
+                    a *= c;
+                    b *= (256-c);
+                    a += b;
+                    a >>= 8;
+                    p[x*4+1] = a;
+
+                    a = p[x*4+2];
+                    b = s[x*4+2];
+                    a *= c;
+                    b *= (256-c);
+                    a += b;
+                    a >>= 8;
+                    p[x*4+2] = a;
+
+                    /*p[x*4+0] = s[x*4+0];
+                    p[x*4+1] = s[x*4+1];
+                    p[x*4+2] = s[x*4+2];*/
+                }
+            }
+        }
+    }
+
+    convertRgbToYuv->convertImage(rgbBufImage,img);
+
+    free(stack);
+}
+/**
+    \fn DelogoHQPrepareMask_C
+*/
+void ADMVideoDelogoHQ::DelogoHQPrepareMask_C(int * mask, int * maskHint, int w, int h, ADMImage * maskImage)
+{
+    if (!mask) return;
+    if (!maskHint) return;
+    if (!maskImage) return;
+    if ((w < 1) || (h < 1)) return;
+
+
+    int i,x,y;
+    int stride;
+    uint8_t * ptr;
+
+    stride=maskImage->GetPitch(PLANAR_Y);
+    ptr=maskImage->GetWritePtr(PLANAR_Y);
+
+    maskHint[0] = maskHint[1] = maskHint[2] = maskHint[3] = -1; 
+
+    for (y=0; y<h; y++)
+    {
+        for (x=0; x<w; x++)
+        {
+            mask[y*w+x] = (ptr[x]> 127) ? -1:0;
+        }
+        ptr+=stride;
+    }
+
+    bool hasNegative;
+    int expectedNeighbour = 0;
+    do {
+        hasNegative = false;
+        for (y=0; y<h; y++)
+        {
+            for (x=0; x<w; x++)
+            {
+                if (mask[y*w+x] >= 0) continue;
+                if ((x-1)>=0)
+                    if (mask[y*w+(x-1)] == expectedNeighbour)
+                    {
+                        mask[y*w+x] = (expectedNeighbour+1);
+                        continue;
+                    }
+                if ((x+1)<w)
+                    if (mask[y*w+(x+1)] == expectedNeighbour)
+                    {
+                        mask[y*w+x] = (expectedNeighbour+1);
+                        continue;
+                    }
+                if ((y-1)>=0)
+                    if (mask[(y-1)*w+x] == expectedNeighbour)
+                    {
+                        mask[y*w+x] = (expectedNeighbour+1);
+                        continue;
+                    }
+                if ((y+1)<h)
+                    if (mask[(y+1)*w+x] == expectedNeighbour)
+                    {
+                        mask[y*w+x] = (expectedNeighbour+1);
+                        continue;
+                    }
+                hasNegative = true;
+            }
+        }
+        expectedNeighbour++;
+    } while(hasNegative && (expectedNeighbour < 65536));
+
+    for (y=0; y<h; y++)
+    {
+        for (x=0; x<w; x++)
+        {
+            if (mask[y*w+x] > 0)
+            {
+                if ((maskHint[0] < 0) || (maskHint[0] > x)) maskHint[0] = x;
+                if ((maskHint[1] < 0) || (maskHint[1] > y)) maskHint[1] = y;
+                if (maskHint[2] < x) maskHint[2] = x;
+                if (maskHint[3] < y) maskHint[3] = y;
+            }
+        }
+    }
+}
+/**
+    \fn configure
+*/
+bool ADMVideoDelogoHQ::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getDelogoHQ(&_param, previousFilter);
+    reloadImage();
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoDelogoHQ::getConfiguration(void)
+{
+    static char s[2560];
+    snprintf(s,2559," Mask file: %s\nBlur radius: %d, gradient: %d",_param.maskfile.c_str(),_param.blur,_param.gradient);
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoDelogoHQ::ADMVideoDelogoHQ(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,delogoHQ_param,&_param))
+    {
+        _param.blur = 0;
+        _param.gradient = 0;
+    }
+    _mask = (int *)malloc(info.width * info.height * sizeof(int));
+    DelogoHQCreateBuffers(info.width,info.height, &(_rgbBufStride), &(_rgbBufRaw), &(_rgbBufImage), &(_convertYuvToRgb), &(_convertRgbToYuv));
+    reloadImage();
+    update();
+}
+/**
+    \fn reloadImage
+*/
+bool ADMVideoDelogoHQ::reloadImage(void)
+{
+        if(!_param.maskfile.size())
+        {
+            return false;
+        }
+        ADMImage * mask=createImageFromFile(_param.maskfile.c_str());
+        if(!mask) return false;
+
+        if ((mask->GetWidth(PLANAR_Y) != info.width) || (mask->GetHeight(PLANAR_Y) != info.height))
+            memset(_mask, 0, info.width* info.height);
+        else
+            DelogoHQPrepareMask_C(_mask, _maskHint, info.width, info.height, mask);
+
+        delete mask;
+
+        return true;
+}
+/**
+    \fn update
+*/
+void ADMVideoDelogoHQ::update(void)
+{
+    _blur=_param.blur;
+    _gradient=_param.gradient;
+}
+/**
+    \fn dtor
+*/
+ADMVideoDelogoHQ::~ADMVideoDelogoHQ()
+{
+    DelogoHQDestroyBuffers(_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+    free(_mask);
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoDelogoHQ::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, delogoHQ_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoDelogoHQ::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, delogoHQ_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoDelogoHQ::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    DelogoHQProcess_C(image,info.width,info.height,_mask,_maskHint,_blur,_gradient,_rgbBufStride,_rgbBufRaw, _rgbBufImage, _convertYuvToRgb, _convertRgbToYuv);
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/ADM_vidDelogoHQ.h Added

@@ -0,0 +1,58 @@
+/***************************************************************************
+                          DelogoHQ filter
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+
+/**
+    \class ADMVideoDelogoHQ
+*/
+class  ADMVideoDelogoHQ:public ADM_coreVideoFilter
+{
+
+  protected:
+    void                  update(void);
+    delogoHQ              _param;
+    int *                 _mask;
+    int                   _maskHint[4];
+    uint32_t              _blur;
+    uint32_t              _gradient;
+    int                   _rgbBufStride;
+    ADM_byteBuffer *      _rgbBufRaw;
+    ADMImageRef *         _rgbBufImage;
+    ADMColorScalerFull *  _convertYuvToRgb;
+    ADMColorScalerFull *  _convertRgbToYuv;
+  public:
+    ADMVideoDelogoHQ(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoDelogoHQ();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface        
+
+    static void DelogoHQCreateBuffers(int w, int h, int * rgbBufStride, ADM_byteBuffer ** rgbBufRaw, ADMImageRef ** rgbBufImage, ADMColorScalerFull ** convertYuvToRgb, ADMColorScalerFull ** convertRgbToYuv);
+    static void DelogoHQDestroyBuffers(ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+    static void BoxBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius);
+    static void DelogoHQProcess_C(ADMImage *img, int w, int h, int * mask, int * maskHint, uint32_t blur, uint32_t gradient, int rgbBufStride, ADM_byteBuffer * rgbBufRaw, ADMImageRef * rgbBufImage, ADMColorScalerFull * convertYuvToRgb, ADMColorScalerFull * convertRgbToYuv);
+    static void DelogoHQPrepareMask_C(int * mask, int * maskHint, int w, int h, ADMImage * maskImage);
+
+  private:
+    bool reloadImage(void);
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/cli/DIA_delogoHQ.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/delogoHQ_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.cpp Added

@@ -0,0 +1,91 @@
+/**/
+/***************************************************************************
+                          DIA_flyDelogoHQ
+                             -------------------
+
+			   Ui for DelogoHQ filter
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyDelogoHQ.h"
+#include "ADM_vidDelogoHQ.h"
+#include "DIA_coreToolkit.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyDelogoHQ::update(void)
+{
+    return 1;
+}
+/**
+    \fn setMask
+*/
+bool flyDelogoHQ::setMask(ADMImage * newMask)
+{
+    if (!newMask) return false;
+    if ((newMask->GetWidth(PLANAR_Y) != _w) || (newMask->GetHeight(PLANAR_Y) != _h))
+    {
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("delogoHQ","The selected image has different width/height."), NULL);
+        return false;
+    }
+
+    if (!mask) mask = (int * )malloc(_w*_h*sizeof(int));
+    if (!mask) return false;
+    ADMVideoDelogoHQ::DelogoHQPrepareMask_C(mask, maskHint, _w, _h, newMask);
+    return true;
+}
+/**
+    \fn createBuffers
+*/
+void flyDelogoHQ::createBuffers(void)
+{
+    ADMVideoDelogoHQ::DelogoHQCreateBuffers(_w, _h, &rgbBufStride, &rgbBufRaw, &rgbBufImage, &convertYuvToRgb, &convertRgbToYuv);
+}
+/**
+    \fn destroyBuffers
+*/
+void flyDelogoHQ::destroyBuffers(void)
+{
+    ADMVideoDelogoHQ::DelogoHQDestroyBuffers(rgbBufRaw, rgbBufImage, convertYuvToRgb, convertRgbToYuv);
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyDelogoHQ::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    if (saveFilename)
+    {
+        if (!(in->saveAsPng(saveFilename)))
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("delogoHQ","Save failed!"), NULL);
+        free(saveFilename);
+        saveFilename = NULL;
+    }
+
+
+    if (!mask)
+    {
+        //out->printString(1,1,"Original");
+    } else {
+        // Do it!
+        ADMVideoDelogoHQ::DelogoHQProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),mask,maskHint,param.blur,param.gradient, rgbBufStride, rgbBufRaw, rgbBufImage, convertYuvToRgb, convertRgbToYuv);
+        //out->printString(1,1,"Processed"); 
+    }
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/DIA_flyDelogoHQ.h Added

@@ -0,0 +1,58 @@
+/***************************************************************************
+  \fn     DIA_flyDelogoHQ
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for delogoHQ
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_DelogoHQ_H
+#define FLY_DelogoHQ_H
+#include "delogoHQ.h"
+/**
+    \class flyDelogoHQ
+*/
+class flyDelogoHQ : public ADM_flyDialogYuv
+{
+  public:
+    delogoHQ         param;
+  private:
+    int                    rgbBufStride;
+    ADM_byteBuffer *       rgbBufRaw;
+    ADMImageRef *          rgbBufImage;
+    ADMColorScalerFull *   convertYuvToRgb;
+    ADMColorScalerFull *   convertRgbToYuv;
+    int *                  mask;
+    int                    maskHint[4];
+    char * saveFilename;
+
+    void       createBuffers(void);
+    void       destroyBuffers(void);
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyDelogoHQ (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {
+                          saveFilename = NULL;
+                          mask=NULL;
+                          maskHint[0] = maskHint[1] = maskHint[2] = maskHint[3] = -1;
+                          createBuffers();
+                };
+    virtual ~flyDelogoHQ() {
+                          if (mask) free(mask);
+                          destroyBuffers();
+                };
+    void       saveCurrentFrame(char * filename) {saveFilename = filename;};
+    bool       setMask(ADMImage * newMask);
+
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.cpp Added

@@ -0,0 +1,331 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include <QMessageBox>
+#include "Q_delogoHQ.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidDelogoHQ.h"
+#include "ADM_imageLoader.h"
+#include "DIA_fileSel.h"
+#include "ADM_last.h"
+#include "DIA_coreToolkit.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_delogoHQWindow::Ui_delogoHQWindow(QWidget *parent, delogoHQ *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        admCoreUtils::getLastReadFolder(lastFolder);
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyDelogoHQ( this,width, height,in,canvas,ui.horizontalSlider);
+        //memcpy(&(myFly->param),param,sizeof(delogoHQ));
+        myFly->param.blur = param->blur;
+        myFly->param.gradient = param->gradient;
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        if(param->maskfile.size())
+        {
+            if(tryToLoadimage(param->maskfile.c_str()))
+            {
+                maskFName=param->maskfile;
+            }
+        }
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChangedSpinBox(int)));
+        SPINNER(Blur)
+        SPINNER(Gradient)
+
+        QPushButton *helpButton = ui.buttonBox->button(QDialogButtonBox::Help);
+        connect(helpButton,SIGNAL(clicked()),this,SLOT(showHelp()));
+
+        connect( ui.pushButtonSave,SIGNAL(pressed()),this,SLOT(imageSave()));
+        connect( ui.pushButtonLoad,SIGNAL(pressed()),this,SLOT(imageLoad()));
+
+        setModal(true);
+}
+void Ui_delogoHQWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_delogoHQWindow::gather(delogoHQ *param)
+{
+    myFly->download();
+    //memcpy(param,&(myFly->param),sizeof(delogoHQ));
+    param->blur = myFly->param.blur;
+    param->gradient = myFly->param.gradient;
+
+    param->maskfile=maskFName;
+}
+Ui_delogoHQWindow::~Ui_delogoHQWindow()
+{
+    admCoreUtils::setLastReadFolder(lastFolder);
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_delogoHQWindow::showHelp()
+{
+    QString usage = "<ol><li>";
+
+    const char *text = QT_TRANSLATE_NOOP("delogoHQ","Find a frame in the preview with the logo clearly visible and not blending into the background.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br></li><li>";
+
+    text = QT_TRANSLATE_NOOP("delogoHQ","Save this frame as a PNG image.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br></li><li>";
+
+    text = QT_TRANSLATE_NOOP("delogoHQ","Use an appropriate image editor to paint the area of the logo of any shape white and everything else solid black.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br><br>";
+
+    text = QT_TRANSLATE_NOOP("delogoHQ","This black and white image will serve as a mask where white pixels correspond to the logo to be removed.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br><br>";
+
+    text = QT_TRANSLATE_NOOP("delogoHQ","If the logo has fully transparent areas, it is recommended to exclude them from the mask by making them black.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br></li><li>";
+
+    text = QT_TRANSLATE_NOOP("delogoHQ","Load the mask image.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br></li></ol><p>";
+
+    text = QT_TRANSLATE_NOOP("delogoHQ","Note: To remove multiple distant logos (e.g. opposite corners), using separate filter instances for each logo will be much faster.");
+    usage += QString::fromUtf8(text);
+
+    usage += "<br></p>";
+
+    QString title = QString::fromUtf8(QT_TRANSLATE_NOOP("delogoHQ","How to use DelogoHQ"));
+    QMessageBox msgBoxUsage(QMessageBox::Information, title, usage, QMessageBox::Ok, qtLastRegisteredDialog());
+#ifdef __APPLE__
+    QWidget *forceTitle = static_cast<QWidget *>(&msgBoxUsage);
+    forceTitle->setWindowTitle(title);
+#endif
+    msgBoxUsage.exec();
+}
+void Ui_delogoHQWindow::imageSave()
+{
+    char * buffer = (char *)malloc(2048);
+    if (!buffer) return;
+    std::string source;
+    if(maskFName.size())
+        source=maskFName;
+    else
+        source=lastFolder;
+    if(FileSel_SelectWrite(QT_TRANSLATE_NOOP("delogoHQ","Save selected frame..."),buffer,2047,source.c_str(),"png"))
+    {
+        admCoreUtils::setLastReadFolder(std::string(buffer));
+        myFly->saveCurrentFrame(buffer);
+        buffer=NULL;
+        myFly->sameImage();
+    }
+    if (buffer) free(buffer);
+}
+void Ui_delogoHQWindow::imageLoad()
+{
+    char buffer[2048];
+    std::string source;
+    if(maskFName.size())
+        source=maskFName;
+    else
+        source=lastFolder;
+    if(FileSel_SelectRead(QT_TRANSLATE_NOOP("delogoHQ","Load mask"),buffer,2048,source.c_str(),"png"))
+    {
+        admCoreUtils::setLastReadFolder(std::string(buffer));
+        if(tryToLoadimage(buffer))
+        {
+            myFly->sameImage();
+        }
+    }
+}
+bool Ui_delogoHQWindow::tryToLoadimage(const char *filename)
+{
+    bool status=false;
+    if(strlen(filename))
+    {
+        ADMImage * mask=createImageFromFile(filename);
+        if(mask)
+        {
+            if (myFly->setMask(mask))
+            {
+                maskFName=std::string(filename);
+                ui.lineEditImage->clear();
+                ui.lineEditImage->insert(QString::fromStdString(maskFName));
+                status=true;
+            }
+            delete mask;
+        } else {
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("delogoHQ","Load failed!"), NULL);
+        }
+    }
+    return status;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.spinBox##x->blockSignals(true); \
+        ui.spinBox##x->setValue(ui.horizontalSlider##x->value()); \
+        ui.spinBox##x->blockSignals(false);
+void Ui_delogoHQWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Blur);
+    COPY_VALUE_TO_SPINBOX(Gradient);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue(ui.spinBox##x->value()); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_delogoHQWindow::valueChangedSpinBox(int foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Blur);
+    COPY_VALUE_TO_SLIDER(Gradient);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_delogoHQWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_delogoHQWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSLIDER(x) w->horizontalSlider##x
+#define MYSPIN(x) w->spinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADSPIN(x, value) \
+        w->spinBox##x->blockSignals(true); \
+        w->spinBox##x->setValue(value); \
+        w->spinBox##x->blockSignals(false);
+//************************
+uint8_t flyDelogoHQ::upload(void)
+{
+    Ui_delogoHQDialog *w=(Ui_delogoHQDialog *)_cookie;
+    MYSLIDER(Blur)->setValue((int)param.blur);
+    UPLOADSPIN(Blur, param.blur);
+    MYSLIDER(Gradient)->setValue((int)param.gradient);
+    UPLOADSPIN(Gradient, param.gradient);
+    return 1;
+}
+
+uint8_t flyDelogoHQ::download(void)
+{
+    Ui_delogoHQDialog *w=(Ui_delogoHQDialog *)_cookie;
+    param.blur=(int)MYSLIDER(Blur)->value();
+    param.gradient=(int)MYSLIDER(Gradient)->value();
+    return 1;
+}
+
+void flyDelogoHQ::setTabOrder(void)
+{
+    Ui_delogoHQDialog *w=(Ui_delogoHQDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_DIAL(x) controls.push_back(MYDIAL(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    controls.push_back(w->pushButtonSave);
+    controls.push_back(w->pushButtonLoad);
+    PUSH_SLIDER(Blur)
+    PUSH_SPIN(Blur)
+    PUSH_SLIDER(Gradient)
+    PUSH_SPIN(Gradient)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getDelogoHQ(delogoHQ *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_delogoHQWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/Q_delogoHQ.h Added

@@ -0,0 +1,42 @@
+#ifndef Q_delogoHQ_h
+#define Q_delogoHQ_h
+#include "ui_delogoHQ.h"
+#include "ADM_image.h"
+#include "delogoHQ.h"
+#include "DIA_flyDialogQt4.h"
+#include "DIA_flyDelogoHQ.h"
+
+class Ui_delogoHQWindow : public QDialog
+{
+    Q_OBJECT
+
+  protected:
+    uint32_t       width,height;
+    int            lock;
+    std::string    lastFolder;
+  public:
+    flyDelogoHQ *myFly;
+    ADM_QCanvas *canvas;
+    Ui_delogoHQWindow(QWidget *parent, delogoHQ *param,ADM_coreVideoFilter *in);
+    ~Ui_delogoHQWindow();
+    Ui_delogoHQDialog ui;
+
+    std::string         maskFName;
+
+  public slots:
+    void gather(delogoHQ *param);
+
+  private slots:
+    void sliderUpdate(int foo);
+    void valueChanged(int foo);
+    void valueChangedSpinBox(int foo);
+    void showHelp();
+    void imageSave();
+    void imageLoad();
+
+  private:
+    void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
+    bool tryToLoadimage(const char *filename);
+};
+#endif    // Q_delogoHQ_h

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/delogoHQ/qt4/delogoHQ.ui Added

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>delogoHQDialog</class>
+ <widget class="QDialog" name="delogoHQDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>585</width>
+    <height>424</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>DelogoHQ</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBoxMask">
+     <property name="title">
+      <string>Mask</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="1" column="0">
+       <widget class="QPushButton" name="pushButtonSave">
+        <property name="text">
+         <string>Save current frame...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="lineEditImage">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>80</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="pushButtonLoad">
+        <property name="text">
+         <string>Load mask</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxPostProc">
+     <property name="title">
+      <string>Post-processing</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="2">
+       <widget class="QSlider" name="horizontalSliderBlur">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelBlur">
+        <property name="text">
+         <string>Blur</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelGradient">
+        <property name="text">
+         <string>Gradient</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QSlider" name="horizontalSliderGradient">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QSpinBox" name="spinBoxBlur">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QSpinBox" name="spinBoxGradient">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>pushButtonSave</tabstop>
+  <tabstop>pushButtonLoad</tabstop>
+  <tabstop>horizontalSliderBlur</tabstop>
+  <tabstop>horizontalSliderGradient</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+  <tabstop>lineEditImage</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>delogoHQDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>delogoHQDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/dgBob/ADM_vidDGbob.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.cpp Changed

@@ -176,12 +176,12 @@
 
     settings->param[1].c=cfg->saturation;
     settings->param[1].b=0;
-    settings->param[1].g=sqrt(settings->bgamma/settings->ggamma);
+    settings->param[1].g=sqrt(settings->rgamma/settings->ggamma);
     settings->param[1].w=settings->gamma_weight;
 
     settings->param[2].c=cfg->saturation;
     settings->param[2].b=0;
-    settings->param[2].g=sqrt(settings->rgamma/settings->ggamma);
+    settings->param[2].g=sqrt(settings->bgamma/settings->ggamma);
     settings->param[2].w=settings->gamma_weight;
 
     //printf("GGamma:%f\n",settings->ggamma);
@@ -262,8 +262,8 @@
 //  printf("\nmmx: src=%p dst=%p w=%d h=%d ds=%d ss=%d\n",src,dst,w,h,dstride,sstride);
   if(par->g!=1.0) return apply_lut(par,srcImage,destImage,plane);
   //printf("MMX\n");
-  contrast = (int) (par->c * 256 * 16);
-  brightness = ((int) (100.0 * par->b + 100.0) * 511) / 200 - 128 - contrast / 32;
+  contrast = (int) (par->c * 256 * 16 + 0.4999);
+  brightness = ((int) (100.0 * par->b + 100.0 + 0.4999) * 512) / 200 - 128 - contrast / 32;
 
   brvec[0] = brvec[1] = brvec[2] = brvec[3] = brightness;
   contvec[0] = contvec[1] = contvec[2] = contvec[3] = contrast;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp Changed

@@ -46,15 +46,13 @@
     myCrop=new flyEq2(this, width, height,in,canvas,ui.horizontalSlider,scene);
     memcpy(&(myCrop->param),param,sizeof(eq2));
     myCrop->_cookie=&ui;
-    myCrop->fullpreview = false;
-    myCrop->addControl(ui.toolboxLayout);
+    myCrop->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
     myCrop->setTabOrder();
     myCrop->upload();
     myCrop->sliderChanged();
     myCrop->update();
 
     ui.horizontalSliderContrast->setFocus();
-    ui.checkBoxFullPreview->setChecked(myCrop->fullpreview);
 
     QSignalMapper *signalMapper = new QSignalMapper(this);
     connect( signalMapper,SIGNAL(mapped(QWidget*)),this,SLOT(resetSlider(QWidget*)));
@@ -77,7 +75,6 @@
     SPINNER(Blue);
     SPINNER(Green);
 
-    connect( ui.checkBoxFullPreview,SIGNAL(stateChanged(int)),this,SLOT(toggleFullPreview(int)));
 
     setResetSliderEnabledState();
 
@@ -161,20 +158,6 @@
 }
 
 /**
- * \fn toggleFullPreview
- */
-void Ui_eq2Window::toggleFullPreview(int checkState)
-{
-    bool fullpreview=false;
-    if(checkState)
-    {
-        fullpreview=true;
-    }
-    myCrop->fullpreview=fullpreview;
-    myCrop->sameImage();
-}
-
-/**
     \fn dtor
 */
 Ui_eq2Window::~Ui_eq2Window()
@@ -292,7 +275,6 @@
 
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);
-    controls.push_back(w->checkBoxFullPreview);
 
     QWidget *first, *second;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/eq2/qt4/eq2.ui Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.cpp Added

@@ -0,0 +1,612 @@
+/***************************************************************************
+                          FadeFromImage filter
+    Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "ADM_vidMisc.h"
+#include "DIA_factory.h"
+#include "fadeFromImage.h"
+#include "fadeFromImage_desc.cpp"
+#include "ADM_vidFadeFromImage.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getFadeFromImage(fadeFromImage *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFadeFromImage,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSITION,            // Category
+                                      "fadeFromImage",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("fadeFromImage","Fade from first image"),            // Display name
+                                      QT_TRANSLATE_NOOP("fadeFromImage","Use image at start time for fading.") // Description
+                                  );
+
+/**
+    \fn FadeFromImageCreateBuffers
+*/
+void ADMVideoFadeFromImage::FadeFromImageCreateBuffers(int w, int h, fadeFromImage_buffers_t * buffers)
+{
+    buffers->validImg = false;
+    buffers->imgCopy = new ADMImageDefault(w,h);
+    // make it green
+    uint8_t * wplanes[3];
+    int strides[3];
+    buffers->imgCopy->GetWritePlanes(wplanes);
+    buffers->imgCopy->GetPitches(strides);
+    memset(wplanes[0], 128, h*strides[0]);
+    memset(wplanes[1], 0, (h/2)*strides[1]);
+    memset(wplanes[2], 0, (h/2)*strides[2]);
+}
+/**
+    \fn FadeFromImageDestroyBuffers
+*/
+void ADMVideoFadeFromImage::FadeFromImageDestroyBuffers(fadeFromImage_buffers_t * buffers)
+{
+    delete buffers->imgCopy;
+}
+
+/**
+    \fn FadeFromImageProcess_C
+*/
+void ADMVideoFadeFromImage::FadeFromImageProcess_C(ADMImage *img, int w, int h,  uint64_t absoluteStartPts, fadeFromImage param, fadeFromImage_buffers_t * buffers)
+{
+    if (!img || !buffers || !buffers->imgCopy) return;
+    uint8_t * line;
+
+    uint32_t startMs = param.startTime;
+    uint32_t endMs = param.endTime;
+
+    if (startMs > endMs)
+    {
+        uint64_t tmp = endMs;
+        endMs = startMs;
+        startMs = tmp;
+    }
+    
+    uint32_t imgMs = (img->Pts+absoluteStartPts)/1000LL;
+    
+    if (startMs == endMs)
+        return;
+    if (imgMs < startMs)
+        return;
+    if (imgMs >= endMs)
+        return;
+
+    if (!buffers->validImg)
+    {
+        if (imgMs <= startMs+1)	// avoid rounding errors
+        {
+            buffers->validImg = true;
+            buffers->imgCopy->duplicateFull(img);
+        }
+    }
+
+    double frac = ((double)(imgMs - startMs)) / ((double)(endMs - startMs));
+    int dir = param.direction % 4;
+
+    uint8_t * imgPlanes[3];
+    uint8_t * copyPlanes[3];
+    int imgStrides[3];
+    int copyStrides[3];
+
+    img->GetWritePlanes(imgPlanes);
+    img->GetPitches(imgStrides);
+    buffers->imgCopy->GetWritePlanes(copyPlanes);
+    buffers->imgCopy->GetPitches(copyStrides);
+
+    switch (param.effect)
+    {
+        case 0:		// linear blend
+            {
+                int imgblend = frac*256.0 + 0.49;
+                int copyblend = (1.0-frac)*256.0 + 0.49;
+                for (int p=0; p<3; p++)
+                {
+                    int width = ((p==0) ? w:(w/2));
+                    int height = ((p==0) ? h:(h/2));
+                    int px;
+                    uint8_t * ipl = imgPlanes[p];
+                    uint8_t * cpl = copyPlanes[p];
+                    for (int y=0; y<height; y++)
+                    {
+                        for (int x=0; x<width; x++)
+                        {
+                            px = imgblend*ipl[x] + copyblend*cpl[x];
+                            ipl[x] = px / 256;
+                        }
+                        ipl += imgStrides[p];
+                        cpl += copyStrides[p];
+                    }
+                }
+            }
+            break;
+        case 1:		// slide
+            {
+                // for now, only vertical and horizontal slide supported
+                if (dir==0)  // up
+                {
+                    int displacement = (frac*h)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<(height-displacement); y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+(y+displacement)*copyStrides[p], width);
+                        }
+                    }
+                }
+                else
+                if (dir==1)  // right
+                {
+                    int displacement = (frac*w)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p] + displacement, copyPlanes[p]+y*copyStrides[p], (width-displacement));
+                        }
+                    }
+                }
+                else
+                if (dir==2)  // down
+                {
+                    int displacement = (frac*h)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=displacement; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+(y-displacement)*copyStrides[p], width);
+                        }
+                    }
+                }
+                else
+                //if (dir==3)  // left
+                {
+                    int displacement = (frac*w)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+y*copyStrides[p]+displacement, (width-displacement));
+                        }
+                    }
+                }
+            }
+            break;
+        case 2:		// wipe
+            {
+                // for now, only vertical and horizontal wipe supported
+                if (dir==0)  // up
+                {
+                    int displacement = (frac*h)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<(height-displacement); y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+y*copyStrides[p], width);
+                        }
+                    }
+                }
+                else
+                if (dir==1)  // right
+                {
+                    int displacement = (frac*w)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p]+displacement, copyPlanes[p]+y*copyStrides[p]+displacement, (width-displacement));
+                        }
+                    }
+                }
+                else
+                if (dir==2)  // down
+                {
+                    int displacement = (frac*h)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=displacement; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+y*copyStrides[p], width);
+                        }
+                    }
+                }
+                else
+                //if (dir==3)  // left
+                {
+                    int displacement = (frac*w)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+y*copyStrides[p], (width-displacement));
+                        }
+                    }
+                }
+            }
+            break;
+        case 3:		// push
+            {
+                // for now, only vertical and horizontal slide supported
+                if (dir==0)  // up
+                {
+                    int displacement = (frac*h)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=(height-1); y>=(height-displacement); y--)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], imgPlanes[p]+(y-(height-displacement))*imgStrides[p], width);
+                        }
+                        for (int y=0; y<(height-displacement); y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+(y+displacement)*copyStrides[p], width);
+                        }
+                    }
+                }
+                else
+                if (dir==1)  // right
+                {
+                    int displacement = (frac*w)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<height; y++)
+                        {
+                            memmove(imgPlanes[p]+y*imgStrides[p], imgPlanes[p]+y*imgStrides[p] + (width-displacement), displacement);
+                        }
+                        for (int y=0; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p] + displacement, copyPlanes[p]+y*copyStrides[p], (width-displacement));
+                        }
+                    }
+                }
+                else
+                if (dir==2)  // down
+                {
+                    int displacement = (frac*h)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<displacement; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], imgPlanes[p]+(y+(height-displacement))*imgStrides[p], width);
+                        }
+                        for (int y=displacement; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+(y-displacement)*copyStrides[p], width);
+                        }
+                    }
+                }
+                else
+                //if (dir==3)  // left
+                {
+                    int displacement = (frac*w)/2 + 0.49;
+                    displacement *= 2;
+                    for (int p=0; p<3; p++)
+                    {
+                        int width = ((p==0) ? w:(w/2));
+                        int height = ((p==0) ? h:(h/2));
+                        if (p==1)
+                            displacement /= 2;
+
+                        for (int y=0; y<height; y++)
+                        {
+                            memmove(imgPlanes[p]+y*imgStrides[p] + (width-displacement), imgPlanes[p]+y*imgStrides[p], displacement);
+                        }
+                        for (int y=0; y<height; y++)
+                        {
+                            memcpy(imgPlanes[p]+y*imgStrides[p], copyPlanes[p]+y*copyStrides[p]+displacement, (width-displacement));
+                        }
+                    }
+                }
+            }
+            break;
+        case 4:		// luma
+        case 5:		// inv. luma
+            {
+                if (param.effect == 5)
+                    frac = 1.0-frac;
+                
+                int threshold;
+                if(img->_range == ADM_COL_RANGE_MPEG)
+                    threshold = frac*220.0 + 16.49;
+                else
+                    threshold = frac*256.0 + 0.49;
+                uint8_t * ipl = imgPlanes[0];
+                uint8_t * cpl = copyPlanes[0];
+                for (int y=0; y<h; y++)
+                {
+                    if (param.effect == 5)
+                    {
+                        for (int x=0; x<w; x++)
+                        {
+                            if (cpl[x] < threshold)
+                                ipl[x] = cpl[x];
+                        }
+                    } else {
+                        for (int x=0; x<w; x++)
+                        {
+                            if (cpl[x] > threshold)
+                                ipl[x] = cpl[x];
+                        }
+                    }
+                    ipl += imgStrides[0];
+                    cpl += copyStrides[0];
+                }
+                ipl = imgPlanes[0];
+                cpl = copyPlanes[0];
+                int chromaMix,px;
+                for (int y=0; y<h/2; y++)
+                {
+                    for (int x=0; x<w/2; x++)
+                    {
+                        if (param.effect == 5)
+                        {
+                            chromaMix  = (cpl[2*x] < threshold) ? 1:0;
+                            chromaMix += (cpl[2*x+1] < threshold) ? 1:0;
+                            chromaMix += (cpl[2*x+copyStrides[0]] < threshold) ? 1:0;
+                            chromaMix += (cpl[2*x+copyStrides[0]+1] < threshold) ? 1:0;
+                        } else {
+                            chromaMix  = (cpl[2*x] > threshold) ? 1:0;
+                            chromaMix += (cpl[2*x+1] > threshold) ? 1:0;
+                            chromaMix += (cpl[2*x+copyStrides[0]] > threshold) ? 1:0;
+                            chromaMix += (cpl[2*x+copyStrides[0]+1] > threshold) ? 1:0;
+                        }
+                        px = (4-chromaMix)*imgPlanes[1][x] + chromaMix*copyPlanes[1][x];
+                        imgPlanes[1][x] = px / 4;
+                        px = (4-chromaMix)*imgPlanes[2][x] + chromaMix*copyPlanes[2][x];
+                        imgPlanes[2][x] = px / 4;
+                    }
+                    ipl += 2*imgStrides[0];
+                    cpl += 2*copyStrides[0];
+                    imgPlanes[1] += imgStrides[1];
+                    imgPlanes[2] += imgStrides[2];
+                    copyPlanes[1] += copyStrides[1];
+                    copyPlanes[2] += copyStrides[2];
+                }
+                
+            }
+            break;
+        case 6:		// static random dissolve
+        case 7:		// dynamic random dissolve
+            {
+                int threshold = frac*255.0 + 0.49;
+                uint32_t rng_state;
+                uint32_t rn;
+                uint64_t rng_product;
+                
+                if (param.effect == 7)
+                    rng_state = img->Pts;
+                else
+                    rng_state = startMs;
+                if (rng_state == 0)
+                    rng_state = 123456789;
+
+                for (int p=0; p<3; p++)
+                {
+                    int width = ((p==0) ? w:(w/2));
+                    int height = ((p==0) ? h:(h/2));
+                    int px;
+                    uint8_t * ipl = imgPlanes[p];
+                    uint8_t * cpl = copyPlanes[p];
+                    for (int y=0; y<height; y++)
+                    {
+                        for (int x=0; x<width; x++)
+                        {
+                            uint64_t rng_product = (uint64_t)rng_state * 48271;
+                            rng_state = (rng_product & 0x7fffffff) + (rng_product >> 31);
+                            rng_state = (rng_state & 0x7fffffff) + (rng_state >> 31);
+                            rn = rng_state & 0xFF;
+                            if (rn > threshold)
+                                ipl[x] = cpl[x];
+                        }
+                        ipl += imgStrides[p];
+                        cpl += copyStrides[p];
+                    }
+                }
+            }
+            break;
+        default:
+                img->duplicateFull(buffers->imgCopy);
+            break;
+    }
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoFadeFromImage::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getFadeFromImage(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoFadeFromImage::getConfiguration(void)
+{
+    static char s[512];
+    const char * effect=NULL;
+    
+    char startTimeStr[128];
+    char endTimeStr[128];
+    snprintf(startTimeStr,127,"%s",ADM_us2plain(_param.startTime*1000LL));
+    snprintf(endTimeStr,127,"%s",ADM_us2plain(_param.endTime*1000LL));
+
+    switch (_param.effect)
+    {
+        case 0:		// linear blend
+            effect = "Linear blend";
+            break;
+        case 1:		// slide
+            effect = "Slide";
+            break;
+        case 2:		// wipe
+            effect = "Wipe";
+            break;
+        case 3:		// push
+            effect = "Push";
+            break;
+        case 4:		// luma
+            effect = "Luma dissolve";
+            break;
+        case 5:		// inv. luma
+            effect = "Inverse luma dissolve";
+            break;
+        case 6:		// static random dissolve
+            effect = "Static random dissolve";
+            break;
+        case 7:		// dynamic random dissolve
+            effect = "Dynamic random dissolve";
+            break;
+    }
+
+    snprintf(s,511,"%s - %s: %s",startTimeStr,endTimeStr,effect);
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoFadeFromImage::ADMVideoFadeFromImage(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,fadeFromImage_param,&_param))
+    {
+        // Default value
+        _param.startTime = info.markerA / 1000LL;
+        _param.endTime = info.markerB / 1000LL;
+        _param.effect = 0;
+        _param.direction = 0;
+    }
+    
+    FadeFromImageCreateBuffers(info.width,info.height, &(_buffers));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoFadeFromImage::update(void)
+{
+}
+/**
+    \fn dtor
+*/
+ADMVideoFadeFromImage::~ADMVideoFadeFromImage()
+{
+    FadeFromImageDestroyBuffers(&(_buffers));
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoFadeFromImage::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, fadeFromImage_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoFadeFromImage::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, fadeFromImage_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoFadeFromImage::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    FadeFromImageProcess_C(image,info.width,info.height,getAbsoluteStartTime(),_param, &(_buffers));
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/ADM_vidFadeFromImage.h Added

@@ -0,0 +1,50 @@
+/***************************************************************************
+                          FadeFromImage filter
+    Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "ADM_coreVideoFilter.h"
+
+/**
+    \class ADMVideoFadeFromImage
+*/
+class  ADMVideoFadeFromImage:public ADM_coreVideoFilter
+{
+  public:
+    typedef struct {
+        bool                  validImg;
+        ADMImage *            imgCopy;
+    } fadeFromImage_buffers_t;
+
+  protected:
+    void                      update(void);
+    fadeFromImage             _param;
+    fadeFromImage_buffers_t   _buffers;
+    
+
+  public:
+    ADMVideoFadeFromImage(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoFadeFromImage();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface
+
+    static void FadeFromImageCreateBuffers(int w, int h, fadeFromImage_buffers_t * buffers);
+    static void FadeFromImageDestroyBuffers(fadeFromImage_buffers_t * buffers);
+    static void FadeFromImageProcess_C(ADMImage *img, int w, int h,  uint64_t absoluteStartPts, fadeFromImage param, fadeFromImage_buffers_t * buffers);
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/cli/DIA_fadeFromImage.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/fadeFromImage_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/DIA_flyFadeFromImage.cpp Added

@@ -0,0 +1,58 @@
+/**/
+/***************************************************************************
+                          DIA_flyFadeFromImage
+                             -------------------
+
+			   Ui for FadeFromImage
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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_image.h"
+#include "DIA_flyFadeFromImage.h"
+
+/************* COMMON PART *********************/
+
+/**
+ */
+flyFadeFromImage::flyFadeFromImage (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    ADMVideoFadeFromImage::FadeFromImageCreateBuffers(width,height,&buffers);
+}
+/**
+ * 
+ */
+flyFadeFromImage::~flyFadeFromImage()
+{
+    ADMVideoFadeFromImage::FadeFromImageDestroyBuffers(&buffers);
+}
+
+uint8_t  flyFadeFromImage::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyFadeFromImage::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoFadeFromImage::FadeFromImageProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),0,param, &buffers);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/DIA_flyFadeFromImage.h Added

@@ -0,0 +1,40 @@
+/***************************************************************************
+  \fn     DIA_flyFadeFromImage
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for fadeFromImage
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 DIA_FLYFADEFROMIMAGE_H
+#define DIA_FLYFADEFROMIMAGE_H
+#include "fadeFromImage.h"
+#include "ADM_vidFadeFromImage.h"
+#include "DIA_flyDialogQt4.h"
+/**
+    \class flyFadeFromImage
+*/
+class flyFadeFromImage : public ADM_flyDialogYuv
+{
+  private:
+    ADMVideoFadeFromImage::fadeFromImage_buffers_t  buffers;
+
+  public:
+    fadeFromImage  param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyFadeFromImage (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+              ~flyFadeFromImage();
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.cpp Added

@@ -0,0 +1,254 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include <QPalette>
+#include "ADM_default.h"
+#include "Q_fadeFromImage.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidFadeFromImage.h"
+#include "DIA_factory.h"
+#include "ADM_vidMisc.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_fadeFromImageWindow::Ui_fadeFromImageWindow(QWidget *parent, fadeFromImage *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+        markerA = in->getInfo()->markerA;
+        markerB = in->getInfo()->markerB;
+        duration = in->getInfo()->totalDuration;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyFadeFromImage( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(fadeFromImage));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        
+        connect(ui.pushButtonTManual,SIGNAL(clicked(bool)),this,SLOT(manualTimeEntry(bool)));
+        connect(ui.pushButtonTMarker,SIGNAL(clicked(bool)),this,SLOT(timesFromMarkers(bool)));
+        
+        connect(ui.comboBoxEffect, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+        connect(ui.comboBoxDirection, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+
+        QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+        setModal(true);
+}
+
+void Ui_fadeFromImageWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+
+void Ui_fadeFromImageWindow::manualTimeEntry(bool f)
+{
+    uint32_t mx=(uint32_t)(duration/1000LL);
+
+    diaElemTimeStamp start(&(myFly->param.startTime),QT_TRANSLATE_NOOP("fadeFromImage","_Start time:"),0,mx);
+    diaElemTimeStamp end(&(myFly->param.endTime),QT_TRANSLATE_NOOP("fadeFromImage","_End time:"),0,mx);
+    diaElem *elems[2]={&start,&end};
+
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("fadeFromImage","Manual time entry"),2+0*1,elems))
+    {
+        if(myFly->param.startTime > myFly->param.endTime)
+        {
+            uint32_t tmp=myFly->param.startTime;
+            myFly->param.startTime=myFly->param.endTime;
+            myFly->param.endTime=tmp;
+        }
+        valueChanged(0);
+    }
+}
+
+void Ui_fadeFromImageWindow::timesFromMarkers(bool f)
+{
+    myFly->param.startTime = markerA / 1000LL;
+    myFly->param.endTime = markerB / 1000LL;
+    if(myFly->param.startTime > myFly->param.endTime)
+    {
+        uint32_t tmp=myFly->param.startTime;
+        myFly->param.startTime=myFly->param.endTime;
+        myFly->param.endTime=tmp;
+    }
+    valueChanged(0);
+}
+
+void Ui_fadeFromImageWindow::gather(fadeFromImage *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(fadeFromImage));
+}
+Ui_fadeFromImageWindow::~Ui_fadeFromImageWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL;
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+
+void Ui_fadeFromImageWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+/**
+ * \fn reset
+ */
+void Ui_fadeFromImageWindow::reset( bool f )
+{
+    myFly->param.effect = 0;
+    myFly->param.direction = 0;
+    lock++;
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_fadeFromImageWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_fadeFromImageWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+    
+    QFontMetrics fm = ui.labelTScope->fontMetrics();
+    QString text = QString(QT_TRANSLATE_NOOP("fadeFromImage","Time scope: "));
+    text += QString("000:00:00,000 - 000:00:00,000");
+    ui.labelTScope->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    text = QString(QT_TRANSLATE_NOOP("fadeFromImage","Duration: "));
+    text += QString("000:00:00,000---");
+    ui.labelDuration->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
+//************************
+uint8_t flyFadeFromImage::upload()
+{
+    Ui_fadeFromImageDialog *w=(Ui_fadeFromImageDialog *)_cookie;
+    MYCOMBOX(Effect)->setCurrentIndex(param.effect);
+    MYCOMBOX(Direction)->setCurrentIndex(param.direction);
+    MYCOMBOX(Direction)->setVisible(param.effect>=1 && param.effect<=3);
+    
+    QString tstr = QString(QT_TRANSLATE_NOOP("fadeFromImage","Time scope: "));
+    tstr += QString(ADM_us2plain(param.startTime*1000LL));
+    tstr += QString(" - ");
+    tstr += QString(ADM_us2plain(param.endTime*1000LL));
+    w->labelTScope->setText(tstr);
+    
+    tstr = QString(QT_TRANSLATE_NOOP("fadeFromImage","Duration: "));
+    tstr += QString(ADM_us2plain((param.endTime - param.startTime)*1000LL));
+    w->labelDuration->setText(tstr);
+
+    return 1;
+}
+uint8_t flyFadeFromImage::download(void)
+{
+    Ui_fadeFromImageDialog *w=(Ui_fadeFromImageDialog *)_cookie;
+    param.effect=MYCOMBOX(Effect)->currentIndex();
+    param.direction=MYCOMBOX(Direction)->currentIndex();
+
+    upload();
+    return 1;
+}
+void flyFadeFromImage::setTabOrder(void)
+{
+    Ui_fadeFromImageDialog *w=(Ui_fadeFromImageDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+#define PUSHCOMBOX(x) controls.push_back(MYCOMBOX(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+    controls.push_back(w->pushButtonTManual);
+    controls.push_back(w->pushButtonTMarker);
+    PUSHCOMBOX(Effect)
+    PUSHCOMBOX(Direction)
+
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getFadeFromImage(fadeFromImage *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_fadeFromImageWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/Q_fadeFromImage.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeFromImage/qt4/fadeFromImage.ui Added

@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>fadeFromImageDialog</class>
+ <widget class="QDialog" name="fadeFromImageDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>451</width>
+    <height>299</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Fade from first image</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="labelTScope">
+       <property name="text">
+        <string>Time scope: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelDuration">
+       <property name="text">
+        <string>Duration: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTManual">
+       <property name="text">
+        <string>Manual time entry</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTMarker">
+       <property name="text">
+        <string>Set from A-B markers</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="labelEffect">
+       <property name="text">
+        <string>Effect:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxEffect">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>Linear blend</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Slide</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Wipe</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Push</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Luma dissolve</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Inverse luma dissolve</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Static random dissolve</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Dynamic random dissolve</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxDirection">
+       <item>
+        <property name="text">
+         <string>Up</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Right</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Down</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Left</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelInfo">
+     <property name="text">
+      <string>Start preview play before time scope, if you see green.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>fadeFromImageDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>fadeFromImageDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeIn.cpp Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+                          FadeInOut filter
+    Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#define FADEIN
+#include "ADM_vidFadeInOut.cpp"
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFadeInOut,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSITION,            // Category
+                                      "fadeIn",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("fadeInOut","Fade in"),            // Display name
+                                      QT_TRANSLATE_NOOP("fadeInOut","Fade in from color.") // Description
+                                  );
+
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeInOut.cpp Added

@@ -0,0 +1,223 @@
+/***************************************************************************
+                          FadeInOut filter
+    Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "ADM_vidMisc.h"
+#include "DIA_factory.h"
+#include "fadeInOut.h"
+#include "fadeInOut_desc.cpp"
+#include "ADM_vidFadeInOut.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+
+#if defined(FADEIN) + defined(FADEOUT) != 1
+#error FADE DIRECTION NOT DEFINED!
+#endif
+
+
+
+extern uint8_t DIA_getFadeInOut(fadeInOut *param, ADM_coreVideoFilter *in);
+
+/**
+    \fn FadeDirIsIn
+*/
+bool ADMVideoFadeInOut::FadeDirIsIn()
+{
+#if defined(FADEIN)
+    return true;
+#else
+    return false;
+#endif
+}
+/**
+    \fn FadeInOutProcess_C
+*/
+void ADMVideoFadeInOut::FadeInOutProcess_C(ADMImage *img, int w, int h, fadeInOut param)
+{
+    if (!img) return;
+    uint8_t * line;
+
+    uint32_t startMs = param.startTime;
+    uint32_t endMs = param.endTime;
+
+    if (startMs > endMs)
+    {
+        uint64_t tmp = endMs;
+        endMs = startMs;
+        startMs = tmp;
+    }
+    
+    uint32_t imgMs = img->Pts/1000LL;
+    
+    if (startMs == endMs)
+        return;
+    if (imgMs < startMs)
+        return;
+    if (imgMs > endMs)
+        return;
+
+    double frac = ((double)(imgMs - startMs)) / ((double)(endMs - startMs));
+#if defined(FADEIN)
+    frac = 1.0 - frac;
+#endif
+
+    // rgb to yuv:
+    int rgb[3], yuv[3];
+    rgb[0] = (param.rgbColor>>16)&0xFF;
+    rgb[1] = (param.rgbColor>>8)&0xFF;
+    rgb[2] = (param.rgbColor>>0)&0xFF;
+    if(img->_range == ADM_COL_RANGE_MPEG)
+    {
+        yuv[0] = std::round( 0.257*rgb[0] + 0.504*rgb[1] + 0.098*rgb[2]) + 16;
+        yuv[1] = std::round(-0.148*rgb[0] - 0.291*rgb[1] + 0.439*rgb[2]) + 128;
+        yuv[2] = std::round( 0.439*rgb[0] - 0.368*rgb[1] - 0.071*rgb[2]) + 128;
+        for (int i=0; i<3; i++)
+            if (yuv[i] <   16) yuv[i] = 16;
+        if (yuv[0] > 235) yuv[0] = 235;
+        if (yuv[1] > 240) yuv[1] = 240;
+        if (yuv[2] > 240) yuv[2] = 240;
+    } else {
+        yuv[0] = std::round( 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]);
+        yuv[1] = std::round(-0.169*rgb[0] - 0.331*rgb[1] + 0.500*rgb[2]) + 128;
+        yuv[2] = std::round( 0.500*rgb[0] - 0.419*rgb[1] - 0.081*rgb[2]) + 128;
+        for (int i=0; i<3; i++)
+        {
+            if (yuv[i] <   0) yuv[i] = 0;
+            if (yuv[i] > 255) yuv[i] = 255;
+        }
+    }
+    
+    // fix swapped uv
+    int uvswap = yuv[1]; yuv[1] = yuv[2]; yuv[2]=uvswap;
+    
+    // premultiply yuv
+    for (int i=0; i<3; i++)
+        yuv[i] = yuv[i]*frac*256.0 + 0.49;
+
+    uint8_t * imgPlanes[3];
+    int imgStrides[3];
+
+    img->GetWritePlanes(imgPlanes);
+    img->GetPitches(imgStrides);
+
+    int imgblend = (1.0-frac)*256.0 + 0.49;
+    for (int p=0; p<3; p++)
+    {
+        int width = ((p==0) ? w:(w/2));
+        int height = ((p==0) ? h:(h/2));
+        int px;
+        uint8_t * ipl = imgPlanes[p];
+        for (int y=0; y<height; y++)
+        {
+            for (int x=0; x<width; x++)
+            {
+                px = imgblend*ipl[x] + yuv[p];
+                ipl[x] = px / 256;
+            }
+            ipl += imgStrides[p];
+        }
+    }
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoFadeInOut::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getFadeInOut(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoFadeInOut::getConfiguration(void)
+{
+    static char s[512];
+    
+    char startTimeStr[128];
+    char endTimeStr[128];
+    snprintf(startTimeStr,127,"%s",ADM_us2plain(_param.startTime*1000LL));
+    snprintf(endTimeStr,127,"%s",ADM_us2plain(_param.endTime*1000LL));
+
+    snprintf(s,511,"%s - %s: %s #%06X",startTimeStr,endTimeStr,(FadeDirIsIn() ? "from":"to"),_param.rgbColor&0x00FFFFFF);
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoFadeInOut::ADMVideoFadeInOut(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,fadeInOut_param,&_param))
+    {
+        // Default value
+        _param.startTime = info.markerA / 1000LL;
+        _param.endTime = info.markerB / 1000LL;
+        _param.rgbColor = 0;
+    }
+    
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoFadeInOut::update(void)
+{
+}
+/**
+    \fn dtor
+*/
+ADMVideoFadeInOut::~ADMVideoFadeInOut()
+{
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoFadeInOut::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, fadeInOut_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoFadeInOut::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, fadeInOut_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoFadeInOut::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    FadeInOutProcess_C(image,info.width,info.height,_param);
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeInOut.h Added

@@ -0,0 +1,42 @@
+/***************************************************************************
+                          FadeInOut filter
+    Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "ADM_coreVideoFilter.h"
+
+/**
+    \class ADMVideoFadeInOut
+*/
+class  ADMVideoFadeInOut:public ADM_coreVideoFilter
+{
+  protected:
+    void                  update(void);
+    fadeInOut             _param;
+    
+
+  public:
+    ADMVideoFadeInOut(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoFadeInOut();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface
+
+    static void FadeInOutProcess_C(ADMImage *img, int w, int h, fadeInOut param);
+    static bool FadeDirIsIn();
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/ADM_vidFadeOut.cpp Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+                          FadeInOut filter
+    Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#define FADEOUT
+#include "ADM_vidFadeInOut.cpp"
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFadeInOut,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSITION,            // Category
+                                      "fadeOut",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("fadeInOut","Fade out"),            // Display name
+                                      QT_TRANSLATE_NOOP("fadeInOut","Fade out to color.") // Description
+                                  );
+
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/cli/DIA_fadeInOut.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/fadeInOut_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/DIA_flyFadeInOut.cpp Added

@@ -0,0 +1,42 @@
+/**/
+/***************************************************************************
+                          DIA_flyFadeInOut
+                             -------------------
+
+			   Ui for FadeInOut
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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_image.h"
+#include "DIA_flyFadeInOut.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyFadeInOut::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyFadeInOut::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoFadeInOut::FadeInOutProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),param);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/DIA_flyFadeInOut.h Added

@@ -0,0 +1,36 @@
+/***************************************************************************
+  \fn     DIA_flyFadeInOut
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for fadeInOut
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 DIA_FLYFadeInOut_H
+#define DIA_FLYFadeInOut_H
+#include "fadeInOut.h"
+#include "ADM_vidFadeInOut.h"
+#include "DIA_flyDialogQt4.h"
+/**
+    \class flyFadeInOut
+*/
+class flyFadeInOut : public ADM_flyDialogYuv
+{
+  public:
+    fadeInOut  param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyFadeInOut (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.cpp Added

@@ -0,0 +1,287 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include <QPalette>
+#include <QColorDialog>
+#include "ADM_default.h"
+#include "Q_fadeInOut.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidFadeInOut.h"
+#include "DIA_factory.h"
+#include "ADM_vidMisc.h"
+#include <cmath>
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_fadeInOutWindow::Ui_fadeInOutWindow(QWidget *parent, fadeInOut *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        if (ADMVideoFadeInOut::FadeDirIsIn())
+            this->setWindowTitle(QString(QT_TRANSLATE_NOOP("fadeInOut","Fade in")));
+        else
+            this->setWindowTitle(QString(QT_TRANSLATE_NOOP("fadeInOut","Fade out")));
+            
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+        markerA = in->getInfo()->markerA;
+        markerB = in->getInfo()->markerB;
+        duration = in->getInfo()->totalDuration;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyFadeInOut( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(fadeInOut));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        
+        connect(ui.pushButtonTManual,SIGNAL(clicked(bool)),this,SLOT(manualTimeEntry(bool)));
+        connect(ui.pushButtonTMarker,SIGNAL(clicked(bool)),this,SLOT(timesFromMarkers(bool)));
+        
+        connect(ui.pushButtonColor,SIGNAL(released()),this,SLOT(pushedColor()));
+
+        QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+        setModal(true);
+}
+
+void Ui_fadeInOutWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+
+void Ui_fadeInOutWindow::manualTimeEntry(bool f)
+{
+    uint32_t mx=(uint32_t)(duration/1000LL);
+
+    diaElemTimeStamp start(&(myFly->param.startTime),QT_TRANSLATE_NOOP("fadeInOut","_Start time:"),0,mx);
+    diaElemTimeStamp end(&(myFly->param.endTime),QT_TRANSLATE_NOOP("fadeInOut","_End time:"),0,mx);
+    diaElem *elems[2]={&start,&end};
+
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("fadeInOut","Manual time entry"),2+0*1,elems))
+    {
+        if(myFly->param.startTime > myFly->param.endTime)
+        {
+            uint32_t tmp=myFly->param.startTime;
+            myFly->param.startTime=myFly->param.endTime;
+            myFly->param.endTime=tmp;
+        }
+        if(lock) return;
+        lock++;
+        myFly->download();
+        myFly->sameImage();
+        lock--;
+    }
+}
+
+void Ui_fadeInOutWindow::timesFromMarkers(bool f)
+{
+    myFly->param.startTime = markerA / 1000LL;
+    myFly->param.endTime = markerB / 1000LL;
+    if(myFly->param.startTime > myFly->param.endTime)
+    {
+        uint32_t tmp=myFly->param.startTime;
+        myFly->param.startTime=myFly->param.endTime;
+        myFly->param.endTime=tmp;
+    }
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_fadeInOutWindow::gather(fadeInOut *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(fadeInOut));
+}
+Ui_fadeInOutWindow::~Ui_fadeInOutWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL;
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+
+void Ui_fadeInOutWindow::pushedColor()
+{
+    QPalette indctrPalette(ui.lineEditColor->palette());
+    QColor startColor = indctrPalette.color(QPalette::Window);
+    QColor color = QColorDialog::getColor(startColor, this );
+    if( color.isValid() )
+    {
+        int rgb[3];
+        color.getRgb(rgb+0,rgb+1,rgb+2, NULL);
+        myFly->param.rgbColor = (rgb[0] << 16) + (rgb[1] << 8) + (rgb[2] << 0);
+        indctrPalette.setColor(QPalette::Window,color);
+        indctrPalette.setColor(QPalette::Base,color);
+        indctrPalette.setColor(QPalette::AlternateBase,color);
+        ui.lineEditColor->setPalette(indctrPalette);
+        if(!lock)
+        {
+            lock++;
+            myFly->download();
+            myFly->sameImage();
+            lock--;
+        }
+    }
+}
+
+
+/**
+ * \fn reset
+ */
+void Ui_fadeInOutWindow::reset( bool f )
+{
+    myFly->param.rgbColor = 0;
+    lock++;
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_fadeInOutWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_fadeInOutWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+    
+    QFontMetrics fm = ui.labelTScope->fontMetrics();
+    QString text = QString(QT_TRANSLATE_NOOP("fadeInOut","Time scope: "));
+    text += QString("000:00:00,000 - 000:00:00,000");
+    ui.labelTScope->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    text = QString(QT_TRANSLATE_NOOP("fadeInOut","Duration: "));
+    text += QString("000:00:00,000---");
+    ui.labelDuration->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
+//************************
+uint8_t flyFadeInOut::upload()
+{
+    Ui_fadeInOutDialog *w=(Ui_fadeInOutDialog *)_cookie;
+    int rgb[3];
+    rgb[0] = (param.rgbColor>>16)&0xFF;
+    rgb[1] = (param.rgbColor>>8)&0xFF;
+    rgb[2] = (param.rgbColor>>0)&0xFF;
+    
+    QLineEdit * indctr = w->lineEditColor;
+    QPalette indctrPalette(indctr->palette());
+    QColor color;
+    color.setRgb(rgb[0],rgb[1],rgb[2],255);
+    indctrPalette.setColor(QPalette::Window,color);
+    indctrPalette.setColor(QPalette::Base,color);
+    indctrPalette.setColor(QPalette::AlternateBase,color);
+    indctr->setPalette(indctrPalette);
+
+    QString tstr = QString(QT_TRANSLATE_NOOP("fadeInOut","Time scope: "));
+    tstr += QString(ADM_us2plain(param.startTime*1000LL));
+    tstr += QString(" - ");
+    tstr += QString(ADM_us2plain(param.endTime*1000LL));
+    w->labelTScope->setText(tstr);
+    
+    tstr = QString(QT_TRANSLATE_NOOP("fadeInOut","Duration: "));
+    tstr += QString(ADM_us2plain((param.endTime - param.startTime)*1000LL));
+    w->labelDuration->setText(tstr);
+
+    return 1;
+}
+uint8_t flyFadeInOut::download(void)
+{
+    //Ui_fadeInOutDialog *w=(Ui_fadeInOutDialog *)_cookie;
+    upload();
+    return 1;
+}
+void flyFadeInOut::setTabOrder(void)
+{
+    Ui_fadeInOutDialog *w=(Ui_fadeInOutDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+#define PUSHCOMBOX(x) controls.push_back(MYCOMBOX(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+    controls.push_back(w->pushButtonTManual);
+    controls.push_back(w->pushButtonTMarker);
+    controls.push_back(w->pushButtonColor);
+
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getFadeInOut(fadeInOut *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_fadeInOutWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/Q_fadeInOut.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/color.png Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.qrc Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeInOut/qt4/fadeInOut.ui Added

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>fadeInOutDialog</class>
+ <widget class="QDialog" name="fadeInOutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>451</width>
+    <height>299</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Fade in/out</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="labelTScope">
+       <property name="text">
+        <string>Time scope: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelDuration">
+       <property name="text">
+        <string>Duration: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTManual">
+       <property name="text">
+        <string>Manual time entry</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTMarker">
+       <property name="text">
+        <string>Set from A-B markers</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="labelPick">
+       <property name="text">
+        <string>Pick color:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonColor">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="fadeInOut.qrc">
+         <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEditColor">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="fadeInOut.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>fadeInOutDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>fadeInOutDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeIn.cpp Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+                          FadeThrough filter
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
+#define FADEIN
+
+#include "ADM_vidFadeThrough.cpp" 
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFadeThrough,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSITION,            // Category
+                                      "fadeIn",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("fadeThrough","Fade in"),            // Display name
+                                      QT_TRANSLATE_NOOP("fadeThrough","Fade in from combination of multiple effects.") // Description
+                                  );
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeOut.cpp Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+                          FadeThrough filter
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
+#define FADEOUT
+
+#include "ADM_vidFadeThrough.cpp" 
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFadeThrough,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSITION,            // Category
+                                      "fadeOut",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("fadeThrough","Fade out"),            // Display name
+                                      QT_TRANSLATE_NOOP("fadeThrough","Fade out to combination of multiple effects.") // Description
+                                  );
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vfFadeThrough.cpp Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+                          FadeThrough filter
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
+#define FADETHROUGH
+
+#include "ADM_vidFadeThrough.cpp" 
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFadeThrough,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSITION,            // Category
+                                      "fadeThrough",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("fadeThrough","Fade through"),            // Display name
+                                      QT_TRANSLATE_NOOP("fadeThrough","Fade through combination of multiple effects.") // Description
+                                  );
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vidFadeThrough.cpp Added

@@ -0,0 +1,1157 @@
+/***************************************************************************
+                          FadeThrough filter
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "ADM_vidMisc.h"
+#include "fadeThrough.h"
+#include "fadeThrough_desc.cpp"
+#include "ADM_vidFadeThrough.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+
+
+#if defined(FADETHROUGH) + defined(FADEIN) + defined(FADEOUT) != 1
+#error FADE DIRECTION NOT DEFINED!
+#endif
+
+extern uint8_t DIA_getFadeThrough(fadeThrough *param, ADM_coreVideoFilter *in);
+
+/**
+    \fn FadeThroughCreateBuffers
+*/
+void ADMVideoFadeThrough::FadeThroughCreateBuffers(int w, int h, fadeThrough_buffers_t * buffers)
+{
+    for (int i=0; i<3; i++)
+        buffers->lut[i] = new uint8_t [256];
+    
+    buffers->blendRGBcached = ~0;
+    buffers->vignetteRGBcached = ~0;
+    
+    buffers->rgbBufStride = ADM_IMAGE_ALIGN(w * 4);
+    buffers->rgbBufRaw = new ADM_byteBuffer();
+    if (buffers->rgbBufRaw)
+        buffers->rgbBufRaw->setSize(buffers->rgbBufStride * h);
+    buffers->convertYuvToRgb = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_YV12,ADM_PIXFRMT_RGB32A);
+    buffers->convertRgbToYuv = new ADMColorScalerFull(ADM_CS_BICUBIC,w,h,w,h,ADM_PIXFRMT_RGB32A,ADM_PIXFRMT_YV12);
+    buffers->rgbBufImage = new ADMImageRef(w,h);
+    if (buffers->rgbBufImage)
+    {
+        buffers->rgbBufImage->_pixfrmt = ADM_PIXFRMT_RGB32A;
+        buffers->rgbBufImage->_planes[0] = buffers->rgbBufRaw->at(0);
+        buffers->rgbBufImage->_planes[1] = buffers->rgbBufImage->_planes[2] = NULL;
+        buffers->rgbBufImage->_planeStride[0] = buffers->rgbBufStride;
+        buffers->rgbBufImage->_planeStride[1] = buffers->rgbBufImage->_planeStride[2] = 0;
+    }
+    buffers->blurStack = new uint32_t [512];
+
+    buffers->imgCopy = new ADMImageDefault(w,h);
+    
+    buffers->bicubicWeights = new int [257*4];
+    for (int i=0; i<=256; i++)
+    {
+        float tmp;
+        tmp = 1.0 + i/256.0;    buffers->bicubicWeights[i*4+0] = ((-0.75*(tmp-5.0)*tmp-6.0)*tmp+3.0)*256.0 + 0.5;
+        tmp = tmp - 1.0;        buffers->bicubicWeights[i*4+1] = ((1.25*tmp-2.25)*tmp*tmp+1.0)*256.0 + 0.5;
+        tmp = 1.0 - tmp;        buffers->bicubicWeights[i*4+2] = ((1.25*tmp-2.25)*tmp*tmp+1.0)*256.0 + 0.5;
+                                buffers->bicubicWeights[i*4+3] = 256 - buffers->bicubicWeights[i*4+0] - buffers->bicubicWeights[i*4+1] - buffers->bicubicWeights[i*4+2];
+    }
+    
+    buffers->threads = ADM_cpu_num_processors();
+    if (buffers->threads < 1)
+        buffers->threads = 1;
+    if (buffers->threads > 64)
+        buffers->threads = 64;
+    buffers->threadsUV = buffers->threads/4;
+    if (buffers->threadsUV < 1)
+        buffers->threadsUV = 1;
+    buffers->threads -= buffers->threadsUV;
+    if (buffers->threads < 1)
+        buffers->threads = 1;
+
+    buffers->qtr_worker_threads = new pthread_t [buffers->threads + buffers->threadsUV];
+    buffers->qtr_worker_thread_args = new qtr_worker_thread_arg [buffers->threads + buffers->threadsUV];
+    
+}
+/**
+    \fn FadeThroughDestroyBuffers
+*/
+void ADMVideoFadeThrough::FadeThroughDestroyBuffers(fadeThrough_buffers_t * buffers)
+{
+    for (int i=0; i<3; i++)
+        delete [] buffers->lut[i];
+
+    if (buffers->convertYuvToRgb) delete buffers->convertYuvToRgb;
+    if (buffers->convertRgbToYuv) delete buffers->convertRgbToYuv;
+    if (buffers->rgbBufRaw) buffers->rgbBufRaw->clean();
+    if (buffers->rgbBufImage) delete buffers->rgbBufImage;
+    if (buffers->rgbBufRaw) delete buffers->rgbBufRaw;
+    delete [] buffers->blurStack;
+
+    delete buffers->imgCopy;
+    delete [] buffers->bicubicWeights;
+    delete [] buffers->qtr_worker_threads;
+    delete [] buffers->qtr_worker_thread_args;
+}
+
+
+/**
+    \fn bilinear
+*/
+inline void ADMVideoFadeThrough::bilinear(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, uint8_t * out)
+{
+    int i,a,b,k,l,k1,l1;
+    
+    k  = y*stride+x;
+    k1 = k  + 1;
+    l  = k  + stride;
+    l1 = k1 + stride;
+    
+    a=in[k]*256+(in[k1]-in[k])*fx;
+    b=in[l]*256+(in[l1]-in[l])*fx;
+    out[0]=(a*256+(b-a)*fy)/65536;
+}
+
+/**
+    \fn bicubic
+*/
+inline void ADMVideoFadeThrough::bicubic(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, int * weights, uint8_t * out)
+{
+    int m = x-1;
+    int n = y-1;
+    if (m < 0)
+        m = 0;
+    if (n < 0)
+        n = 0;
+    if (m+5 > w)
+        m = w-4;
+    if (n+5 > h)
+        n = h-4;
+
+    int * wx, * wy;
+    wx = weights + fx*4;
+    wy = weights + fy*4;
+    
+    int b,i,k,l, p, pp;
+    k = n*stride + m;
+
+    l = k;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp = wy[0]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[1]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[2]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[3]*p;
+    
+    pp /= 65536;
+    if (pp < 0)
+        pp = 0;
+    if (pp > 255)
+        pp = 255;
+    out[0] = pp;
+}
+
+
+
+/**
+    \fn qtr_worker_thread
+*/
+void * ADMVideoFadeThrough::qtr_worker_thread( void *ptr )
+{
+    qtr_worker_thread_arg * arg = (qtr_worker_thread_arg*)ptr;
+    int w = arg->w;
+    int h = arg->h;
+    int ystart = arg->ystart;
+    int yincr = arg->yincr;
+    int algo = arg->algo;
+    double * xs = arg->xs;
+    double * ys = arg->ys;
+    int stride = arg->stride;
+    uint8_t * in = arg->in;
+    uint8_t * in2 = arg->in2;
+    uint8_t * out = arg->out;
+    uint8_t * out2 = arg->out2;
+    int * bicubicWeights = arg->bicubicWeights;
+    uint8_t blackLevel = arg->blackLevel;
+    
+    {
+        double a,b,c,d,e,f,g,j,a2,b2,c2,u,v,aa,bb,de,sde,v1,v2,u1,u2;
+        de=0.0;v1=1000.0;v2=1000.0;
+        for (int y=ystart; y<h; y+=yincr)
+        {
+            for (int x=0; x<w; x++)
+            {
+                a=xs[0]-x;
+                b=xs[1]-xs[0];
+                c=xs[2]-xs[0];
+                d=xs[3]-xs[1]-(xs[2]-xs[0]);
+                
+                e=ys[0]-y;
+                f=ys[1]-ys[0];
+                g=ys[2]-ys[0];
+                j=ys[3]-ys[1]-(ys[2]-ys[0]);
+                
+                a2=g*d-j*c; b2=e*d-f*c-j*a+g*b; c2=e*b-f*a;
+                
+                if ((fabs(a2*c2*c2/(b2*b2*b2))< 0.1/w) && (fabs(a2)<1.0))
+                {
+                    v1 = (b2!=0.0) ? -c2/b2 : 1000.0;
+                    v2=1000.0;
+                }
+                else
+                {
+                    de=b2*b2-4.0*a2*c2;
+                    if (de>=0.0)
+                    {
+                        sde=sqrt(de);
+                        v1=(-b2+sde)/2.0/a2;
+                        v2=(-b2-sde)/2.0/a2;
+                    }
+                    else
+                    {
+                        v1=1001.0;
+                        v2=1001.0;
+                    }
+                }
+                aa=b+d*v1; bb=f+j*v1;
+                if (fabs(aa)>fabs(bb))
+                    u1 = (aa!=0.0) ? -(a+c*v1)/aa : 1000.0;
+                else
+                    u1 = (bb!=0.0) ? -(e+g*v1)/bb : 1000.0;
+                aa=b+d*v2; bb=f+j*v2;
+                if (fabs(aa)>fabs(bb))
+                    u2 = (aa!=0.0) ? -(a+c*v2)/aa : 1000.0;
+                else
+                    u2 = (bb!=0.0) ? -(e+g*v2)/bb : 1000.0;
+                
+                if ((u1>=0.0)&&(u1<1.0)&&(v1>=0.0)&&(v1<1.0))
+                {
+                    u=u1;
+                    v=v1;
+                }
+                else
+                {
+                    if ((u2>=0.0)&&(u2<1.0)&&(v2>=0.0)&&(v2<1.0))
+                    {
+                        u=u2;
+                        v=v2;
+                    }
+                    else
+                    {
+                        u=1002.0;
+                        v=1002.0;
+                    }
+                }
+                
+                
+                if ((u>=0.0)&&(u<1.0)&&(v>=0.0)&&(v<1.0))
+                {
+                    u *= w;
+                    v *= h;
+                    int ui = std::floor(u);
+                    int vi = std::floor(v);
+                    int uf = (u-std::floor(u))*256.0 + 0.5;
+                    int vf = (v-std::floor(v))*256.0 + 0.5;
+                    if (uf > 255)
+                    {
+                        ui++;
+                        uf = 0;
+                    }
+                    if (vf > 255)
+                    {
+                        vi++;
+                        vf = 0;
+                    }
+                    if (ui >= w-1)
+                    {
+                        ui = w-2;
+                        uf = 255;
+                    }
+                    if (vi >= h-1)
+                    {
+                        vi = h-2;
+                        vf = 255;
+                    }
+
+                    switch(algo) {
+                        default:
+                        case 0:
+                                bilinear(w, h, stride, in, ui, vi, uf, vf, out + x + y*stride);
+                                if (in2 && out2)
+                                    bilinear(w, h, stride, in2, ui, vi, uf, vf, out2 + x + y*stride);
+                            break;
+                        case 1:
+                                bicubic(w, h, stride, in, ui, vi, uf, vf, bicubicWeights, out + x + y*stride);
+                                if (in2 && out2)
+                                    bicubic(w, h, stride, in2, ui, vi, uf, vf, bicubicWeights, out2 + x + y*stride);
+                            break;
+                    }
+
+                }
+                else
+                {
+                    out[x + y*stride] =  blackLevel;
+                    if (in2 && out2)
+                        out2[x + y*stride] =  blackLevel;
+                }
+            
+            }
+        }
+        
+    }
+    
+    pthread_exit(NULL);
+    return NULL;
+}
+
+/**
+    \fn FadeThroughProcess_C
+*/
+void ADMVideoFadeThrough::FadeThroughProcess_C(ADMImage *img, int w, int h, uint64_t absoluteStartPts, fadeThrough param, fadeThrough_buffers_t * buffers)
+{
+    if (!img || !buffers || !buffers->imgCopy) return;
+    if (!buffers->bicubicWeights || !buffers->qtr_worker_threads || !buffers->qtr_worker_thread_args) return;
+    if (!buffers->rgbBufRaw || !buffers->rgbBufImage || !buffers->convertYuvToRgb || !buffers->convertRgbToYuv || !buffers->blurStack) return;
+
+    uint32_t startMs = param.startTime;
+    uint32_t endMs = param.endTime;
+
+    if (startMs > endMs)
+    {
+        uint64_t tmp = endMs;
+        endMs = startMs;
+        startMs = tmp;
+    }
+    
+    uint32_t imgMs = (img->Pts+absoluteStartPts)/1000LL;
+    
+    if (startMs == endMs)
+        return;
+    if (imgMs < startMs)
+        return;
+    if (imgMs >= endMs)
+        return;
+
+    double frac = ((double)(imgMs - startMs)) / ((double)(endMs - startMs));
+
+
+    if (param.enableBright || param.enableSat || param.enableBlend)
+    {
+        for (int i=0; i<3; i++)
+            for (int j=0; j<256; j++)
+                buffers->lut[i][j] = j;
+    }
+
+    if (param.enableBright)
+    {
+        double level = TransientPoint(frac, param.transientBright, param.transientDurationBright);
+        level *= (param.peakBright-1.0);	// -1 .. +1
+        if(img->_range == ADM_COL_RANGE_MPEG)
+            level *= 220.0;	// +-220
+        else
+            level *= 255.0;	// +-255
+        
+        int px;
+        int intLevel = level + 0.49;
+        for (int j=0; j<256; j++)
+        {
+            px = buffers->lut[0][j];
+            px += intLevel;
+            if(img->_range == ADM_COL_RANGE_MPEG)
+            {
+                if (px < 16) px = 16;
+                if (px > 235) px = 235;
+            } else {
+                if (px < 0) px = 0;
+                if (px > 255) px = 255;
+            }
+            buffers->lut[0][j] = px;
+        }
+    }
+
+    if (param.enableSat)
+    {
+        double level = TransientPoint(frac, param.transientSat, param.transientDurationSat);
+        level *= (param.peakSat-1.0);
+        level += 1;	// 0..2
+        int satMul = level * 65536.0 + 0.49;
+        int px;
+        for (int i=1; i<3; i++)
+        {
+            for (int j=0; j<256; j++)
+            {
+                px = buffers->lut[i][j];
+                px -= 128;
+                px *= satMul;
+                px /= 65536;
+                px += 128;
+                if(img->_range == ADM_COL_RANGE_MPEG)
+                {
+                    if (px < 16) px = 16;
+                    if (px > 240) px = 240;
+                } else {
+                    if (px < 0) px = 0;
+                    if (px > 255) px = 255;
+                }
+                buffers->lut[i][j] = px;
+            }
+        }
+    }
+    
+    if (param.enableBlend)
+    {
+        double level = TransientPoint(frac, param.transientBlend, param.transientDurationBlend);
+        level *= param.peakBlend;
+
+        if ((buffers->blendRGBcached != (param.rgbColorBlend & 0x00FFFFFF)) || ((img->_range == ADM_COL_RANGE_MPEG) ^ buffers->blendRangeCached))
+        {
+            // rgb to yuv:
+            int rgb[3], yuv[3];
+            rgb[0] = (param.rgbColorBlend>>16)&0xFF;
+            rgb[1] = (param.rgbColorBlend>>8)&0xFF;
+            rgb[2] = (param.rgbColorBlend>>0)&0xFF;
+            if(img->_range == ADM_COL_RANGE_MPEG)
+            {
+                yuv[0] = std::round( 0.257*rgb[0] + 0.504*rgb[1] + 0.098*rgb[2]) + 16;
+                yuv[1] = std::round(-0.148*rgb[0] - 0.291*rgb[1] + 0.439*rgb[2]) + 128;
+                yuv[2] = std::round( 0.439*rgb[0] - 0.368*rgb[1] - 0.071*rgb[2]) + 128;
+                for (int i=0; i<3; i++)
+                    if (yuv[i] <   16) yuv[i] = 16;
+                if (yuv[0] > 235) yuv[0] = 235;
+                if (yuv[1] > 240) yuv[1] = 240;
+                if (yuv[2] > 240) yuv[2] = 240;
+            } else {
+                yuv[0] = std::round( 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]);
+                yuv[1] = std::round(-0.169*rgb[0] - 0.331*rgb[1] + 0.500*rgb[2]) + 128;
+                yuv[2] = std::round( 0.500*rgb[0] - 0.419*rgb[1] - 0.081*rgb[2]) + 128;
+                for (int i=0; i<3; i++)
+                {
+                    if (yuv[i] <   0) yuv[i] = 0;
+                    if (yuv[i] > 255) yuv[i] = 255;
+                }
+            }
+            
+            // fix swapped uv
+            int uvswap = yuv[1]; yuv[1] = yuv[2]; yuv[2]=uvswap;
+            
+            buffers->blendRGBcached = param.rgbColorBlend & 0x00FFFFFF;
+            buffers->blendRangeCached = (img->_range == ADM_COL_RANGE_MPEG);
+            for (int i=0; i<3; i++)
+                buffers->blendYUVcached[i] = yuv[i];
+        }
+        
+        int imgblend = (1.0-level)*256.0 + 0.49;
+        int px;
+        for (int i=0; i<3; i++)
+        {
+            int yuvi = buffers->blendYUVcached[i]*level*256.0 + 0.49;
+            for (int j=0; j<256; j++)
+            {
+                px = imgblend*buffers->lut[i][j] + yuvi;
+                buffers->lut[i][j] = px / 256;
+            }
+        }
+    }
+    
+    if (param.enableBright || param.enableSat || param.enableBlend)    // apply lut
+    {
+        uint8_t * imgPlanes[3];
+        int imgStrides[3];
+
+        img->GetWritePlanes(imgPlanes);
+        img->GetPitches(imgStrides);
+
+        for (int p=0; p<3; p++)
+        {
+            int width = ((p==0) ? w:(w/2));
+            int height = ((p==0) ? h:(h/2));
+            int px;
+            uint8_t * ipl = imgPlanes[p];
+            for (int y=0; y<height; y++)
+            {
+                for (int x=0; x<width; x++)
+                {
+                    ipl[x] = buffers->lut[p][ipl[x]];
+                }
+                ipl += imgStrides[p];
+            }
+        }
+    }
+
+    if (param.enableBlur)
+    {
+        double level = TransientPoint(frac, param.transientBlur, param.transientDurationBlur);
+
+        unsigned int radius = level*param.peakBlur;
+        if (radius > 254) radius = 254;
+        if (radius >= 1)
+        {
+            buffers->convertYuvToRgb->convertImage(img,buffers->rgbBufRaw->at(0));
+
+            int x, y;
+            uint8_t * rgbPtr = buffers->rgbBufRaw->at(0);
+            for(y = 0; y < h; y++)
+            {
+                StackBlurLine_C((rgbPtr + y*buffers->rgbBufStride), w, 4, buffers->blurStack, radius);
+            };
+
+            for(x = 0; x < w; x++)
+            {
+                StackBlurLine_C((rgbPtr + x*4), h, buffers->rgbBufStride, buffers->blurStack, radius);
+            };
+
+            buffers->convertRgbToYuv->convertImage(buffers->rgbBufImage,img);
+        }
+    }
+
+
+    if (param.enableRot || param.enableZoom)
+    {
+        double rot_level = TransientPoint(frac, param.transientRot, param.transientDurationRot);
+        double zoom_level = TransientPoint(frac, param.transientZoom, param.transientDurationZoom);
+        rot_level *= param.peakRot;
+        rot_level *= M_PI/180.0;
+        param.peakZoom -= 1;
+        zoom_level *= param.peakZoom;
+        if (!param.enableRot)
+            rot_level = 0.0;
+        if (!param.enableZoom)
+            zoom_level = 0.0;
+        zoom_level += 1;
+
+        double xs[4],ys[4];
+        xs[0] = 0;
+        ys[0] = 0;
+        xs[1] = w-1;
+        ys[1] = 0;
+        xs[2] = 0;
+        ys[2] = h-1;
+        xs[3] = w-1;
+        ys[3] = h-1;
+        
+        double midx, midy;
+        midx = w-1;
+        midx /= 2.0;
+        midy = h-1;
+        midy /= 2.0;
+        
+        double newx,newy;
+        for (int i=0; i<4; i++)
+        {
+            xs[i] -= midx;
+            ys[i] -= midy;
+            newx = std::cos(rot_level)*xs[i] - std::sin(rot_level)*ys[i];
+            newy = std::sin(rot_level)*xs[i] + std::cos(rot_level)*ys[i];
+            newx *= zoom_level;
+            newy *= zoom_level;
+            newx += midx;
+            newy += midy;
+            xs[i] = newx;
+            ys[i] = newy;
+        }
+
+        double xsh[4],ysh[4];
+        for (int i=0; i<4; i++)
+        {
+            xsh[i] = xs[i]/2.0;
+            ysh[i] = ys[i]/2.0;
+        }
+
+        uint8_t * rplanes[3];
+        uint8_t * wplanes[3];
+        int strides[3];
+
+        buffers->imgCopy->duplicate(img);
+        buffers->imgCopy->GetPitches(strides);
+        buffers->imgCopy->GetWritePlanes(rplanes);
+        img->GetWritePlanes(wplanes);
+    
+        int totaltr = 0;
+    
+        for (int tr=0; tr<buffers->threads; tr++)
+        {
+            buffers->qtr_worker_thread_args[totaltr].w = w;
+            buffers->qtr_worker_thread_args[totaltr].h = h;
+            buffers->qtr_worker_thread_args[totaltr].ystart = tr;
+            buffers->qtr_worker_thread_args[totaltr].yincr = buffers->threads;
+            buffers->qtr_worker_thread_args[totaltr].algo = 1;
+            buffers->qtr_worker_thread_args[totaltr].xs = xs;
+            buffers->qtr_worker_thread_args[totaltr].ys = ys;
+            buffers->qtr_worker_thread_args[totaltr].blackLevel = 0;
+            buffers->qtr_worker_thread_args[totaltr].stride = strides[0];
+            buffers->qtr_worker_thread_args[totaltr].in = rplanes[0];
+            buffers->qtr_worker_thread_args[totaltr].in2 = NULL;
+            buffers->qtr_worker_thread_args[totaltr].out = wplanes[0];
+            buffers->qtr_worker_thread_args[totaltr].out2 = NULL;
+            buffers->qtr_worker_thread_args[totaltr].bicubicWeights = buffers->bicubicWeights;
+            totaltr++;
+        }
+
+        for (int tr=0; tr<buffers->threadsUV; tr++)
+        {
+            buffers->qtr_worker_thread_args[totaltr].w = w/2;
+            buffers->qtr_worker_thread_args[totaltr].h = h/2;
+            buffers->qtr_worker_thread_args[totaltr].ystart = tr;
+            buffers->qtr_worker_thread_args[totaltr].yincr = buffers->threadsUV;
+            buffers->qtr_worker_thread_args[totaltr].algo = 1;
+            buffers->qtr_worker_thread_args[totaltr].xs = xsh;
+            buffers->qtr_worker_thread_args[totaltr].ys = ysh;
+            buffers->qtr_worker_thread_args[totaltr].blackLevel = 128;
+            buffers->qtr_worker_thread_args[totaltr].stride = strides[1];
+            buffers->qtr_worker_thread_args[totaltr].in = rplanes[1];
+            buffers->qtr_worker_thread_args[totaltr].in2 = rplanes[2];
+            buffers->qtr_worker_thread_args[totaltr].out = wplanes[1];
+            buffers->qtr_worker_thread_args[totaltr].out2 = wplanes[2];
+            buffers->qtr_worker_thread_args[totaltr].bicubicWeights = buffers->bicubicWeights;
+            totaltr++;
+        }
+
+        for (int tr=0; tr<totaltr; tr++)
+        {
+            pthread_create( &buffers->qtr_worker_threads[tr], NULL, qtr_worker_thread, (void*) &buffers->qtr_worker_thread_args[tr]);
+        }
+        // work in thread workers...
+        for (int tr=0; tr<totaltr; tr++)
+        {
+            pthread_join( buffers->qtr_worker_threads[tr], NULL);
+        }
+
+    }
+
+
+    if (param.enableVignette)
+    {
+        double level = TransientPoint(frac, param.transientVignette, param.transientDurationVignette);
+
+        if ((buffers->vignetteRGBcached != (param.rgbColorVignette & 0x00FFFFFF)) || ((img->_range == ADM_COL_RANGE_MPEG) ^ buffers->vignetteRangeCached))
+        {
+            // rgb to yuv:
+            int rgb[3], yuv[3];
+            rgb[0] = (param.rgbColorVignette>>16)&0xFF;
+            rgb[1] = (param.rgbColorVignette>>8)&0xFF;
+            rgb[2] = (param.rgbColorVignette>>0)&0xFF;
+            if(img->_range == ADM_COL_RANGE_MPEG)
+            {
+                yuv[0] = std::round( 0.257*rgb[0] + 0.504*rgb[1] + 0.098*rgb[2]) + 16;
+                yuv[1] = std::round(-0.148*rgb[0] - 0.291*rgb[1] + 0.439*rgb[2]) + 128;
+                yuv[2] = std::round( 0.439*rgb[0] - 0.368*rgb[1] - 0.071*rgb[2]) + 128;
+                for (int i=0; i<3; i++)
+                    if (yuv[i] <   16) yuv[i] = 16;
+                if (yuv[0] > 235) yuv[0] = 235;
+                if (yuv[1] > 240) yuv[1] = 240;
+                if (yuv[2] > 240) yuv[2] = 240;
+            } else {
+                yuv[0] = std::round( 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]);
+                yuv[1] = std::round(-0.169*rgb[0] - 0.331*rgb[1] + 0.500*rgb[2]) + 128;
+                yuv[2] = std::round( 0.500*rgb[0] - 0.419*rgb[1] - 0.081*rgb[2]) + 128;
+                for (int i=0; i<3; i++)
+                {
+                    if (yuv[i] <   0) yuv[i] = 0;
+                    if (yuv[i] > 255) yuv[i] = 255;
+                }
+            }
+            
+            // fix swapped uv
+            int uvswap = yuv[1]; yuv[1] = yuv[2]; yuv[2]=uvswap;
+
+            buffers->vignetteRGBcached = param.rgbColorVignette & 0x00FFFFFF;
+            buffers->vignetteRangeCached = (img->_range == ADM_COL_RANGE_MPEG);
+            for (int i=0; i<3; i++)
+                buffers->vignetteYUVcached[i] = yuv[i];
+        }
+            
+        uint8_t * imgPlanes[3];
+        int imgStrides[3];
+
+        img->GetWritePlanes(imgPlanes);
+        img->GetPitches(imgStrides);
+
+        int imgblend,yuvblend;
+        for (int p=0; p<3; p++)
+        {
+            int width = ((p==0) ? w:(w/2));
+            int height = ((p==0) ? h:(h/2));
+            int px;
+            uint8_t * ipl = imgPlanes[p];
+            
+            double corner = ((double)(width/2))*(width/2) + ((double)(height/2))*(height/2);
+            double vec;
+            
+            corner *= param.peakVignette+(1.0-level);
+            
+            for (int y=0; y<height; y++)
+            {
+                for (int x=0; x<width; x++)
+                {
+                    vec = ((double)(x-width/2))*(x-width/2) + ((double)(y-height/2))*(y-height/2);
+                    if (vec > corner)
+                    {
+                        imgblend = 0;
+                        yuvblend = 256;
+                    } else
+                    if ((corner - vec) > 256.0*256.0)
+                    {
+                        imgblend = 256;
+                        yuvblend = 0;
+                    } else
+                    {
+                        imgblend = std::sqrt(corner - vec);
+                        yuvblend = 256-imgblend;
+                    }
+                    
+                    px = imgblend*ipl[x] + yuvblend*buffers->vignetteYUVcached[p];
+                    ipl[x] = px / 256;
+                }
+                ipl += imgStrides[p];
+            }
+        }
+        
+    }
+}
+
+/**
+    \fn TransientPoint
+*/
+double ADMVideoFadeThrough::TransientPoint(double frac, int transient, double duration)
+{
+    if (duration == 0.0)
+        return 1.0;
+
+#if defined(FADETHROUGH)
+    if ((frac > duration) && (frac < (1.0-duration)))
+        return 1.0;
+    
+    if (frac >= 0.5)
+        frac = 1.0-frac;
+#endif
+
+#if defined(FADEIN) || defined(FADEOUT)
+  #if defined(FADEIN)
+    frac = 1.0 - frac;
+  #endif
+    if (frac > duration)
+        return 1.0;
+#endif
+
+    frac /= duration;
+    
+    switch (transient)
+    {
+        case 0:		// raised cosine
+            return (1.0 - (std::cos(M_PI*(frac))/2.0 + 0.5));
+        case 1:		// ramp
+            return frac;
+        case 2:		// quadratic
+            return (frac*frac);
+        case 3:		// inverse quadratic
+            return std::sqrt(frac);
+        case 4:		// exponential
+            #define EXP_OFFSET	(4.0)
+            return ((std::exp(frac*EXP_OFFSET)-1.0)/(std::exp(EXP_OFFSET)-1.0));
+        default:
+            return 1.0;
+    
+    }
+}
+
+
+static const uint16_t g_stack_blur8_mul[255] = 
+    {
+        512,512,456,512,328,456,335,512,405,328,271,456,388,335,292,512,
+        454,405,364,328,298,271,496,456,420,388,360,335,312,292,273,512,
+        482,454,428,405,383,364,345,328,312,298,284,271,259,496,475,456,
+        437,420,404,388,374,360,347,335,323,312,302,292,282,273,265,512,
+        497,482,468,454,441,428,417,405,394,383,373,364,354,345,337,328,
+        320,312,305,298,291,284,278,271,265,259,507,496,485,475,465,456,
+        446,437,428,420,412,404,396,388,381,374,367,360,354,347,341,335,
+        329,323,318,312,307,302,297,292,287,282,278,273,269,265,261,512,
+        505,497,489,482,475,468,461,454,447,441,435,428,422,417,411,405,
+        399,394,389,383,378,373,368,364,359,354,350,345,341,337,332,328,
+        324,320,316,312,309,305,301,298,294,291,287,284,281,278,274,271,
+        268,265,262,259,257,507,501,496,491,485,480,475,470,465,460,456,
+        451,446,442,437,433,428,424,420,416,412,408,404,400,396,392,388,
+        385,381,377,374,370,367,363,360,357,354,350,347,344,341,338,335,
+        332,329,326,323,320,318,315,312,310,307,304,302,299,297,294,292,
+        289,287,285,282,280,278,275,273,271,269,267,265,263,261,259
+    };
+
+static const uint8_t g_stack_blur8_shr[255] = 
+    {
+          9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17, 
+         17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 
+         19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20,
+         20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21,
+         21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+         21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 
+         22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+         22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 
+         23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
+    };
+/**
+    \fn StackBlurLine_C
+*/
+void ADMVideoFadeThrough::StackBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius)
+{
+    uint_fast32_t div;
+    uint_fast32_t mul_sum;
+    uint_fast32_t shr_sum;
+
+    uint_fast32_t l, p, i;
+    uint_fast32_t stack_ptr;
+    uint_fast32_t stack_start;
+
+    const uint8_t * src_pix_ptr;
+          uint8_t * dst_pix_ptr;
+    uint8_t *     stack_pix_ptr;
+
+    uint_fast32_t sum_r = 0;
+    uint_fast32_t sum_g = 0;
+    uint_fast32_t sum_b = 0;
+    uint_fast32_t sum_in_r = 0;
+    uint_fast32_t sum_in_g = 0;
+    uint_fast32_t sum_in_b = 0;
+    uint_fast32_t sum_out_r = 0;
+    uint_fast32_t sum_out_g = 0;
+    uint_fast32_t sum_out_b = 0;
+
+    uint_fast32_t lm  = len - 1;
+
+    if ((radius > 0) && (len > 1))
+    {
+        div = radius * 2 + 1;
+        mul_sum = g_stack_blur8_mul[radius];
+        shr_sum = g_stack_blur8_shr[radius];
+
+        for(i = 0; i <= radius; i++)
+        {
+            if ((radius - i) > lm)
+                src_pix_ptr = line + pixPitch*lm;
+            else
+                src_pix_ptr = line + pixPitch*(radius - i);    // fix flickering at the T/L edges, by reflecting the image backward
+            stack_pix_ptr    = (uint8_t *)&stack[i];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_out_r       += src_pix_ptr[0];
+            sum_r           += src_pix_ptr[0] * (i + 1);
+            sum_out_g       += src_pix_ptr[1];
+            sum_g           += src_pix_ptr[1] * (i + 1);
+            sum_out_b       += src_pix_ptr[2];
+            sum_b           += src_pix_ptr[2] * (i + 1);
+        }
+        src_pix_ptr = line;
+        for(i = 1; i <= radius; i++)
+        {
+            if(i <= lm) src_pix_ptr += pixPitch; 
+            stack_pix_ptr = (uint8_t *)&stack[i + radius];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_in_r        += src_pix_ptr[0];
+            sum_r           += src_pix_ptr[0] * (radius + 1 - i);
+            sum_in_g        += src_pix_ptr[1];
+            sum_g           += src_pix_ptr[1] * (radius + 1 - i);
+            sum_in_b        += src_pix_ptr[2];
+            sum_b           += src_pix_ptr[2] * (radius + 1 - i);
+        }
+
+        stack_ptr = radius;
+        p = radius;
+        if(p > lm) p = lm;
+        src_pix_ptr = line + pixPitch*p;
+        dst_pix_ptr = line;
+        for(l = 0; l < len; l++)
+        {
+            dst_pix_ptr[0] = (sum_r * mul_sum) >> shr_sum;
+            dst_pix_ptr[1] = (sum_g * mul_sum) >> shr_sum;
+            dst_pix_ptr[2] = (sum_b * mul_sum) >> shr_sum;
+            dst_pix_ptr   += pixPitch;
+
+            sum_r -= sum_out_r;
+            sum_g -= sum_out_g;
+            sum_b -= sum_out_b;
+   
+            stack_start = stack_ptr + div - radius;
+            if(stack_start >= div) stack_start -= div;
+            stack_pix_ptr = (uint8_t *)&stack[stack_start];
+
+            sum_out_r -= stack_pix_ptr[0];
+            sum_out_g -= stack_pix_ptr[1];
+            sum_out_b -= stack_pix_ptr[2];
+
+            if(p < lm) 
+                src_pix_ptr += pixPitch;
+            else if(p < lm*2) 
+                src_pix_ptr -= pixPitch;    // fix flickering at the B/R edges, by reflecting the image backward
+            ++p;
+
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+
+            sum_in_r += src_pix_ptr[0];
+            sum_in_g += src_pix_ptr[1];
+            sum_in_b += src_pix_ptr[2];
+            sum_r    += sum_in_r;
+            sum_g    += sum_in_g;
+            sum_b    += sum_in_b;
+
+            ++stack_ptr;
+            if(stack_ptr >= div) stack_ptr = 0;
+            stack_pix_ptr = (uint8_t *)&stack[stack_ptr];
+
+            sum_in_r  -= stack_pix_ptr[0];
+            sum_out_r += stack_pix_ptr[0];
+            sum_in_g  -= stack_pix_ptr[1];
+            sum_out_g += stack_pix_ptr[1];
+            sum_in_b  -= stack_pix_ptr[2];
+            sum_out_b += stack_pix_ptr[2];
+        }
+    }
+}
+
+/**
+    \fn IsFadeIn
+*/
+bool ADMVideoFadeThrough::IsFadeIn()
+{
+#if defined(FADEIN)
+    return true;
+#else
+    return false;
+#endif
+}
+
+/**
+    \fn IsFadeOut
+*/
+bool ADMVideoFadeThrough::IsFadeOut()
+{
+#if defined(FADEOUT)
+    return true;
+#else
+    return false;
+#endif
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoFadeThrough::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getFadeThrough(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoFadeThrough::getConfiguration(void)
+{
+    static char s[1024];
+    char startTimeStr[128];
+    char endTimeStr[128];
+    snprintf(startTimeStr,127,"%s",ADM_us2plain(_param.startTime*1000LL));
+    snprintf(endTimeStr,127,"%s",ADM_us2plain(_param.endTime*1000LL));
+
+    snprintf(s,1023,"%s - %s: ",startTimeStr,endTimeStr);
+    
+    bool first = true;
+    if (_param.enableBright)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Brightness");
+        first = false;
+    }
+    
+    if (_param.enableSat)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Saturation");
+        first = false;
+    }
+    
+    if (_param.enableBlend)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Color blend");
+        first = false;
+    }
+    
+    if (_param.enableBlur)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Blur");
+        first = false;
+    }
+    
+    if (_param.enableRot)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Rotation");
+        first = false;
+    }
+    
+    if (_param.enableZoom)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Zoom");
+        first = false;
+    }
+    
+    if (_param.enableVignette)
+    {
+        if (!first)
+            strcat(s," + ");
+        strcat(s,"Vignette");
+        first = false;
+    }
+
+    if (first)
+        strcat(s,"NO EFFECT");
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoFadeThrough::ADMVideoFadeThrough(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,fadeThrough_param,&_param))
+    {
+        // Default value
+        _param.startTime = info.markerA / 1000LL;
+        _param.endTime = info.markerB / 1000LL;
+        _param.enableBright = false;
+        _param.enableSat = false;
+        _param.enableBlend = false;
+        _param.enableBlur = false;
+        _param.enableRot = false;
+        _param.enableZoom = false;
+        _param.enableVignette = false;
+        _param.rgbColorBlend = 0;
+        _param.rgbColorVignette = 0;
+        _param.peakBright = 1.0;
+        _param.peakSat = 1.0;
+        _param.peakBlend = 1.0;
+        _param.peakBlur = 0;
+        _param.peakRot = 0;
+        _param.peakZoom = 1.0;
+        _param.peakVignette = 0;
+        _param.transientBright = 0;
+        _param.transientSat = 0;
+        _param.transientBlend = 0;
+        _param.transientBlur = 0;
+        _param.transientRot = 0;
+        _param.transientZoom = 0;
+        _param.transientVignette = 0;
+        
+        float defaultTrD = 0.5;
+#if defined(FADEIN) || defined(FADEOUT)
+        defaultTrD = 1.0;
+#endif
+        _param.transientDurationBright = defaultTrD;
+        _param.transientDurationSat = defaultTrD;
+        _param.transientDurationBlend = defaultTrD;
+        _param.transientDurationBlur = defaultTrD;
+        _param.transientDurationRot = defaultTrD;
+        _param.transientDurationZoom = defaultTrD;
+        _param.transientDurationVignette = defaultTrD;
+    }
+    
+    FadeThroughCreateBuffers(info.width,info.height, &(_buffers));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoFadeThrough::update(void)
+{
+}
+/**
+    \fn dtor
+*/
+ADMVideoFadeThrough::~ADMVideoFadeThrough()
+{
+    FadeThroughDestroyBuffers(&(_buffers));
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoFadeThrough::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, fadeThrough_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoFadeThrough::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, fadeThrough_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoFadeThrough::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    FadeThroughProcess_C(image,info.width,info.height,getAbsoluteStartTime(),_param, &(_buffers));
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/ADM_vidFadeThrough.h Added

@@ -0,0 +1,102 @@
+/***************************************************************************
+                          FadeThrough filter
+    Algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_default.h"
+#include "ADM_threads.h"
+#include "ADM_image.h"
+#include "ADM_byteBuffer.h"
+#include "ADM_coreVideoFilter.h"
+
+#define MOTION_ESTIMATION_CONTRAST_THRESHOLD	(16)
+/**
+    \class ADMVideoFadeThrough
+*/
+class  ADMVideoFadeThrough:public ADM_coreVideoFilter
+{
+  public:
+    typedef struct {
+        int         w,h;
+        int         ystart, yincr;
+        int         algo;
+        double *    xs;
+        double *    ys;
+        int         stride;
+        uint8_t *   in;
+        uint8_t *   in2;
+        uint8_t *   out;
+        uint8_t *   out2;
+        int *       bicubicWeights;
+        uint8_t     blackLevel;
+    } qtr_worker_thread_arg;
+
+    typedef struct {
+        uint8_t *             lut[3];
+        uint32_t              blendRGBcached;
+        bool                  blendRangeCached;
+        int                   blendYUVcached[3];
+        uint32_t              vignetteRGBcached;
+        bool                  vignetteRangeCached;
+        int                   vignetteYUVcached[3];
+        
+        int                   rgbBufStride;
+        ADM_byteBuffer *      rgbBufRaw;
+        ADMImageRef *         rgbBufImage;
+        ADMColorScalerFull *  convertYuvToRgb;
+        ADMColorScalerFull *  convertRgbToYuv;
+        uint32_t *            blurStack;
+        
+        ADMImage *            imgCopy;
+        int *                 bicubicWeights;
+        int threads;
+        int threadsUV;
+        pthread_t  * qtr_worker_threads;
+        qtr_worker_thread_arg * qtr_worker_thread_args;
+    } fadeThrough_buffers_t;
+
+  protected:
+    void                  update(void);
+    fadeThrough             _param;
+    fadeThrough_buffers_t   _buffers;
+    static void           bilinear(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, uint8_t * out);
+    static void           bicubic(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, int * weights, uint8_t * out);
+    
+
+    static void * qtr_worker_thread( void *ptr );
+    
+  public:
+    ADMVideoFadeThrough(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoFadeThrough();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface
+
+    static void FadeThroughCreateBuffers(int w, int h, fadeThrough_buffers_t * buffers);
+    static void FadeThroughDestroyBuffers(fadeThrough_buffers_t * buffers);
+    static void FadeThroughProcess_C(ADMImage *img, int w, int h, uint64_t absoluteStartPts, fadeThrough param, fadeThrough_buffers_t * buffers);
+    static double TransientPoint(double frac, int transient, double duration);
+    static void StackBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius);
+    
+    static bool IsFadeIn();
+    static bool IsFadeOut();
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/CMakeLists.txt Added

@@ -0,0 +1,41 @@
+INCLUDE(vf_plugin)
+
+#SET(FadeThroughCommon_SRCS ADM_vidFadeThrough.cpp)
+IF(DO_QT4)
+    include(admCheckThreads)
+ENDIF(DO_QT4)
+IF(DO_CLI)
+    include(admCheckThreads)
+ENDIF(DO_CLI)
+
+# ---------- QT4 Version ----------------
+INCLUDE(vf_plugin_qt4)
+SET(FadeThroughQT_SRCS  qt4/Q_fadeThrough.cpp)
+SET(FadeThroughQT_HEADERS  qt4/Q_fadeThrough.h)
+SET(FadeThroughQT_UI    qt4/fadeThrough)
+INIT_VIDEO_FILTER_QT4(ADM_vf_fadeThrough${QT_LIBRARY_EXTENSION} ${FadeThroughQT_SRCS} ${FadeThroughQT_HEADERS} ${FadeThroughQT_UI} ADM_vfFadeThrough.cpp qt4/DIA_flyFadeThrough.cpp qt4/fadeThrough.qrc)
+INIT_VIDEO_FILTER_QT4(ADM_vf_fadeIn${QT_LIBRARY_EXTENSION} ${FadeThroughQT_SRCS} ${FadeThroughQT_HEADERS} ${FadeThroughQT_UI} ADM_vfFadeIn.cpp qt4/DIA_flyFadeThrough.cpp qt4/fadeThrough.qrc)
+INIT_VIDEO_FILTER_QT4(ADM_vf_fadeOut${QT_LIBRARY_EXTENSION} ${FadeThroughQT_SRCS} ${FadeThroughQT_HEADERS} ${FadeThroughQT_UI} ADM_vfFadeOut.cpp qt4/DIA_flyFadeThrough.cpp qt4/fadeThrough.qrc)
+IF (DO_QT4)
+    ADM_LINK_THREAD(ADM_vf_fadeThrough${QT_LIBRARY_EXTENSION} )
+    ADM_LINK_THREAD(ADM_vf_fadeIn${QT_LIBRARY_EXTENSION} )
+    ADM_LINK_THREAD(ADM_vf_fadeOut${QT_LIBRARY_EXTENSION} )
+ENDIF (DO_QT4)
+# /QT4
+
+
+
+#------------ Cli Version ----------------
+INCLUDE(vf_plugin_cli)
+SET(FadeThroughCli_SRCS cli/DIA_fadeThrough.cpp)
+INIT_VIDEO_FILTER_CLI(  ADM_vf_fadeThroughCli ${FadeThroughCli_SRCS} ADM_vfFadeThrough.cpp)
+INIT_VIDEO_FILTER_CLI(  ADM_vf_fadeInCli ${FadeThroughCli_SRCS} ADM_vfFadeIn.cpp)
+INIT_VIDEO_FILTER_CLI(  ADM_vf_fadeOutCli ${FadeThroughCli_SRCS} ADM_vfFadeOut.cpp)
+IF (DO_CLI)
+    ADM_LINK_THREAD(ADM_vf_fadeThroughCli)
+    ADM_LINK_THREAD(ADM_vf_fadeInCli)
+    ADM_LINK_THREAD(ADM_vf_fadeOutCli)
+ENDIF (DO_CLI)
+#
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/cli/DIA_fadeThrough.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough_desc.cpp Added

@@ -0,0 +1,36 @@
+// automatically generated by admSerialization.py, do not edit!
+extern const ADM_paramList fadeThrough_param[]={
+ {"startTime",offsetof(fadeThrough,startTime),"uint32_t",ADM_param_uint32_t},
+ {"endTime",offsetof(fadeThrough,endTime),"uint32_t",ADM_param_uint32_t},
+ {"enableBright",offsetof(fadeThrough,enableBright),"bool",ADM_param_bool},
+ {"enableSat",offsetof(fadeThrough,enableSat),"bool",ADM_param_bool},
+ {"enableBlend",offsetof(fadeThrough,enableBlend),"bool",ADM_param_bool},
+ {"enableBlur",offsetof(fadeThrough,enableBlur),"bool",ADM_param_bool},
+ {"enableRot",offsetof(fadeThrough,enableRot),"bool",ADM_param_bool},
+ {"enableZoom",offsetof(fadeThrough,enableZoom),"bool",ADM_param_bool},
+ {"enableVignette",offsetof(fadeThrough,enableVignette),"bool",ADM_param_bool},
+ {"rgbColorBlend",offsetof(fadeThrough,rgbColorBlend),"uint32_t",ADM_param_uint32_t},
+ {"rgbColorVignette",offsetof(fadeThrough,rgbColorVignette),"uint32_t",ADM_param_uint32_t},
+ {"peakBright",offsetof(fadeThrough,peakBright),"float",ADM_param_float},
+ {"peakSat",offsetof(fadeThrough,peakSat),"float",ADM_param_float},
+ {"peakBlend",offsetof(fadeThrough,peakBlend),"float",ADM_param_float},
+ {"peakBlur",offsetof(fadeThrough,peakBlur),"float",ADM_param_float},
+ {"peakRot",offsetof(fadeThrough,peakRot),"float",ADM_param_float},
+ {"peakZoom",offsetof(fadeThrough,peakZoom),"float",ADM_param_float},
+ {"peakVignette",offsetof(fadeThrough,peakVignette),"float",ADM_param_float},
+ {"transientBright",offsetof(fadeThrough,transientBright),"uint32_t",ADM_param_uint32_t},
+ {"transientSat",offsetof(fadeThrough,transientSat),"uint32_t",ADM_param_uint32_t},
+ {"transientBlend",offsetof(fadeThrough,transientBlend),"uint32_t",ADM_param_uint32_t},
+ {"transientBlur",offsetof(fadeThrough,transientBlur),"uint32_t",ADM_param_uint32_t},
+ {"transientRot",offsetof(fadeThrough,transientRot),"uint32_t",ADM_param_uint32_t},
+ {"transientZoom",offsetof(fadeThrough,transientZoom),"uint32_t",ADM_param_uint32_t},
+ {"transientVignette",offsetof(fadeThrough,transientVignette),"uint32_t",ADM_param_uint32_t},
+ {"transientDurationBright",offsetof(fadeThrough,transientDurationBright),"float",ADM_param_float},
+ {"transientDurationSat",offsetof(fadeThrough,transientDurationSat),"float",ADM_param_float},
+ {"transientDurationBlend",offsetof(fadeThrough,transientDurationBlend),"float",ADM_param_float},
+ {"transientDurationBlur",offsetof(fadeThrough,transientDurationBlur),"float",ADM_param_float},
+ {"transientDurationRot",offsetof(fadeThrough,transientDurationRot),"float",ADM_param_float},
+ {"transientDurationZoom",offsetof(fadeThrough,transientDurationZoom),"float",ADM_param_float},
+ {"transientDurationVignette",offsetof(fadeThrough,transientDurationVignette),"float",ADM_param_float},
+{NULL,0,NULL}
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/fadeThrough_json.cpp Added

@@ -0,0 +1,49 @@
+// automatically generated by admSerialization.py, do not edit!
+#include "ADM_default.h"
+#include "ADM_paramList.h"
+#include "ADM_coreJson.h"
+#include "fadeThrough.h"
+bool  fadeThrough_jserialize(const char *file, const fadeThrough *key){
+admJson json;
+json.addUint32("startTime",key->startTime);
+json.addUint32("endTime",key->endTime);
+json.addBool("enableBright",key->enableBright);
+json.addBool("enableSat",key->enableSat);
+json.addBool("enableBlend",key->enableBlend);
+json.addBool("enableBlur",key->enableBlur);
+json.addBool("enableRot",key->enableRot);
+json.addBool("enableZoom",key->enableZoom);
+json.addBool("enableVignette",key->enableVignette);
+json.addUint32("rgbColorBlend",key->rgbColorBlend);
+json.addUint32("rgbColorVignette",key->rgbColorVignette);
+json.addFloat("peakBright",key->peakBright);
+json.addFloat("peakSat",key->peakSat);
+json.addFloat("peakBlend",key->peakBlend);
+json.addFloat("peakBlur",key->peakBlur);
+json.addFloat("peakRot",key->peakRot);
+json.addFloat("peakZoom",key->peakZoom);
+json.addFloat("peakVignette",key->peakVignette);
+json.addUint32("transientBright",key->transientBright);
+json.addUint32("transientSat",key->transientSat);
+json.addUint32("transientBlend",key->transientBlend);
+json.addUint32("transientBlur",key->transientBlur);
+json.addUint32("transientRot",key->transientRot);
+json.addUint32("transientZoom",key->transientZoom);
+json.addUint32("transientVignette",key->transientVignette);
+json.addFloat("transientDurationBright",key->transientDurationBright);
+json.addFloat("transientDurationSat",key->transientDurationSat);
+json.addFloat("transientDurationBlend",key->transientDurationBlend);
+json.addFloat("transientDurationBlur",key->transientDurationBlur);
+json.addFloat("transientDurationRot",key->transientDurationRot);
+json.addFloat("transientDurationZoom",key->transientDurationZoom);
+json.addFloat("transientDurationVignette",key->transientDurationVignette);
+return json.dumpToFile(file);
+};
+bool  fadeThrough_jdeserialize(const char *file, const ADM_paramList *tmpl,fadeThrough *key){
+admJsonToCouple json;
+CONFcouple *c=json.readFromFile(file);
+if(!c) {ADM_error("Cannot read json file");return false;}
+bool r= ADM_paramLoadPartial(c,tmpl,key);
+delete c;
+return r;
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/DIA_flyFadeThrough.cpp Added

@@ -0,0 +1,59 @@
+/**/
+/***************************************************************************
+                          DIA_flyFadeThrough
+                             -------------------
+
+			   Ui for FadeThrough
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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_image.h"
+#include "DIA_flyFadeThrough.h"
+
+/************* COMMON PART *********************/
+
+/**
+ */
+flyFadeThrough::flyFadeThrough (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider, QGraphicsScene *sc) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    scene = sc;
+    ADMVideoFadeThrough::FadeThroughCreateBuffers(width,height,&buffers);
+}
+/**
+ * 
+ */
+flyFadeThrough::~flyFadeThrough()
+{
+    ADMVideoFadeThrough::FadeThroughDestroyBuffers(&buffers);
+}
+
+uint8_t  flyFadeThrough::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyFadeThrough::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoFadeThrough::FadeThroughProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),0,param, &buffers);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/DIA_flyFadeThrough.h Added

@@ -0,0 +1,47 @@
+/***************************************************************************
+  \fn     DIA_flyFadeThrough
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for fadeThrough
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 DIA_FLYFadeThrough_H
+#define DIA_FLYFadeThrough_H
+#include "fadeThrough.h"
+#include "ADM_vidFadeThrough.h"
+#include "DIA_flyDialogQt4.h"
+#include <QGraphicsScene>
+
+/**
+    \class flyFadeThrough
+*/
+class flyFadeThrough : public ADM_flyDialogYuv
+{
+  private:
+    ADMVideoFadeThrough::fadeThrough_buffers_t  buffers;
+
+  public:
+    fadeThrough  param;
+    QGraphicsScene *scene;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    bool       getTabEnabled(int tabIndex);
+    int        getTabTransient(int tabIndex);
+    double     getTabTransientDuration(int tabIndex);
+    void       redrawScene();
+               flyFadeThrough (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider, QGraphicsScene *sc);
+              ~flyFadeThrough();
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.cpp Added

@@ -0,0 +1,673 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include <QPalette>
+#include <QColorDialog>
+#include "ADM_default.h"
+#include "Q_fadeThrough.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidFadeThrough.h"
+#include "DIA_factory.h"
+#include "ADM_vidMisc.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_fadeThroughWindow::Ui_fadeThroughWindow(QWidget *parent, fadeThrough *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        if (ADMVideoFadeThrough::IsFadeIn())
+            this->setWindowTitle(QString(QT_TRANSLATE_NOOP("fadeThrough","Fade in")));
+        if (ADMVideoFadeThrough::IsFadeOut())
+            this->setWindowTitle(QString(QT_TRANSLATE_NOOP("fadeThrough","Fade out")));
+
+        if (ADMVideoFadeThrough::IsFadeIn() || ADMVideoFadeThrough::IsFadeOut())
+        {
+        #define SETMAX(x) \
+            { \
+                ui.horizontalSlider##x->setMaximum(100); \
+                ui.doubleSpinBox##x->setMaximum(1.0); \
+            }
+
+            SETMAX(TransientDurationBright);
+            SETMAX(TransientDurationSat);
+            SETMAX(TransientDurationBlend);
+            SETMAX(TransientDurationBlur);
+            SETMAX(TransientDurationRot);
+            SETMAX(TransientDurationZoom);
+            SETMAX(TransientDurationVignette);
+        #undef SETMAX
+        }
+
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+        markerA = in->getInfo()->markerA;
+        markerB = in->getInfo()->markerB;
+        duration = in->getInfo()->totalDuration;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        scene=new QGraphicsScene(this);
+        scene->setSceneRect(0,0,256,128);
+        ui.graphicsViewTransient->setScene(scene);
+        ui.graphicsViewTransient->scale(1.0,1.0);
+        
+        myFly=new flyFadeThrough( this,width, height,in,canvas,ui.horizontalSlider,scene);
+        memcpy(&(myFly->param),param,sizeof(fadeThrough));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        
+        connect(ui.pushButtonTManual,SIGNAL(clicked(bool)),this,SLOT(manualTimeEntry(bool)));
+        connect(ui.pushButtonTMarker,SIGNAL(clicked(bool)),this,SLOT(timesFromMarkers(bool)));
+        if (!(ADMVideoFadeThrough::IsFadeIn() || ADMVideoFadeThrough::IsFadeOut()))
+        {
+            connect(ui.pushButtonTCenter,SIGNAL(clicked(bool)),this,SLOT(centeredTimesFromMarkers(bool)));
+        }
+        else
+        {
+            ui.pushButtonTCenter->setVisible(false);
+            ui.labelCenter->setVisible(false);
+        }
+        
+        connect(ui.tabEffects,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int)));
+        
+#define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        CHKBOX(EnableBright);
+        CHKBOX(EnableSat);
+        CHKBOX(EnableBlend);
+        CHKBOX(EnableBlur);
+        CHKBOX(EnableRot);
+        CHKBOX(EnableZoom);
+        CHKBOX(EnableVignette);
+
+        connect(ui.pushButtonColorBlend,SIGNAL(released()),this,SLOT(pushedColorBlend()));
+        connect(ui.pushButtonColorVignette,SIGNAL(released()),this,SLOT(pushedColorVignette()));
+        
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChangedSpinBox(double)));
+        
+        SPINNER(PeakBright);
+        SPINNER(PeakSat);
+        SPINNER(PeakBlend);
+        SPINNER(PeakBlur);
+        SPINNER(PeakRot);
+        SPINNER(PeakZoom);
+        SPINNER(PeakVignette);
+
+#define COMBOX(x) connect(ui.comboBox##x,SIGNAL(currentIndexChanged(int)),this,SLOT(valueChanged(int)));
+
+        COMBOX(TransientBright);
+        COMBOX(TransientSat);
+        COMBOX(TransientBlend);
+        COMBOX(TransientBlur);
+        COMBOX(TransientRot);
+        COMBOX(TransientZoom);
+        COMBOX(TransientVignette);
+
+        SPINNER(TransientDurationBright);
+        SPINNER(TransientDurationSat);
+        SPINNER(TransientDurationBlend);
+        SPINNER(TransientDurationBlur);
+        SPINNER(TransientDurationRot);
+        SPINNER(TransientDurationZoom);
+        SPINNER(TransientDurationVignette);
+        
+        QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+        setModal(true);
+}
+
+void Ui_fadeThroughWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+
+void Ui_fadeThroughWindow::manualTimeEntry(bool f)
+{
+    uint32_t mx=(uint32_t)(duration/1000LL);
+
+    diaElemTimeStamp start(&(myFly->param.startTime),QT_TRANSLATE_NOOP("fadeThrough","_Start time:"),0,mx);
+    diaElemTimeStamp end(&(myFly->param.endTime),QT_TRANSLATE_NOOP("fadeThrough","_End time:"),0,mx);
+    diaElem *elems[2]={&start,&end};
+
+    if(diaFactoryRun(QT_TRANSLATE_NOOP("fadeThrough","Manual time entry"),2+0*1,elems))
+    {
+        if(myFly->param.startTime > myFly->param.endTime)
+        {
+            uint32_t tmp=myFly->param.startTime;
+            myFly->param.startTime=myFly->param.endTime;
+            myFly->param.endTime=tmp;
+        }
+        valueChanged(0);
+    }
+}
+
+void Ui_fadeThroughWindow::timesFromMarkers(bool f)
+{
+    myFly->param.startTime = markerA / 1000LL;
+    myFly->param.endTime = markerB / 1000LL;
+    if(myFly->param.startTime > myFly->param.endTime)
+    {
+        uint32_t tmp=myFly->param.startTime;
+        myFly->param.startTime=myFly->param.endTime;
+        myFly->param.endTime=tmp;
+    }
+    valueChanged(0);
+}
+
+void Ui_fadeThroughWindow::centeredTimesFromMarkers(bool f)
+{
+    int64_t mstart,mend;
+    mstart = (int64_t)markerA - abs((int64_t)markerB - (int64_t)markerA);
+    mend = (int64_t)markerB;
+    if ((mstart<0) || (mstart > duration) || (mend<0) || (mend > duration))
+    {
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("fadeThrough","Not possible!\nStart and/or end time would be out of range"), NULL);
+        return;
+    }
+
+    myFly->param.startTime = mstart / 1000LL;
+    myFly->param.endTime = mend / 1000LL;
+    if(myFly->param.startTime > myFly->param.endTime)
+    {
+        uint32_t tmp=myFly->param.startTime;
+        myFly->param.startTime=myFly->param.endTime;
+        myFly->param.endTime=tmp;
+    }
+    valueChanged(0);
+}
+
+void Ui_fadeThroughWindow::tabChanged(int foo)
+{
+    myFly->redrawScene();
+}
+
+void Ui_fadeThroughWindow::gather(fadeThrough *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(fadeThrough));
+}
+Ui_fadeThroughWindow::~Ui_fadeThroughWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL;
+    if(canvas) delete canvas;
+    canvas=NULL;
+    scene=NULL;
+}
+
+void Ui_fadeThroughWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_fadeThroughWindow::valueChangedSpinBox(double f)
+{
+#define UPDATESILDERSFROMSPINBOXES(x,scale) \
+    ui.horizontalSliderPeak##x->setValue( std::round(ui.doubleSpinBoxPeak##x->value()*scale)); \
+    ui.horizontalSliderTransientDuration##x->setValue( std::round(ui.doubleSpinBoxTransientDuration##x->value()*100.0));
+
+    UPDATESILDERSFROMSPINBOXES(Bright,100);
+    UPDATESILDERSFROMSPINBOXES(Sat,100);
+    UPDATESILDERSFROMSPINBOXES(Blend,100);
+    UPDATESILDERSFROMSPINBOXES(Blur,1);
+    UPDATESILDERSFROMSPINBOXES(Rot,100);
+    UPDATESILDERSFROMSPINBOXES(Zoom,100);
+    UPDATESILDERSFROMSPINBOXES(Vignette,100);
+#undef UPDATESILDERSFROMSPINBOXES
+
+    valueChanged(0);
+}
+
+void Ui_fadeThroughWindow::pushedColorBlend()
+{
+    QPalette indctrPalette(ui.lineEditColorBlend->palette());
+    QColor startColor = indctrPalette.color(QPalette::Window);
+    QColor color = QColorDialog::getColor(startColor, this );
+    if( color.isValid() )
+    {
+        int rgb[3];
+        color.getRgb(rgb+0,rgb+1,rgb+2, NULL);
+        myFly->param.rgbColorBlend = (rgb[0] << 16) + (rgb[1] << 8) + (rgb[2] << 0);
+        indctrPalette.setColor(QPalette::Window,color);
+        indctrPalette.setColor(QPalette::Base,color);
+        indctrPalette.setColor(QPalette::AlternateBase,color);
+        ui.lineEditColorBlend->setPalette(indctrPalette);
+        if(!lock)
+        {
+            lock++;
+            myFly->download();
+            myFly->sameImage();
+            lock--;
+        }
+    }
+}
+
+void Ui_fadeThroughWindow::pushedColorVignette()
+{
+    QPalette indctrPalette(ui.lineEditColorVignette->palette());
+    QColor startColor = indctrPalette.color(QPalette::Window);
+    QColor color = QColorDialog::getColor(startColor, this );
+    if( color.isValid() )
+    {
+        int rgb[3];
+        color.getRgb(rgb+0,rgb+1,rgb+2, NULL);
+        myFly->param.rgbColorVignette = (rgb[0] << 16) + (rgb[1] << 8) + (rgb[2] << 0);
+        indctrPalette.setColor(QPalette::Window,color);
+        indctrPalette.setColor(QPalette::Base,color);
+        indctrPalette.setColor(QPalette::AlternateBase,color);
+        ui.lineEditColorVignette->setPalette(indctrPalette);
+        if(!lock)
+        {
+            lock++;
+            myFly->download();
+            myFly->sameImage();
+            lock--;
+        }
+    }
+}
+
+/**
+ * \fn reset
+ */
+void Ui_fadeThroughWindow::reset( bool f )
+{
+    myFly->param.enableBright = false;
+    myFly->param.enableSat = false;
+    myFly->param.enableBlend = false;
+    myFly->param.enableBlur = false;
+    myFly->param.enableRot = false;
+    myFly->param.enableZoom = false;
+    myFly->param.enableVignette = false;
+    myFly->param.rgbColorBlend = 0;
+    myFly->param.rgbColorVignette = 0;
+    myFly->param.peakBright = 1.0;
+    myFly->param.peakSat = 1.0;
+    myFly->param.peakBlend = 1.0;
+    myFly->param.peakBlur = 0;
+    myFly->param.peakRot = 0;
+    myFly->param.peakZoom = 1.0;
+    myFly->param.peakVignette = 0;
+    myFly->param.transientBright = 0;
+    myFly->param.transientSat = 0;
+    myFly->param.transientBlend = 0;
+    myFly->param.transientBlur = 0;
+    myFly->param.transientRot = 0;
+    myFly->param.transientZoom = 0;
+    myFly->param.transientVignette = 0;
+    
+    float defaultTrD = 0.5;
+    if (ADMVideoFadeThrough::IsFadeIn() || ADMVideoFadeThrough::IsFadeOut())
+        defaultTrD = 1.0;
+    myFly->param.transientDurationBright = defaultTrD;
+    myFly->param.transientDurationSat = defaultTrD;
+    myFly->param.transientDurationBlend = defaultTrD;
+    myFly->param.transientDurationBlur = defaultTrD;
+    myFly->param.transientDurationRot = defaultTrD;
+    myFly->param.transientDurationZoom = defaultTrD;
+    myFly->param.transientDurationVignette = defaultTrD;
+    lock++;
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_fadeThroughWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_fadeThroughWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+
+    QFontMetrics fm = ui.labelTScope->fontMetrics();
+    QString text = QString(QT_TRANSLATE_NOOP("fadeThrough","Time scope: "));
+    text += QString("000:00:00,000 - 000:00:00,000");
+    ui.labelTScope->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    text = QString(QT_TRANSLATE_NOOP("fadeThrough","Duration: "));
+    text += QString("000:00:00,000---");
+    if (!(ADMVideoFadeThrough::IsFadeIn() || ADMVideoFadeThrough::IsFadeOut()))
+        ui.labelCenter->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+    ui.labelDuration->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+
+    adjustSize();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+
+bool flyFadeThrough::getTabEnabled(int tabIndex)
+{
+    switch(tabIndex)
+    {
+        case 0:
+            return param.enableBright;
+        case 1:
+            return param.enableSat;
+        case 2:
+            return param.enableBlend;
+        case 3:
+            return param.enableBlur;
+        case 4:
+            return param.enableRot;
+        case 5:
+            return param.enableZoom;
+        case 6:
+            return param.enableVignette;
+        default:
+            return false;
+    }
+}
+
+int flyFadeThrough::getTabTransient(int tabIndex)
+{
+    switch(tabIndex)
+    {
+        case 0:
+            return param.transientBright;
+        case 1:
+            return param.transientSat;
+        case 2:
+            return param.transientBlend;
+        case 3:
+            return param.transientBlur;
+        case 4:
+            return param.transientRot;
+        case 5:
+            return param.transientZoom;
+        case 6:
+            return param.transientVignette;
+        default:
+            return 0;
+    }
+}
+
+double flyFadeThrough::getTabTransientDuration(int tabIndex)
+{
+    switch(tabIndex)
+    {
+        case 0:
+            return (double)param.transientDurationBright;
+        case 1:
+            return (double)param.transientDurationSat;
+        case 2:
+            return (double)param.transientDurationBlend;
+        case 3:
+            return (double)param.transientDurationBlur;
+        case 4:
+            return (double)param.transientDurationRot;
+        case 5:
+            return (double)param.transientDurationZoom;
+        case 6:
+            return (double)param.transientDurationVignette;
+        default:
+            return 0;
+    }
+}
+
+void flyFadeThrough::redrawScene()
+{
+    if (!scene)
+        return;
+    Ui_fadeThroughDialog *w=(Ui_fadeThroughDialog *)_cookie;
+    int activeTab = w->tabEffects->currentIndex();
+    
+    scene->clear();
+    for (int i=0; i<=7; i++)
+    {
+        if (i==activeTab)
+            continue;
+        if (i==7)
+            i = activeTab;
+
+        QColor color((i == activeTab) ? Qt::red : Qt::lightGray);
+        QPen pen(color);
+        QLineF qline;
+        
+        int transient = getTabTransient(i);
+        double transientDuration = getTabTransientDuration(i);
+        int prevx=0,prevy, px,py;
+        if (getTabEnabled(i))
+        {
+            for (int t=0; t<=256; t++)
+            {
+                px = t+1;
+                py = 127.0*(1.0-ADMVideoFadeThrough::TransientPoint(t/256.0, transient, transientDuration));
+                if (t==0)
+                    prevy=py;
+                qline = QLineF(prevx,prevy,px,py);
+                prevx = px;
+                prevy = py;
+                scene->addLine(qline,pen);
+            }
+        } else {
+            qline = QLineF(0,127,255,127);
+            scene->addLine(qline,pen);
+        }
+        
+        if (i == activeTab)
+            break;
+    }
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
+//************************
+uint8_t flyFadeThrough::upload()
+{
+    Ui_fadeThroughDialog *w=(Ui_fadeThroughDialog *)_cookie;
+
+#define UPLOADALIKES(x,scale) \
+    w->checkBoxEnable##x->setChecked(param.enable##x); \
+    w->comboBoxTransient##x->setCurrentIndex(param.transient##x); \
+    w->horizontalSliderPeak##x->setValue( std::round(param.peak##x*scale)); \
+    w->doubleSpinBoxPeak##x->setValue(param.peak##x); \
+    w->horizontalSliderTransientDuration##x->setValue( std::round(param.transientDuration##x*100.0)); \
+    w->doubleSpinBoxTransientDuration##x->setValue(param.transientDuration##x);
+
+    UPLOADALIKES(Bright,100);
+    UPLOADALIKES(Sat,100);
+    UPLOADALIKES(Blend,100);
+    UPLOADALIKES(Blur,1);
+    UPLOADALIKES(Rot,100);
+    UPLOADALIKES(Zoom,100);
+    UPLOADALIKES(Vignette,100);
+#undef UPLOADALIKES
+
+    int rgb[3];
+
+    {
+        rgb[0] = (param.rgbColorBlend>>16)&0xFF;
+        rgb[1] = (param.rgbColorBlend>>8)&0xFF;
+        rgb[2] = (param.rgbColorBlend>>0)&0xFF;
+    
+        QLineEdit * indctr = w->lineEditColorBlend;
+        QPalette indctrPalette(indctr->palette());
+        QColor color;
+        color.setRgb(rgb[0],rgb[1],rgb[2],255);
+        indctrPalette.setColor(QPalette::Window,color);
+        indctrPalette.setColor(QPalette::Base,color);
+        indctrPalette.setColor(QPalette::AlternateBase,color);
+        indctr->setPalette(indctrPalette);
+    }
+
+    {
+        rgb[0] = (param.rgbColorVignette>>16)&0xFF;
+        rgb[1] = (param.rgbColorVignette>>8)&0xFF;
+        rgb[2] = (param.rgbColorVignette>>0)&0xFF;
+        
+        QLineEdit * indctr = w->lineEditColorVignette;
+        QPalette indctrPalette(indctr->palette());
+        QColor color;
+        color.setRgb(rgb[0],rgb[1],rgb[2],255);
+        indctrPalette.setColor(QPalette::Window,color);
+        indctrPalette.setColor(QPalette::Base,color);
+        indctrPalette.setColor(QPalette::AlternateBase,color);
+        indctr->setPalette(indctrPalette);
+    }
+    
+    redrawScene();
+    
+    QString tstr = QString(QT_TRANSLATE_NOOP("fadeThrough","Time scope: "));
+    tstr += QString(ADM_us2plain(param.startTime*1000LL));
+    tstr += QString(" - ");
+    tstr += QString(ADM_us2plain(param.endTime*1000LL));
+    w->labelTScope->setText(tstr);
+    
+    if (!(ADMVideoFadeThrough::IsFadeIn() || ADMVideoFadeThrough::IsFadeOut()))
+    {
+        tstr = QString(QT_TRANSLATE_NOOP("fadeThrough","Center: "));
+        tstr += QString(ADM_us2plain(((param.endTime + param.startTime)*1000LL)/2));
+        w->labelCenter->setText(tstr);
+    }
+    
+    tstr = QString(QT_TRANSLATE_NOOP("fadeThrough","Duration: "));
+    tstr += QString(ADM_us2plain((param.endTime - param.startTime)*1000LL));
+    w->labelDuration->setText(tstr);
+
+    return 1;
+}
+uint8_t flyFadeThrough::download(void)
+{
+    Ui_fadeThroughDialog *w=(Ui_fadeThroughDialog *)_cookie;
+
+#define DOWNLOADALIKES(x,scale) \
+    param.enable##x = w->checkBoxEnable##x->isChecked(); \
+    param.transient##x = w->comboBoxTransient##x->currentIndex(); \
+    param.peak##x = (double)w->horizontalSliderPeak##x->value() / scale; \
+    param.transientDuration##x = (double)w->horizontalSliderTransientDuration##x->value() / 100.0;
+
+    DOWNLOADALIKES(Bright,100);
+    DOWNLOADALIKES(Sat,100);
+    DOWNLOADALIKES(Blend,100);
+    DOWNLOADALIKES(Blur,1);
+    DOWNLOADALIKES(Rot,100);
+    DOWNLOADALIKES(Zoom,100);
+    DOWNLOADALIKES(Vignette,100);
+#undef DOWNLOADALIKES
+
+    upload();
+    return 1;
+}
+void flyFadeThrough::setTabOrder(void)
+{
+    Ui_fadeThroughDialog *w=(Ui_fadeThroughDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+#define PUSHCOMBOX(x) controls.push_back(MYCOMBOX(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+    controls.push_back(w->pushButtonTManual);
+    controls.push_back(w->pushButtonTMarker);
+    if (!(ADMVideoFadeThrough::IsFadeIn() || ADMVideoFadeThrough::IsFadeOut()))
+        controls.push_back(w->pushButtonTCenter);
+    controls.push_back(w->tabEffects);
+    
+#define PUSHWCOLOR(x) \
+    controls.push_back(w->checkBoxEnable##x); \
+    controls.push_back(w->pushButtonColor##x); \
+    controls.push_back(w->doubleSpinBoxPeak##x); \
+    controls.push_back(w->horizontalSliderPeak##x); \
+    controls.push_back(w->comboBoxTransient##x); \
+    controls.push_back(w->doubleSpinBoxTransientDuration##x); \
+    controls.push_back(w->horizontalSliderTransientDuration##x);
+
+#define PUSHWOCOLOR(x) \
+    controls.push_back(w->checkBoxEnable##x); \
+    controls.push_back(w->doubleSpinBoxPeak##x); \
+    controls.push_back(w->horizontalSliderPeak##x); \
+    controls.push_back(w->comboBoxTransient##x); \
+    controls.push_back(w->doubleSpinBoxTransientDuration##x); \
+    controls.push_back(w->horizontalSliderTransientDuration##x);
+
+    PUSHWOCOLOR(Bright);
+    PUSHWOCOLOR(Sat);
+    PUSHWCOLOR(Blend);
+    PUSHWOCOLOR(Blur);
+    PUSHWOCOLOR(Rot);
+    PUSHWOCOLOR(Zoom);
+    PUSHWCOLOR(Vignette);
+
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getFadeThrough(fadeThrough *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_fadeThroughWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/Q_fadeThrough.h Added

@@ -0,0 +1,43 @@
+#ifndef Q_fadeThrough_h
+#define Q_fadeThrough_h
+#include "ui_fadeThrough.h"
+#include "fadeThrough.h"
+#include "DIA_flyFadeThrough.h"
+#include <QGraphicsScene>
+
+class Ui_fadeThroughWindow : public QDialog
+{
+    Q_OBJECT
+
+  protected:
+    int lock;
+    uint64_t markerA, markerB, duration;
+    flyFadeThrough *myFly;
+    ADM_QCanvas *canvas;
+    Ui_fadeThroughDialog ui;
+    QGraphicsScene *scene;
+
+  public:
+    Ui_fadeThroughWindow(QWidget *parent, fadeThrough *param,ADM_coreVideoFilter *in);
+    ~Ui_fadeThroughWindow();
+
+  public slots:
+    void gather(fadeThrough *param);
+
+  private slots:
+    void sliderUpdate(int foo);
+    void manualTimeEntry(bool f);
+    void timesFromMarkers(bool f);
+    void centeredTimesFromMarkers(bool f);
+    void tabChanged(int foo);
+    void valueChanged(int foo);
+    void valueChangedSpinBox(double f);
+    void pushedColorBlend();
+    void pushedColorVignette();
+    void reset(bool f);
+
+  private:
+    void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
+};
+#endif    // Q_fadeThrough_h

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/color.png Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.qrc Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeThrough/qt4/fadeThrough.ui Added

@@ -0,0 +1,1257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>fadeThroughDialog</class>
+ <widget class="QDialog" name="fadeThroughDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>795</width>
+    <height>464</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Fade through</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="labelTScope">
+       <property name="text">
+        <string>Time scope: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelCenter">
+       <property name="text">
+        <string>Center: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelDuration">
+       <property name="text">
+        <string>Duration: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTManual">
+       <property name="text">
+        <string>Manual time entry</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTMarker">
+       <property name="text">
+        <string>Set from A-B markers</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonTCenter">
+       <property name="text">
+        <string>Set center as A marker, duration is 2×|A-B|</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_1">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QTabWidget" name="tabEffects">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="currentIndex">
+        <number>0</number>
+       </property>
+       <widget class="QWidget" name="tabBright">
+        <attribute name="title">
+         <string>Brightness</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutBright">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_20">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableBright">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_21">
+           <item>
+            <widget class="QLabel" name="labelBright">
+             <property name="text">
+              <string>Brightness</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakBright">
+             <property name="minimum">
+              <double>0.000000000000000</double>
+             </property>
+             <property name="maximum">
+              <double>2.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakBright">
+             <property name="minimum">
+              <number>0</number>
+             </property>
+             <property name="maximum">
+              <number>200</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_22">
+           <item>
+            <widget class="QLabel" name="labelTransientBright">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientBright">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Exponential</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationBright">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationBright">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationBright">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabSat">
+        <attribute name="title">
+         <string>Saturation</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutSat">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableSat">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_6">
+           <item>
+            <widget class="QLabel" name="labelSat">
+             <property name="text">
+              <string>Saturation</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakSat">
+             <property name="minimum">
+              <double>0.000000000000000</double>
+             </property>
+             <property name="maximum">
+              <double>10.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakSat">
+             <property name="minimum">
+              <number>0</number>
+             </property>
+             <property name="maximum">
+              <number>1000</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
+           <item>
+            <widget class="QLabel" name="labelTransientSat">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientSat">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Exponential</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationSat">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationSat">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationSat">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabBlend">
+        <attribute name="title">
+         <string>Color blend</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutBlend">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableBlend">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>10</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelPickColorBlend">
+             <property name="text">
+              <string>Pick color</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButtonColorBlend">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="icon">
+              <iconset resource="fadeThrough.qrc">
+               <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="lineEditColorBlend">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>48</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="autoFillBackground">
+              <bool>true</bool>
+             </property>
+             <property name="frame">
+              <bool>true</bool>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <widget class="QLabel" name="labelPeakBlend">
+             <property name="text">
+              <string>Peak amount</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakBlend">
+             <property name="maximum">
+              <double>1.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakBlend">
+             <property name="maximum">
+              <number>100</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <item>
+            <widget class="QLabel" name="labelTransientBlend">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientBlend">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Exponential</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationBlend">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationBlend">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationBlend">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabBlur">
+        <attribute name="title">
+         <string>Blur</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutBlur">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableBlur">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_9">
+           <item>
+            <widget class="QLabel" name="labelPeakBlur">
+             <property name="text">
+              <string>Blur radius</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakBlur">
+             <property name="decimals">
+              <number>0</number>
+             </property>
+             <property name="maximum">
+              <double>255.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>1.000000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakBlur">
+             <property name="maximum">
+              <number>255</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_10">
+           <item>
+            <widget class="QLabel" name="labelTransientBlur">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientBlur">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Exponential</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationBlur">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationBlur">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationBlur">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabRot">
+        <attribute name="title">
+         <string>Rotate</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutRot">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_11">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableRot">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_12">
+           <item>
+            <widget class="QLabel" name="labelPeakRot">
+             <property name="text">
+              <string>Peak angle</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakRot">
+             <property name="minimum">
+              <double>-720.000000000000000</double>
+             </property>
+             <property name="maximum">
+              <double>720.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakRot">
+             <property name="minimum">
+              <number>-72000</number>
+             </property>
+             <property name="maximum">
+              <number>72000</number>
+             </property>
+             <property name="pageStep">
+              <number>100</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_13">
+           <item>
+            <widget class="QLabel" name="labelTransientRot">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientRot">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationRot">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationRot">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationRot">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabZoom">
+        <attribute name="title">
+         <string>Zoom</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutZoom">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_14">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableZoom">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_15">
+           <item>
+            <widget class="QLabel" name="labelPeakZoom">
+             <property name="text">
+              <string>Peak zoom</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakZoom">
+             <property name="minimum">
+              <double>1.000000000000000</double>
+             </property>
+             <property name="maximum">
+              <double>100.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakZoom">
+             <property name="minimum">
+              <number>100</number>
+             </property>
+             <property name="maximum">
+              <number>10000</number>
+             </property>
+             <property name="pageStep">
+              <number>1000</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_16">
+           <item>
+            <widget class="QLabel" name="labelTransientZoom">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientZoom">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Exponential</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationZoom">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationZoom">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationZoom">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabVignette">
+        <attribute name="title">
+         <string>Vignette</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayoutVignette">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_17">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableVignette">
+             <property name="text">
+              <string>Enable</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_4">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>10</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelPickColorVignette">
+             <property name="text">
+              <string>Pick color</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButtonColorVignette">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="icon">
+              <iconset resource="fadeThrough.qrc">
+               <normaloff>:/images/color.png</normaloff>:/images/color.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="lineEditColorVignette">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>48</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="autoFillBackground">
+              <bool>true</bool>
+             </property>
+             <property name="frame">
+              <bool>true</bool>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_18">
+           <item>
+            <widget class="QLabel" name="labelPeakVignette">
+             <property name="text">
+              <string>Peak opening</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxPeakVignette">
+             <property name="maximum">
+              <double>1.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderPeakVignette">
+             <property name="maximum">
+              <number>100</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_19">
+           <item>
+            <widget class="QLabel" name="labelTransientVignette">
+             <property name="text">
+              <string>Transient</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxTransientVignette">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Raised cosine</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Ramp</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Inverse quadratic</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Exponential</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="labelTransientDurationVignette">
+             <property name="text">
+              <string>duration</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="doubleSpinBoxTransientDurationVignette">
+             <property name="maximum">
+              <double>0.500000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.010000000000000</double>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="ADM_QSlider" name="horizontalSliderTransientDurationVignette">
+             <property name="maximum">
+              <number>50</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </item>
+     <item row="0" column="2" rowspan="2">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QGraphicsView" name="graphicsViewTransient">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>260</width>
+           <height>132</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>260</width>
+           <height>132</height>
+          </size>
+         </property>
+         <property name="verticalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="fadeThrough.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>fadeThroughDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>fadeThroughDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeTo/ADM_vidFadeTo.cpp Changed

@@ -25,9 +25,12 @@
 protected:
                 fade            param;
                 uint32_t        mx;
+                ADMImage        *first;
+                bool            keep;
+
                 void            boundsCheck(void);
+                void            cleanup(void);
                 bool            buildLut(void);
-                ADMImage        *first;
                 bool            process(ADMImage *source,ADMImage *source2, ADMImage *dest,int offset);
 public:
                                 AVDM_FadeTo(ADM_coreVideoFilter *previous,CONFcouple *conf);
@@ -38,6 +41,7 @@
         virtual bool            getCoupledConf(CONFcouple **couples); /// Return the current filter configuration
         virtual void            setCoupledConf(CONFcouple *couples);
         virtual bool            configure(void); /// Start graphical user interface
+        virtual bool            goToTime(uint64_t time);
                 uint16_t        lookupLuma[256][256];
                 uint16_t        lookupChroma[256][256];
 
@@ -50,7 +54,7 @@
 DECLARE_VIDEO_FILTER(AVDM_FadeTo,
                     1,0,0,          // Version
                     ADM_UI_ALL,     // UI
-                    VF_TRANSFORM,   // Category
+                    VF_TRANSITION,   // Category
                     "fadeTo",       // internal name (must be uniq!)
                     QT_TRANSLATE_NOOP("fadeTo","Fade"), // Display name
                     QT_TRANSLATE_NOOP("fadeTo","Fade.") // Description
@@ -109,13 +113,14 @@
     if(!setup || !ADM_paramLoad(setup,fade_param,&param))
     {
         // Default value
-        param.startFade=0; 
-        param.endFade=0;
+        param.startFade=info.markerA / 1000LL; 
+        param.endFade=info.markerB / 1000LL;
         param.inOut=false;
     }
     buildLut();
     nextFrame=0;
     first=NULL;
+    keep=false;
 }
 /**
  * \fn setCoupledConf
@@ -138,9 +143,9 @@
 }
 
 /**
- * \fn dtor
+ * \fn cleanup
  */
-AVDM_FadeTo::~AVDM_FadeTo(void)
+void AVDM_FadeTo::cleanup(void)
 {
     if(first)
     {
@@ -148,6 +153,23 @@
         first=NULL;
     }
 }
+
+/**
+ * \fn dtor
+ */
+AVDM_FadeTo::~AVDM_FadeTo(void)
+{
+    cleanup();
+}
+/**
+ * \fn goToTime
+ */
+bool AVDM_FadeTo::goToTime(uint64_t time)
+{
+    if(!keep)
+        cleanup();
+    return ADM_coreVideoFilterCached::goToTime(time);
+}
 /**
  * 
  * @param source
@@ -217,15 +239,20 @@
     }
     image->Pts=next->Pts;
     uint64_t absPts=next->Pts+getAbsoluteStartTime();
+    uint32_t absPtsMs=absPts/1000LL;
     bool out_of_scope=false;
 
-    if(absPts<param.startFade*1000LL) out_of_scope=true;
-    if(absPts>param.endFade*1000LL)   out_of_scope=true;
+    if(absPtsMs < param.startFade) out_of_scope=true;
+    if(absPtsMs >= param.endFade)  out_of_scope=true;
 
     if(!out_of_scope && !first)
     {
         first=new ADMImageDefault(next->GetWidth (PLANAR_Y),next->GetHeight(PLANAR_Y));
         first->duplicateFull (next);
+        int64_t delta = absPts;
+        delta -= 1000LL * param.startFade;
+        if(delta < info.frameIncrement)
+            keep = true; // the snapshot is good, doesn't need to be cleared on seek
     }
     if( out_of_scope || !first)
     {
@@ -234,7 +261,7 @@
         vidCache->unlockAll();
         return true;
     }
-    double scope=1000LL*(param.endFade-param.startFade);
+    double scope=(param.endFade-param.startFade);
     double in;
     if(!scope)
     {
@@ -242,7 +269,7 @@
         in=1;
     }else
     {
-        in=absPts-param.startFade*1000LL;
+        in=absPtsMs-param.startFade;
     }
     in=in/scope;
     in*=255;
@@ -277,7 +304,8 @@
 
             f=r-128.;
             f=f*ration;
-            lookupChroma[i][r]=(128<<8)+(uint16_t)(f+0.4);
+            f+=(float)(128<<8);
+            lookupChroma[i][r]=(uint16_t)f;
         }
     }
     return true;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fadeToBlack/ADM_vidFade.cpp Changed

@@ -50,7 +50,7 @@
 DECLARE_VIDEO_FILTER(AVDM_Fade,
                     1,0,0,          // Version
                     ADM_UI_ALL,     // UI
-                    VF_TRANSFORM,   // Category
+                    VF_TRANSITION,   // Category
                     "fadeToBlack",  // internal name (must be uniq!)
                     QT_TRANSLATE_NOOP("fadeToBlack","Fade to black"), // Display name
                     QT_TRANSLATE_NOOP("fadeToBlack","Fade to black in/out.") // Description
@@ -106,8 +106,8 @@
     if(!setup || !ADM_paramLoad(setup,fade_param,&param))
     {
         // Default value
-        param.startFade=0;
-        param.endFade=max;
+        param.startFade=info.markerA / 1000LL;
+        param.endFade=info.markerB / 1000LL;
         param.inOut=0;
         param.toBlack=true;
 
@@ -158,11 +158,11 @@
         return false;
     }
     image->Pts=next->Pts;
-    uint64_t absPts=next->Pts+getAbsoluteStartTime();
+    uint32_t absPtsMs=(next->Pts+getAbsoluteStartTime())/1000LL;
     bool out_of_scope=false;
 
-    if(absPts<param.startFade*1000LL) out_of_scope=true;
-    if(absPts>param.endFade*1000LL)   out_of_scope=true;
+    if(absPtsMs < param.startFade) out_of_scope=true;
+    if(absPtsMs >= param.endFade)   out_of_scope=true;
 
     if( out_of_scope)
     {
@@ -171,7 +171,7 @@
         vidCache->unlockAll();
         return true;
     }
-    double scope=1000LL*(param.endFade-param.startFade);
+    double scope=(param.endFade-param.startFade);
     double in;
     if(!scope)
     {
@@ -179,7 +179,7 @@
         in=1;
     }else
     {
-        in=absPts-param.startFade*1000LL;
+        in=absPtsMs-param.startFade;
     }
     in=in/scope;
     in*=255;
@@ -242,7 +242,8 @@
 
             f=r-128.;
             f=f*ration;
-            lookupChroma[i][r]=(128<<8)+(uint16_t)(f+0.4);
+            f+=(float)(128<<8);
+            lookupChroma[i][r]=(uint16_t)f;
         }
     }
     return true;

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.cpp Added

@@ -0,0 +1,386 @@
+/** *************************************************************************
+                    \fn       ADM_vidFitToSize.cpp  
+
+    copyright            : (C) 2009 by mean
+                               2021 szlldm
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_coreVideoFilter.h"
+#include "DIA_factory.h"
+
+extern "C" {
+#include "libavcodec/avcodec.h"
+#include "libavutil/avutil.h"
+#include "libswscale/swscale.h"
+}
+
+#include "fitToSize.h"
+#include "fitToSize_desc.cpp"
+#include "ADM_vidFitToSize.h"
+
+typedef struct alg
+{
+					int in;
+					char *name;
+}alg;
+#define DECLARE(y) {SWS_##y,(char *)#y}
+
+/**
+	Convert mplayer-resize numbering <--> avidemux one
+
+*/
+alg algs[]={
+				DECLARE(BILINEAR),
+				DECLARE(BICUBIC),
+				DECLARE(LANCZOS),
+				DECLARE(SPLINE)
+		};
+
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoFitToSize,   // Class
+                        1,0,1,              // Version
+                        ADM_UI_TYPE_BUILD,         // UI
+                        VF_TRANSFORM,            // Category
+                        "fitToSize",            // internal name (must be uniq!)
+                        QT_TRANSLATE_NOOP("fitToSize","Fit to size"),            // Display name
+                        QT_TRANSLATE_NOOP("fitToSize","Resize and pad to the specified size.") // Description
+                    );
+
+/**
+    \fn getFitParameters
+*/
+void ADMVideoFitToSize::getFitParameters(int inW, int inH, int outW, int outH, float tolerance, int * strW, int * strH, int * padLeft, int * padRight, int * padTop, int * padBottom)
+{
+    float inAR,outAR;
+    inAR  = (float)inW/(float)inH;
+    outAR = (float)outW/(float)outH;
+
+    //stretching
+    if (inAR > outAR)    // vertical stretching/padding required
+    {
+        if (inAR <= outAR*(1.0+tolerance)) {    // no padding required
+            *strW = outW;
+            *strH = outH;
+        } else {
+            *strW = outW;
+            *strH = round(((float)outW/inAR)/2.0)*2;
+        }
+    } else {             // horizontal stretching/padding required
+        if (inAR*(1.0+tolerance) >= outAR) {    // no padding required
+            *strW = outW;
+            *strH = outH;
+        } else {
+            *strH = outH;
+            *strW = round(((float)outH*inAR)/2.0)*2;
+        }
+    }
+
+    //safety checks
+    if (*strW > outW) *strW = outW;
+    if (*strH > outH) *strH = outH;
+    if (*strW < 16) *strW = 16;
+    if (*strH < 16) *strH = 16;
+
+    // padding
+    *padLeft = 0;
+    *padRight = 0;
+    *padTop = 0;
+    *padBottom = 0;
+    if (*strW < outW)
+    {
+        if ((outW-*strW) < 4)    // no padding
+        {
+            *strW = outW;
+        } else {
+            int diff = outW-*strW;
+            *padLeft = (diff/4)*2;
+            *padRight = diff-*padLeft;
+        }
+    }
+
+    if (*strH < outH)
+    {
+        if ((outH-*strH) < 4)    // no padding
+        {
+            *strH = outH;
+        } else {
+            int diff = outH-*strH;
+            *padTop = (diff/4)*2;
+            *padBottom = diff-*padTop;
+        }
+    }
+}
+
+/**
+    \fn ADMVideoFitToSize
+    \brief constructor
+*/
+ADMVideoFitToSize::ADMVideoFitToSize(  ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilter(in,setup)
+{
+UNUSED_ARG(setup);
+
+    original=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
+    echo=new ADMImageDefault(16,16);
+    if(!setup || !ADM_paramLoad(setup,fitToSize_param,&configuration))
+    {
+        // Default value
+        configuration.width=info.width;
+        configuration.height=info.height;
+        configuration.algo=1; // bicubic
+        configuration.roundup=0;
+        configuration.pad=0;
+        configuration.tolerance=0.0;
+    }
+    resizer=NULL;
+    resizerOrigToEcho=NULL;
+    resizerEchoToImage=NULL;
+    stretch=NULL;
+    reset(configuration.width,configuration.height,configuration.algo,configuration.tolerance);
+}
+/**
+    \fn ADMVideoFitToSize
+    \brief destructor
+*/
+ADMVideoFitToSize::~ADMVideoFitToSize()
+{
+    if(original) delete original;
+    original=NULL;
+    if (echo) delete echo;
+    echo=NULL;
+    clean();
+}
+
+/**
+    \fn getFrame
+    \brief Get a processed frame
+*/
+bool ADMVideoFitToSize::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    // since we do nothing, just get the output of previous filter
+    if(false==previousFilter->getNextFrame(fn,original))
+    {
+        ADM_warning("fitToSize : Cannot get frame\n");
+        return false;
+    }
+    int padding = configuration.pad;
+    uint8_t *src[3];
+    uint8_t *dst[3];
+    int stridesrc[3];
+    int stridedst[3];
+
+    original->GetReadPlanes(src);
+    stretch->GetWritePlanes(dst);
+    original->GetPitches(stridesrc);
+    stretch->GetPitches(stridedst);
+    resizer->convertPlanes(stridesrc,stridedst,src,dst);
+
+    if (padding == 1)    // echo mode
+    {
+        echo->GetWritePlanes(dst);
+        echo->GetPitches(stridedst);
+        resizerOrigToEcho->convertPlanes(stridesrc,stridedst,src,dst);
+    }
+
+    image->GetWritePlanes(dst);
+    image->GetPitches(stridedst);
+
+    if (padding == 1)    // echo mode
+    {
+        echo->GetReadPlanes(src);
+        echo->GetPitches(stridesrc);
+        resizerEchoToImage->convertPlanes(stridesrc,stridedst,src,dst);
+    }
+
+    stretch->GetReadPlanes(src);
+    stretch->GetPitches(stridesrc);
+
+    int srcwidth=stretchW;
+    int srcheight=stretchH;
+    int width=image->GetWidth(PLANAR_Y); 
+    int height=image->GetHeight(PLANAR_Y);
+    int pleft = pads[0];
+    int pright = pads[1];
+    int ptop = pads[2];
+    int pbot = pads[3];
+    int blacklevel = ((original->_range == ADM_COL_RANGE_MPEG) ? 16:0);
+    int p,y;
+
+
+    for (p=0; p<3;p++)
+    {
+        for (y=0; y<ptop; y++)
+        {
+            if (padding == 0)
+                memset(dst[p], blacklevel, width);
+
+            dst[p] += stridedst[p];
+        }
+
+        for (y=0; y<srcheight; y++)
+        {
+            if (padding == 0)
+                memset(dst[p], blacklevel, pleft);
+
+            memcpy(dst[p]+pleft, src[p], srcwidth);
+
+            if (padding == 0)
+                memset(dst[p]+pleft+srcwidth, blacklevel, pright);
+
+            src[p] += stridesrc[p];
+            dst[p] += stridedst[p];
+        }
+
+        for (y=0; y<pbot; y++)
+        {
+            if (padding == 0)
+                memset(dst[p], blacklevel, width);
+
+            dst[p] += stridedst[p];
+        }
+
+        if (p == 0)
+        {
+            srcwidth /= 2;
+            srcheight /= 2;
+            width /= 2;
+            height /= 2;
+            pleft /= 2;
+            pright /= 2;
+            ptop /= 2;
+            pbot /= 2;
+            blacklevel = 128;
+        }
+    }
+
+    image->copyInfo(original);
+
+
+// Fixme change A/R ?
+return true;
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool         ADMVideoFitToSize::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, fitToSize_param,&configuration);
+}
+
+void ADMVideoFitToSize::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, fitToSize_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *ADMVideoFitToSize::getConfiguration(void)
+{
+    static char conf[256];
+    conf[0]=0;
+
+    snprintf(conf,255,"Fit %d x %d to %d x %d, algo %d, pad method %d\nResize input to: %d x %d, Padding: [%d,..,%d] x [%d,..,%d]",
+                (int)previousFilter->getInfo()->width,
+                (int)previousFilter->getInfo()->height,
+                (int)configuration.width, (int)configuration.height,(int)configuration.algo,(int)configuration.pad,
+                stretchW,stretchH, pads[0], pads[1], pads[2], pads[3] );
+    return conf;
+}
+/**
+    \fn getInfo
+*/
+FilterInfo  *ADMVideoFitToSize::getInfo(void)
+{
+    return &info;
+}
+/**
+    \fn clean
+    \brief delete resizer
+*/
+bool ADMVideoFitToSize::clean(void)
+{
+    if (resizer) delete resizer;
+    resizer=NULL;
+    if (stretch) delete stretch;
+    stretch=NULL;
+    if (resizerOrigToEcho) delete resizerOrigToEcho;
+    resizerOrigToEcho=NULL;
+    if (resizerEchoToImage) delete resizerEchoToImage;
+    resizerEchoToImage=NULL;
+    return true;
+}
+/**
+    \fn reset
+    \brief reset resizer
+*/
+
+bool ADMVideoFitToSize::reset(uint32_t nw, uint32_t nh,uint32_t algo, float tolerance)
+{
+    clean();
+    ADMColorScaler_algo scalerAlgo;
+    info.width=nw;
+    info.height=nh;
+
+    getFitParameters(previousFilter->getInfo()->width, previousFilter->getInfo()->height, nw, nh, tolerance, &stretchW, &stretchH, pads+0, pads+1, pads+2, pads+3);
+
+    switch(algo)
+    {
+        case 0: //bilinear
+                scalerAlgo=ADM_CS_BILINEAR;break;
+        case 1: //bicubic
+                scalerAlgo=ADM_CS_BICUBIC;break;
+        case 2: //Lanczos
+                scalerAlgo=ADM_CS_LANCZOS;break;
+        case 3: //spline
+                scalerAlgo=ADM_CS_SPLINE;break;
+        default:
+                ADM_error("Invalid algo: %u\n",algo);
+                ADM_assert(0);
+    }
+    resizer=new ADMColorScalerFull(scalerAlgo, 
+                        previousFilter->getInfo()->width, previousFilter->getInfo()->height, 
+                        stretchW,stretchH,
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+    resizerOrigToEcho=new ADMColorScalerFull(ADM_CS_BICUBIC, 
+                        previousFilter->getInfo()->width, previousFilter->getInfo()->height, 
+                        16,16,
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+    resizerEchoToImage=new ADMColorScalerFull(ADM_CS_LANCZOS, 
+                        16,16, 
+                        nw,nh,
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+    stretch=new ADMImageDefault(stretchW,stretchH);
+    return 1;
+}
+
+extern bool         DIA_fitToSize(uint32_t originalWidth,uint32_t originalHeight,fitToSize *param);
+/**
+    \fn configure
+
+*/
+bool ADMVideoFitToSize::configure(void) 
+{
+    if(true==DIA_fitToSize(previousFilter->getInfo()->width,previousFilter->getInfo()->height,&configuration))
+    {
+       
+        reset(configuration.width,configuration.height,configuration.algo,configuration.tolerance);
+        return true;
+    }   
+    return false;
+}
+//EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/ADM_vidFitToSize.h Added

@@ -0,0 +1,57 @@
+/***************************************************************************
+                    \fn       ADM_vidFitToSize.h  
+
+    copyright            : (C) 2009 by mean
+                               2021 szlldm
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "ADM_coreVideoFilter.h"
+
+
+/**
+    \class ADMVideoFitToSize
+*/
+class ADMVideoFitToSize : public  ADM_coreVideoFilter
+{
+  protected:
+    ADMColorScalerFull * resizer;
+    bool                 reset(uint32_t nw, uint32_t nh,uint32_t algo, float tolerance);
+    bool                 clean( void );
+    ADMImage *           original;
+    ADMImage *           stretch;
+    ADMImage *           echo;
+    ADMColorScalerFull * resizerOrigToEcho;
+    ADMColorScalerFull * resizerEchoToImage;
+    int                  stretchW;
+    int                  stretchH;
+    int                  pads[4];
+    fitToSize            configuration;
+
+  public:
+    ADMVideoFitToSize(ADM_coreVideoFilter *previous,CONFcouple *conf);
+    ~ADMVideoFitToSize();
+
+    virtual const char * getConfiguration(void);                   /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual FilterInfo * getInfo(void);                             /// Return picture parameters after this filter
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;             /// Start graphical user interface
+
+    static void          getFitParameters(int inW, int inH, int outW, int ouH, float tolerance, int * strW, int * strH, int * padLeft, int * padRight, int * padTop, int * padBottom);
+
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/cli/DIA_fitToSize.cpp Added

@@ -0,0 +1,28 @@
+/***************************************************************************
+    copyright            : (C) 2001 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 <math.h>
+
+#include "ADM_default.h"
+#include "DIA_coreToolkit.h"
+#include "fitToSize.h"
+/**
+    \fn DIA_fitToSize
+*/
+bool         DIA_fitToSize(uint32_t originalWidth,uint32_t originalHeight,fitToSize *param)
+{
+     return true;
+}  
+//********************************************
+//EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/fitToSize_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.cpp Added

@@ -0,0 +1,221 @@
+/***************************************************************************
+    copyright            : (C) 2001 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 <cmath>
+
+#include "Q_fitToSize.h"
+#include "ADM_default.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidFitToSize.h"
+
+#if 0
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
+
+fitToSizeWindow::fitToSizeWindow(QWidget *parent, resParam *param) : QDialog(parent)
+{
+    ui.setupUi(this);
+    _param=param;
+
+    ui.comboBoxRoundup->setCurrentIndex(_param->rsz.roundup);
+
+    ui.spinBoxWidth->setKeyboardTracking(false);
+    ui.spinBoxHeight->setKeyboardTracking(false);
+    ui.percentageSpinBox->setKeyboardTracking(false);
+
+    ui.spinBoxWidth->setValue(_param->rsz.width & 0xfffffe);
+    ui.spinBoxHeight->setValue(_param->rsz.height & 0xfffffe);
+    ui.horizontalSlider->setValue(round(_param->rsz.tolerance*100.0));
+    ui.percentageSpinBox->setValue(round(_param->rsz.tolerance*100.0));
+    ui.comboBoxAlgo->setCurrentIndex(_param->rsz.algo);
+    ui.comboBoxPad->setCurrentIndex(_param->rsz.pad);
+    roundupChanged(_param->rsz.roundup);
+
+
+    connect(ui.comboBoxRoundup, SIGNAL(currentIndexChanged(int)), this, SLOT(roundupChanged(int)));
+    connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(okButtonClicked()));
+
+    ui.labelInputSize->setText(" " + QString("%1 x %2").arg(_param->originalWidth).arg(_param->originalHeight));
+    printInfo();
+
+    connectDimensionControls();
+}
+
+void fitToSizeWindow::gather(void)
+{
+    _param->rsz.width=ui.spinBoxWidth->value();
+    _param->rsz.height=ui.spinBoxHeight->value();
+    _param->rsz.algo=ui.comboBoxAlgo->currentIndex();
+    _param->rsz.pad=ui.comboBoxPad->currentIndex();
+    _param->rsz.roundup=ui.comboBoxRoundup->currentIndex();
+    _param->rsz.tolerance = (float)(ui.percentageSpinBox->value())/100.0;
+}
+
+void fitToSizeWindow::printInfo()
+{
+    int ox,oy;
+    ox = _param->originalWidth;
+    oy = _param->originalHeight;
+    int x,y;
+    x = ui.spinBoxWidth->value() & 0xfffffe;
+    y = ui.spinBoxHeight->value() & 0xfffffe;
+    float tolerance;
+    tolerance = (float)(ui.percentageSpinBox->value())/100.0;
+
+    float inAR;
+    inAR  = (float)ox/(float)oy;
+
+    int sx,sy;
+    int pleft,pright,ptop,pbot;
+
+    ADMVideoFitToSize::getFitParameters(ox, oy, x, y, tolerance, &sx, &sy, &pleft, &pright, &ptop, &pbot);
+
+    float stretchError;
+    stretchError = (((float)sx/(float)sy)/inAR - 1.0)*100.0;
+
+    ui.labelStretchSize->setText(" " + QString("%1 x %2").arg(sx).arg(sy));
+    ui.labelStretchError->setText(QString::fromUtf8("\u0394") + " = " + QString("%1%2").arg(stretchError < 0.0 ? '-' : '+').arg(fabs(stretchError), 0, 'f', 2) + "%");
+    ui.labelPadding->setText(" " + QString("[%1,..,%2] x [%3,..,%4]").arg(pleft).arg(pright).arg(ptop).arg(pbot));
+}
+
+void fitToSizeWindow::sliderChanged(int value)
+{
+    disconnectDimensionControls();
+
+    ui.percentageSpinBox->setValue(value);
+    printInfo();
+
+    connectDimensionControls();
+}
+
+void fitToSizeWindow::percentageSpinBoxChanged(int value)
+{
+    disconnectDimensionControls();
+
+    ui.horizontalSlider->setValue(value);
+    printInfo();
+
+    connectDimensionControls();
+}
+
+void fitToSizeWindow::dimensionSpinBoxChanged(int value)
+{
+    disconnectDimensionControls();
+
+    roundUp();
+    printInfo();
+
+    connectDimensionControls();
+}
+
+void fitToSizeWindow::disconnectDimensionControls()
+{
+    disconnect(ui.spinBoxHeight, SIGNAL(valueChanged(int)), this, SLOT(dimensionSpinBoxChanged(int)));
+    disconnect(ui.spinBoxWidth, SIGNAL(valueChanged(int)), this, SLOT(dimensionSpinBoxChanged(int)));
+    disconnect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+    disconnect(ui.percentageSpinBox, SIGNAL(valueChanged(int)), this, SLOT(percentageSpinBoxChanged(int)));
+}
+
+void fitToSizeWindow::connectDimensionControls()
+{
+    connect(ui.spinBoxHeight, SIGNAL(valueChanged(int)), this, SLOT(dimensionSpinBoxChanged(int)));
+    connect(ui.spinBoxWidth, SIGNAL(valueChanged(int)), this, SLOT(dimensionSpinBoxChanged(int)));
+    connect(ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
+    connect(ui.percentageSpinBox, SIGNAL(valueChanged(int)), this, SLOT(percentageSpinBoxChanged(int)));
+}
+
+void fitToSizeWindow::roundUp()
+{
+    int x,y;
+    x = ui.spinBoxWidth->value() & 0xfffffe;
+    y = ui.spinBoxHeight->value() & 0xfffffe;
+
+    int roundup_index = ui.comboBoxRoundup->currentIndex();
+
+    if (roundup_index > 0)
+    {
+        float mod = (32 >> roundup_index);
+
+        x = (int)(round((float)x/mod)*mod);
+        y = (int)(round((float)y/mod)*mod);
+    }
+
+    if (x < 16) x = 16;
+    if (y < 16) y = 16;
+    ui.spinBoxWidth->setValue(x);
+    ui.spinBoxHeight->setValue(y);
+}
+
+void fitToSizeWindow::roundupChanged(int index)
+{
+    disconnectDimensionControls();
+    if (index > 0)
+    {
+
+        ui.spinBoxWidth->setSingleStep((16 << 1) >> index);
+        ui.spinBoxHeight->setSingleStep((16 << 1) >> index);
+        roundUp();
+
+    }
+    else
+    {
+        ui.spinBoxWidth->setSingleStep(2);
+        ui.spinBoxHeight->setSingleStep(2);
+    }
+    printInfo();
+    connectDimensionControls();
+}
+
+void fitToSizeWindow::okButtonClicked()
+{
+    if (ui.spinBoxWidth->value() & 1 || ui.spinBoxHeight->value() & 1)
+        GUI_Error_HIG(QT_TRANSLATE_NOOP("fitToSize","Width and height cannot be odd"), NULL);
+    else
+        accept();
+}
+
+/**
+    \fn DIA_fitToSize
+*/
+bool DIA_fitToSize(uint32_t originalWidth,uint32_t originalHeight,fitToSize *param)
+{
+    bool r=false;
+    resParam _param={
+                        originalWidth,
+                        originalHeight,
+                        *param
+                   };
+
+
+    // Fetch info
+    fitToSizeWindow fitToSizeWindow(qtLastRegisteredDialog(), &_param);
+
+    qtRegisterDialog(&fitToSizeWindow);
+
+    if(fitToSizeWindow.exec()==QDialog::Accepted)
+    {
+        fitToSizeWindow.gather();
+        *param=_param.rsz;
+        r=true;
+    }
+
+    qtUnregisterDialog(&fitToSizeWindow);
+
+    return r;
+}
+//********************************************
+//EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/Q_fitToSize.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/fitToSize/qt4/fitToSize.ui Added

@@ -0,0 +1,568 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>fitToSizeDialog</class>
+ <widget class="QDialog" name="fitToSizeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>604</width>
+    <height>445</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Fit to size</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Output settings</string>
+     </property>
+     <layout class="QVBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>9</number>
+      </property>
+      <property name="topMargin">
+       <number>9</number>
+      </property>
+      <property name="rightMargin">
+       <number>9</number>
+      </property>
+      <property name="bottomMargin">
+       <number>9</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Width:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBoxWidth">
+          <property name="minimum">
+           <number>16</number>
+          </property>
+          <property name="maximum">
+           <number>8192</number>
+          </property>
+          <property name="singleStep">
+           <number>2</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>30</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Height:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBoxHeight">
+          <property name="minimum">
+           <number>16</number>
+          </property>
+          <property name="maximum">
+           <number>8192</number>
+          </property>
+          <property name="singleStep">
+           <number>2</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboBoxRoundup">
+          <property name="minimumSize">
+           <size>
+            <width>256</width>
+            <height>0</height>
+           </size>
+          </property>
+          <item>
+           <property name="text">
+            <string>No rounding</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Round to the Nearest Multiple of 16</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Round to the Nearest Multiple of 8</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Round to the Nearest Multiple of 4</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Resize Method:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboBoxAlgo">
+          <item>
+           <property name="text">
+            <string>Bilinear</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Bicubic</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Lanczos-3</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Spline</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Aspect ratio tolerance</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QVBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>12</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QVBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QLabel" name="label_8">
+                <property name="text">
+                 <string>0%</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_5">
+                <property name="text">
+                 <string>Percent</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_9">
+                <property name="text">
+                 <string>100%</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <widget class="QSlider" name="horizontalSlider">
+              <property name="minimum">
+               <number>0</number>
+              </property>
+              <property name="maximum">
+               <number>100</number>
+              </property>
+              <property name="value">
+               <number>0</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="percentageSpinBox">
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="value">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Padding</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QComboBox" name="comboBoxPad">
+          <item>
+           <property name="text">
+            <string>black bars</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>echo</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Details</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="1" column="1">
+         <widget class="QLabel" name="labelStretchSize">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLabel" name="labelInputSize">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="labelCurrentInputDimensions">
+          <property name="text">
+           <string>Current input dimensions:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="labelResizedTo">
+          <property name="text">
+           <string>Resized to:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="QLabel" name="labelStretchError">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="labelRequiredPadding">
+          <property name="text">
+           <string>Required padding:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLabel" name="labelPadding">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>spinBoxWidth</tabstop>
+  <tabstop>spinBoxHeight</tabstop>
+  <tabstop>comboBoxRoundup</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>percentageSpinBox</tabstop>
+  <tabstop>comboBoxAlgo</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>fitToSizeDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.cpp Added

@@ -0,0 +1,199 @@
+/***************************************************************************
+                          Flip filter
+    Algorithm:
+        Copyright 2009 by mean
+        Copyright 2011 by mean
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "flip.h"
+#include "flip_desc.cpp"
+#include "ADM_vidFlip.h"
+
+#define ADMVideoFlip_HORIZONTAL_FLIP    0
+extern uint8_t DIA_getFlip(flip *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoFlip,   // Class
+DECLARE_VIDEO_FILTER_INTERNAL(
+    ADMVideoFlip, // Class
+    1,0,0, // Version
+    ADM_UI_TYPE_BUILD, // UI
+    VF_TRANSFORM, // Category
+    "flip", // internal name (must be uniq!)
+    QT_TRANSLATE_NOOP("flip","Flip"), // Display name
+    QT_TRANSLATE_NOOP("flip","Vertically/Horizontally flip the image."), // Description
+    true // Partializable
+);
+extern "C"
+{
+    ADM_PLUGIN_EXPORT bool redirector(std::string &name, CONFcouple **c);
+}
+
+/**
+    \fn FlipProcess_C
+*/
+void ADMVideoFlip::FlipProcess_C(ADMImage *img, uint8_t * scratch, uint32_t flipdir)
+{
+    if (!img || !scratch) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    uint8_t * plane[3];
+    int stride[3];
+
+    img->GetPitches(stride);
+    img->GetWritePlanes(plane);
+    
+    if (flipdir == ADMVideoFlip_HORIZONTAL_FLIP)
+    {
+        for (int p=0; p<3; p++)
+        {
+            if (p==1)
+            {
+                width >>= 1;
+                height >>= 1;
+            }
+            
+            uint8_t * line = plane[p];
+            
+            for (int i=0; i<height; i++)
+            {
+                int count=width>>1;
+                uint8_t *h=line;
+                uint8_t *e=line+width-1;
+                uint8_t r;
+                while(count--)
+                {
+                     r=*e;
+                    *e=*h;
+                    *h= r;
+                    h++;e--;
+                }
+                line += stride[p];
+            }
+        }
+    } else {    // Vertical flip
+        for (int p=0; p<3; p++)
+        {
+            if (p==1)
+            {
+                width >>= 1;
+                height >>= 1;
+            }
+            
+            int count=height>>1;
+            for(int i=0;i<count;i++)
+            {
+                uint8_t *top=plane[p]+stride[p]*i;
+                uint8_t *bottom=plane[p]+(height-i-1)*stride[p];
+                memcpy(scratch, top,width);
+                memcpy(top, bottom,width);
+                memcpy(bottom,scratch,width);
+            }
+        }
+    }
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoFlip::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getFlip(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoFlip::getConfiguration(void)
+{
+    if (_param.flipdir == ADMVideoFlip_HORIZONTAL_FLIP)
+        return "Horizontal flip.";
+    else
+        return "Vertical flip.";
+}
+/**
+    \fn ctor
+*/
+ADMVideoFlip::ADMVideoFlip(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,flip_param,&_param))
+        _param.flipdir = ADMVideoFlip_HORIZONTAL_FLIP;
+    _scratch = (uint8_t*)malloc(info.width);
+    update();
+}
+
+/**
+    \fn update
+*/
+void ADMVideoFlip::update(void)
+{
+    _flipdir=_param.flipdir;
+}
+/**
+    \fn dtor
+*/
+ADMVideoFlip::~ADMVideoFlip()
+{
+    free(_scratch);
+    _scratch = NULL;
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoFlip::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, flip_param,&_param);
+}
+
+void ADMVideoFlip::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, flip_param, &_param);
+}
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoFlip::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    FlipProcess_C(image, _scratch, _flipdir);
+
+    return 1;
+}
+
+/**
+    \fn redirector
+    \brief Make old scripts referencing obsolete hflip and vflip filters work.
+*/
+bool redirector(std::string &name, CONFcouple **c)
+{
+    if(!strcmp(name.c_str(),"hflip") || !strcmp(name.c_str(),"vflip"))
+    {
+        const char *alias = "flip";
+        ADM_info("Redirecting \"%s\" to \"%s\"\n",name.c_str(),alias);
+        delete *c;
+        const char *a = (!strcmp(name.c_str(),"vflip"))? "flipdir=1" : "flipdir=0";
+        stringsToConfCouple(1,c,&a); // failsafe
+        name = alias;
+        return true;
+    }
+    return false;
+}

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/ADM_vidFlip.h Added

@@ -0,0 +1,43 @@
+/***************************************************************************
+                          Flip filter
+    Algorithm:
+        Copyright 2009 by mean
+        Copyright 2011 by mean
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoFlip
+*/
+class  ADMVideoFlip:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    uint8_t        *_scratch;
+    flip            _param;
+    uint32_t        _flipdir;
+  public:
+     ADMVideoFlip(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoFlip();
+
+    virtual const char  *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static  void         FlipProcess_C(ADMImage *img, uint8_t * scratch, uint32_t flipdir);
+
+};
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/cli/DIA_flip.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/flip.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/flip.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/flip_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/flip_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/qt4/DIA_flyFlip.cpp Added

@@ -0,0 +1,61 @@
+/**/
+/***************************************************************************
+                          DIA_Flip
+                          --------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyFlip.h"
+
+#include "ADM_vidFlip.h"
+
+/************* COMMON PART *********************/
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+flyFlip::flyFlip (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    scratch=(uint8_t *)malloc(width);
+}
+
+/**
+    \fn dtor
+*/
+flyFlip::~flyFlip()
+{
+    free(scratch);
+    scratch=NULL;
+}
+
+/**
+    \fn processYuv
+*/
+uint8_t   flyFlip::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    ADMVideoFlip::FlipProcess_C(out, scratch, param.flipdir);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/qt4/DIA_flyFlip.h Added

@@ -0,0 +1,37 @@
+/***************************************************************************
+  \fn     DIA_flyFlip
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for flip
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_FLIP_H
+#define FLY_FLIP_H
+#include "flip.h"
+/**
+    \class flyFlip
+*/
+class flyFlip : public ADM_flyDialogYuv
+{
+  private:
+    uint8_t   *scratch;
+  public:
+    flip       param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void) {return 1;};
+    void       setTabOrder(void);
+               flyFlip (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+    virtual    ~flyFlip() ;
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/qt4/Q_flip.cpp Added

@@ -0,0 +1,153 @@
+/***************************************************************************
+                          Q_flip.cpp  -  description
+                          --------------------------
+
+    GUI for flip
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_flip.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidFlip.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_flipWindow::Ui_flipWindow(QWidget *parent, flip *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyFlip( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(flip));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        connect(ui.comboBoxFlipdir, SIGNAL(currentIndexChanged(int)), this, SLOT(flipdirChanged(int)));
+
+        setModal(true);
+}
+void Ui_flipWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_flipWindow::gather(flip *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(flip));
+}
+Ui_flipWindow::~Ui_flipWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_flipWindow::flipdirChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_flipWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_flipWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+//************************
+uint8_t flyFlip::upload(void)
+{
+    Ui_flipDialog *w=(Ui_flipDialog *)_cookie;
+    MYCOMBOX(Flipdir)->setCurrentIndex(param.flipdir);
+    return 1;
+}
+uint8_t flyFlip::download(void)
+{
+    Ui_flipDialog *w=(Ui_flipDialog *)_cookie;
+    param.flipdir=MYCOMBOX(Flipdir)->currentIndex();
+    return 1;
+}
+void flyFlip::setTabOrder(void)
+{
+    Ui_flipDialog *w=(Ui_flipDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+    controls.push_back(MYCOMBOX(Flipdir));
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getFlip(flip *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_flipWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/qt4/Q_flip.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/flip/qt4/flip.ui Added

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>flipDialog</class>
+ <widget class="QDialog" name="flipDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Flip</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="0" column="0">
+      <widget class="QComboBox" name="comboBoxFlipdir">
+       <item>
+        <property name="text">
+         <string>Horizontal flip</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Vertical flip</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>flipDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>flipDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/ADM_vidHue.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.cpp Changed

@@ -43,7 +43,7 @@
         myCrop=new flyHue( this,width, height,in,canvas,ui.horizontalSlider);
         myCrop->setParam(param);
         myCrop->_cookie=&ui;
-        myCrop->addControl(ui.toolboxLayout);
+        myCrop->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
         myCrop->setTabOrder();
         myCrop->upload();
         myCrop->sliderChanged();
@@ -55,8 +55,6 @@
           SPINNER(Hue);
           SPINNER(Saturation);
 
-        connect(ui.checkBoxFullPreview,SIGNAL(stateChanged(int)),this,SLOT(toggleFullPreview(int)));
-
         QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
         connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
 
@@ -86,14 +84,6 @@
   myCrop->sameImage();
   lock--;
 }
-void Ui_hueWindow::toggleFullPreview(int state)
-{
-    if(lock) return;
-    lock++;
-    myCrop->fullpreview = state != Qt::Unchecked;
-    myCrop->sameImage();
-    lock--;
-}
 
 void Ui_hueWindow::reset(void)
 {
@@ -131,15 +121,12 @@
 
     MYSPIN(Saturation)->blockSignals(true);
     MYSPIN(Hue)->blockSignals(true);
-    MYCHECK(FullPreview)->blockSignals(true);
 
     MYSPIN(Saturation)->setValue((int)(flyset.param.saturation*10));
     MYSPIN(Hue)->setValue((int)flyset.param.hue);
-    MYCHECK(FullPreview)->setChecked(fullpreview);
 
     MYSPIN(Saturation)->blockSignals(false);
     MYSPIN(Hue)->blockSignals(false);
-    MYCHECK(FullPreview)->blockSignals(false);
 
     update();
 
@@ -166,7 +153,6 @@
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);
     //controls.push_back(w->graphicsView);
-    controls.push_back(MYCHECK(FullPreview));
 #if 0 /* don't mess with button box */
     controls.push_back(w->buttonBox->button(QDialogButtonBox::Reset));
     { // button box stuff

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/hue.ui Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.cpp Added

@@ -0,0 +1,713 @@
+/***************************************************************************
+                          ImageStab filter
+    Algorithm:
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "imageStab.h"
+#include "imageStab_desc.cpp"
+#include "ADM_vidImageStab.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getImageStab(imageStab *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER(   ADMVideoImageStab,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSFORM,            // Category
+                                      "imageStab",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("imageStab","Image stabilizer"),            // Display name
+                                      QT_TRANSLATE_NOOP("imageStab","Reduce camera shakiness.") // Description
+                                  );
+
+/**
+    \fn ImageStabCreateBuffers
+*/
+void ADMVideoImageStab::ImageStabCreateBuffers(int w, int h, imageStab_buffers_t * buffers)
+{
+    buffers->prevPts = ADM_NO_PTS;
+    buffers->imgCopy = new ADMImageDefault(w,h);
+    
+    buffers->bicubicWeights = new int [257*4];
+    for (int i=0; i<=256; i++)
+    {
+        float tmp;
+        tmp = 1.0 + i/256.0;    buffers->bicubicWeights[i*4+0] = ((-0.75*(tmp-5.0)*tmp-6.0)*tmp+3.0)*256.0 + 0.5;
+        tmp = tmp - 1.0;        buffers->bicubicWeights[i*4+1] = ((1.25*tmp-2.25)*tmp*tmp+1.0)*256.0 + 0.5;
+        tmp = 1.0 - tmp;        buffers->bicubicWeights[i*4+2] = ((1.25*tmp-2.25)*tmp*tmp+1.0)*256.0 + 0.5;
+                                buffers->bicubicWeights[i*4+3] = 256 - buffers->bicubicWeights[i*4+0] - buffers->bicubicWeights[i*4+1] - buffers->bicubicWeights[i*4+2];
+    }
+    
+    buffers->prevChromaHist[0] = -1.0;  // invalidate
+    
+    buffers->motestp = new motest(w,h, MOTION_ESTIMATION_CONTRAST_THRESHOLD);
+
+    buffers->threads = ADM_cpu_num_processors();
+    if (buffers->threads < 1)
+        buffers->threads = 1;
+    if (buffers->threads > 64)
+        buffers->threads = 64;
+    buffers->threadsUV = buffers->threads/4;
+    if (buffers->threadsUV < 1)
+        buffers->threadsUV = 1;
+    buffers->threads -= buffers->threadsUV;
+    if (buffers->threads < 1)
+        buffers->threads = 1;
+
+    buffers->worker_threads = new pthread_t [buffers->threads + buffers->threadsUV];
+    buffers->worker_thread_args = new worker_thread_arg [buffers->threads + buffers->threadsUV];
+}
+/**
+    \fn ImageStabDestroyBuffers
+*/
+void ADMVideoImageStab::ImageStabDestroyBuffers(imageStab_buffers_t * buffers)
+{
+    delete buffers->imgCopy;
+    delete [] buffers->bicubicWeights;
+    delete buffers->motestp;
+    delete [] buffers->worker_threads;
+    delete [] buffers->worker_thread_args;
+}
+
+
+/**
+    \fn bilinear
+*/
+inline void ADMVideoImageStab::bilinear(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, uint8_t * out)
+{
+    int i,a,b,k,l,k1,l1;
+    
+    k  = y*stride+x;
+    k1 = k  + 1;
+    l  = k  + stride;
+    l1 = k1 + stride;
+    
+    a=in[k]*256+(in[k1]-in[k])*fx;
+    b=in[l]*256+(in[l1]-in[l])*fx;
+    out[0]=(a*256+(b-a)*fy)/65536;
+}
+
+/**
+    \fn bicubic
+*/
+inline void ADMVideoImageStab::bicubic(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, int * weights, uint8_t * out)
+{
+    int m = x-1;
+    int n = y-1;
+    if (m < 0)
+        m = 0;
+    if (n < 0)
+        n = 0;
+    if (m+5 > w)
+        m = w-4;
+    if (n+5 > h)
+        n = h-4;
+
+    int * wx, * wy;
+    wx = weights + fx*4;
+    wy = weights + fy*4;
+    
+    int b,i,k,l, p, pp;
+    k = n*stride + m;
+
+    l = k;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp = wy[0]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[1]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[2]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[3]*p;
+    
+    pp /= 65536;
+    if (pp < 0)
+        pp = 0;
+    if (pp > 255)
+        pp = 255;
+    out[0] = pp;
+}
+
+
+
+/**
+    \fn worker_thread
+*/
+void * ADMVideoImageStab::worker_thread( void *ptr )
+{
+    worker_thread_arg * arg = (worker_thread_arg*)ptr;
+    int w = arg->w;
+    int h = arg->h;
+    int ystart = arg->ystart;
+    int yincr = arg->yincr;
+    int algo = arg->algo;
+    double * xs = arg->xs;
+    double * ys = arg->ys;
+    int stride = arg->stride;
+    uint8_t * in = arg->in;
+    uint8_t * in2 = arg->in2;
+    uint8_t * out = arg->out;
+    uint8_t * out2 = arg->out2;
+    int * bicubicWeights = arg->bicubicWeights;
+    uint8_t blackLevel = arg->blackLevel;
+    
+    {
+        double a,b,c,d,e,f,g,j,a2,b2,c2,u,v,aa,bb,de,sde,v1,v2,u1,u2;
+        de=0.0;v1=1000.0;v2=1000.0;
+        for (int y=ystart; y<h; y+=yincr)
+        {
+            for (int x=0; x<w; x++)
+            {
+                a=xs[0]-x;
+                b=xs[1]-xs[0];
+                c=xs[2]-xs[0];
+                d=xs[3]-xs[1]-(xs[2]-xs[0]);
+                
+                e=ys[0]-y;
+                f=ys[1]-ys[0];
+                g=ys[2]-ys[0];
+                j=ys[3]-ys[1]-(ys[2]-ys[0]);
+                
+                a2=g*d-j*c; b2=e*d-f*c-j*a+g*b; c2=e*b-f*a;
+                
+                if ((fabs(a2*c2*c2/(b2*b2*b2))< 0.1/w) && (fabs(a2)<1.0))
+                {
+                    v1 = (b2!=0.0) ? -c2/b2 : 1000.0;
+                    v2=1000.0;
+                }
+                else
+                {
+                    de=b2*b2-4.0*a2*c2;
+                    if (de>=0.0)
+                    {
+                        sde=sqrt(de);
+                        v1=(-b2+sde)/2.0/a2;
+                        v2=(-b2-sde)/2.0/a2;
+                    }
+                    else
+                    {
+                        v1=1001.0;
+                        v2=1001.0;
+                    }
+                }
+                aa=b+d*v1; bb=f+j*v1;
+                if (fabs(aa)>fabs(bb))
+                    u1 = (aa!=0.0) ? -(a+c*v1)/aa : 1000.0;
+                else
+                    u1 = (bb!=0.0) ? -(e+g*v1)/bb : 1000.0;
+                aa=b+d*v2; bb=f+j*v2;
+                if (fabs(aa)>fabs(bb))
+                    u2 = (aa!=0.0) ? -(a+c*v2)/aa : 1000.0;
+                else
+                    u2 = (bb!=0.0) ? -(e+g*v2)/bb : 1000.0;
+                
+                if ((u1>=0.0)&&(u1<1.0)&&(v1>=0.0)&&(v1<1.0))
+                {
+                    u=u1;
+                    v=v1;
+                }
+                else
+                {
+                    if ((u2>=0.0)&&(u2<1.0)&&(v2>=0.0)&&(v2<1.0))
+                    {
+                        u=u2;
+                        v=v2;
+                    }
+                    else
+                    {
+                        u=1002.0;
+                        v=1002.0;
+                    }
+                }
+                
+                
+                if ((u>=0.0)&&(u<1.0)&&(v>=0.0)&&(v<1.0))
+                {
+                    u *= w;
+                    v *= h;
+                    int ui = std::floor(u);
+                    int vi = std::floor(v);
+                    int uf = (u-std::floor(u))*256.0 + 0.5;
+                    int vf = (v-std::floor(v))*256.0 + 0.5;
+                    if (uf > 255)
+                    {
+                        ui++;
+                        uf = 0;
+                    }
+                    if (vf > 255)
+                    {
+                        vi++;
+                        vf = 0;
+                    }
+                    if (ui >= w-1)
+                    {
+                        ui = w-2;
+                        uf = 255;
+                    }
+                    if (vi >= h-1)
+                    {
+                        vi = h-2;
+                        vf = 255;
+                    }
+
+                    switch(algo) {
+                        default:
+                        case 0:
+                                bilinear(w, h, stride, in, ui, vi, uf, vf, out + x + y*stride);
+                                if (in2 && out2)
+                                    bilinear(w, h, stride, in2, ui, vi, uf, vf, out2 + x + y*stride);
+                            break;
+                        case 1:
+                                bicubic(w, h, stride, in, ui, vi, uf, vf, bicubicWeights, out + x + y*stride);
+                                if (in2 && out2)
+                                    bicubic(w, h, stride, in2, ui, vi, uf, vf, bicubicWeights, out2 + x + y*stride);
+                            break;
+                    }
+
+                }
+                else
+                {
+                    out[x + y*stride] =  blackLevel;
+                    if (in2 && out2)
+                        out2[x + y*stride] =  blackLevel;
+                }
+            
+            }
+        }
+        
+    }
+    
+    pthread_exit(NULL);
+    return NULL;
+}
+
+/**
+    \fn ImageStabProcess_C
+*/
+void ADMVideoImageStab::ImageStabProcess_C(ADMImage *img, int w, int h, imageStab param, imageStab_buffers_t * buffers, bool * newScene, float * sceneDiff)
+{
+    if (!img || !buffers || !buffers->imgCopy) return;
+    if (!buffers->bicubicWeights || !buffers->motestp || !buffers->worker_threads || !buffers->worker_thread_args) return;
+    uint8_t * line;
+
+    if (param.algo > 1) param.algo = 1;
+    if (param.motionEstimation > 1) param.motionEstimation = 1;
+    if (param.smoothing < 0.0) param.smoothing = 0.0;
+    if (param.smoothing > 1.0) param.smoothing = 1.0;
+    if (param.gravity < 0.0) param.gravity = 0.0;
+    if (param.gravity > 1.0) param.gravity = 1.0;
+    if (param.sceneThreshold < 0.0) param.sceneThreshold = 0.0;
+    if (param.sceneThreshold > 1.0) param.sceneThreshold = 1.0;
+
+    unsigned int algo = param.algo;
+    unsigned int motionEstimation = param.motionEstimation;
+    float sceneThreshold = param.sceneThreshold;
+    double smoothing = param.smoothing;
+    double gravity = param.gravity;
+    
+    int ystride,ustride,vstride;
+    uint8_t * yptr, * uptr, * vptr;
+    float currChromaHist[64];
+    bool scdet = false;
+    int i,j,x,y;
+    
+    bool sameImage = (buffers->prevPts == img->Pts);
+    buffers->prevPts = img->Pts;
+
+    memset(currChromaHist, 0, 64*sizeof(float));
+    
+    if (buffers->prevChromaHist[0] < 0.0)
+        scdet = true;
+
+    // UV planes: get histograms
+    ustride=img->GetPitch(PLANAR_U);
+    uptr=img->GetWritePtr(PLANAR_U);
+    vstride=img->GetPitch(PLANAR_V);
+    vptr=img->GetWritePtr(PLANAR_V);
+    for(y=0;y<h/2;y++)	// 4:2:0
+    {
+        for (x=0;x<w/2;x++)
+        {
+            currChromaHist[uptr[x]/8 +  0]++;
+            currChromaHist[vptr[x]/8 + 32]++;
+        }
+        uptr+=ustride;
+        vptr+=vstride;
+    }
+    
+    if (!scdet)
+    {
+        float sum = 0.0;
+        for(i=0; i<64; i++)
+        {
+            sum += fabs(currChromaHist[i] - buffers->prevChromaHist[i]);
+        }
+        sum /= ((h/2) * (w/2));
+        sum=std::sqrt(sum/2);
+
+        if ((sceneThreshold < 1.0) && (sum > sceneThreshold))    // disable detect, if sceneThreshold set to max
+            scdet = true;
+
+        if (sceneDiff) *sceneDiff = sum;
+    }
+
+    memcpy(buffers->prevChromaHist, currChromaHist, 64*sizeof(float));
+
+    if (newScene) *newScene= scdet;
+    
+    if (sameImage)
+    {
+        if (newScene) *newScene= buffers->newSceneSameImage;
+        if (sceneDiff) *sceneDiff = buffers->sceneDiffSameImage;
+    } else {
+        if (newScene) buffers->newSceneSameImage = *newScene;
+        if (sceneDiff) buffers->sceneDiffSameImage = *sceneDiff;
+    }
+
+    if (!sameImage)
+        buffers->motestp->addNextImage(scdet ? NULL : img);
+
+    double xs[4],ys[4];
+    xs[0] = 0;
+    ys[0] = 0;
+    xs[1] = w-1;
+    ys[1] = 0;
+    xs[2] = 0;
+    ys[2] = h-1;
+    xs[3] = w-1;
+    ys[3] = h-1;
+    
+    double midx, midy;
+    midx = w-1;
+    midx /= 2.0;
+    midy = h-1;
+    midy /= 2.0;
+
+    if (!scdet)
+    {
+        if (!sameImage)
+            buffers->motestp->estimateMotion(motionEstimation);
+
+        double globalMotion[2];
+        double rotation;
+
+        buffers->motestp->getMotionParameters(globalMotion, &rotation);
+
+        double alpha;
+        double decay, decayr;
+        // smoothing [0 .. 0.5 .. 1] -~> [0.5 .. 0.1 .. 0.001]
+        alpha = 0.5 - std::sqrt(smoothing)/2.0;
+        if (alpha < 0.001)
+            alpha = 0.001;
+        if (param.autoGravity)
+        {
+            double hdisp,vdisp;
+            hdisp = buffers->last[0]/w;
+            vdisp = buffers->last[1]/h;
+            hdisp *= 4.0;
+            vdisp *= 4.0;
+            double displacement = std::sqrt(hdisp*hdisp + vdisp*vdisp);
+            decay = 1.0 - displacement;
+            if (decay < 0.0) decay = 0.0;
+            decay = decay*decay;
+            if (decay > 0.99)
+                decay = 0.99;
+            
+            decayr = 1.0 - std::fabs(buffers->last[2] * 2.0);
+            if (decayr < 0.0) decayr = 0.0;
+            decayr = decayr*decayr;
+            if (decayr > 0.99)
+                decayr = 0.99;
+        } else {
+            // gravity   [0 .. 0.5 .. 1] -~> [0.99 .. 0.9 .. 0.5]
+            decay = 1.0 - (gravity*gravity*gravity)/2.0;
+            if (decay > 0.99)
+                decay = 0.99;
+            decayr = decay;
+        }
+        
+        // filter
+        if (!sameImage)
+        {
+            buffers->hist[0] = alpha*globalMotion[0] + (1.0 - alpha)*buffers->hist[0];
+            buffers->hist[1] = alpha*globalMotion[1] + (1.0 - alpha)*buffers->hist[1];
+            buffers->hist[2] = alpha*rotation + (1.0 - alpha)*buffers->hist[2];
+        }
+        
+        globalMotion[0] -= buffers->hist[0];
+        globalMotion[1] -= buffers->hist[1];
+        rotation -= buffers->hist[2];
+        
+        globalMotion[0] *= -1.0;
+        globalMotion[1] *= -1.0;
+        rotation *= -1.0;
+        
+        if (sameImage)
+        {
+            globalMotion[0] += buffers->lastSameImage[0];
+            globalMotion[1] += buffers->lastSameImage[1];
+            rotation += buffers->lastSameImage[2];
+        } else {
+            globalMotion[0] += buffers->last[0];
+            globalMotion[1] += buffers->last[1];
+            rotation += buffers->last[2];
+        }
+        
+        if (!sameImage)
+        {
+            memcpy(buffers->lastSameImage, buffers->last, sizeof(double)*3);
+            buffers->last[0] = globalMotion[0] * decay;
+            buffers->last[1] = globalMotion[1] * decay;
+            buffers->last[2] = rotation * decayr;
+        }
+        
+        double newx,newy;
+        newx = std::cos(rotation)*globalMotion[0] - std::sin(rotation)*globalMotion[1];
+        newy = std::sin(rotation)*globalMotion[0] + std::cos(rotation)*globalMotion[1];
+        globalMotion[0] = newx;
+        globalMotion[1] = newy;
+
+        for (i=0; i<4; i++)
+        {
+            xs[i] -= midx;
+            ys[i] -= midy;
+            newx = std::cos(rotation)*xs[i] - std::sin(rotation)*ys[i];
+            newy = std::sin(rotation)*xs[i] + std::cos(rotation)*ys[i];
+            newx += midx;
+            newy += midy;
+            newx += globalMotion[0];
+            newy += globalMotion[1];
+            xs[i] = newx;
+            ys[i] = newy;
+        }
+    }
+    else
+    {
+        memset(buffers->hist, 0, sizeof(double)*3);
+        memset(buffers->last, 0, sizeof(double)*3);
+        memset(buffers->lastSameImage, 0, sizeof(double)*3);
+    }
+    
+    
+    for (int i=0; i<4; i++)
+    {
+        xs[i] = (xs[i]-midx)*param.zoom + midx;
+        ys[i] = (ys[i]-midy)*param.zoom + midy;
+    }
+
+    double xsh[4],ysh[4];
+    for (int i=0; i<4; i++)
+    {
+        xsh[i] = xs[i]/2.0;
+        ysh[i] = ys[i]/2.0;
+    }
+
+    uint8_t * rplanes[3];
+    uint8_t * wplanes[3];
+    int strides[3];
+
+    buffers->imgCopy->duplicate(img);
+    buffers->imgCopy->GetPitches(strides);
+    buffers->imgCopy->GetWritePlanes(rplanes);
+    img->GetWritePlanes(wplanes);
+    
+    int totaltr = 0;
+    
+    for (int tr=0; tr<buffers->threads; tr++)
+    {
+        buffers->worker_thread_args[totaltr].w = w;
+        buffers->worker_thread_args[totaltr].h = h;
+        buffers->worker_thread_args[totaltr].ystart = tr;
+        buffers->worker_thread_args[totaltr].yincr = buffers->threads;
+        buffers->worker_thread_args[totaltr].algo = algo;
+        buffers->worker_thread_args[totaltr].xs = xs;
+        buffers->worker_thread_args[totaltr].ys = ys;
+        buffers->worker_thread_args[totaltr].blackLevel = 0;
+        buffers->worker_thread_args[totaltr].stride = strides[0];
+        buffers->worker_thread_args[totaltr].in = rplanes[0];
+        buffers->worker_thread_args[totaltr].in2 = NULL;
+        buffers->worker_thread_args[totaltr].out = wplanes[0];
+        buffers->worker_thread_args[totaltr].out2 = NULL;
+        buffers->worker_thread_args[totaltr].bicubicWeights = buffers->bicubicWeights;
+        totaltr++;
+    }
+
+    for (int tr=0; tr<buffers->threadsUV; tr++)
+    {
+        buffers->worker_thread_args[totaltr].w = w/2;
+        buffers->worker_thread_args[totaltr].h = h/2;
+        buffers->worker_thread_args[totaltr].ystart = tr;
+        buffers->worker_thread_args[totaltr].yincr = buffers->threadsUV;
+        buffers->worker_thread_args[totaltr].algo = algo;
+        buffers->worker_thread_args[totaltr].xs = xsh;
+        buffers->worker_thread_args[totaltr].ys = ysh;
+        buffers->worker_thread_args[totaltr].blackLevel = 128;
+        buffers->worker_thread_args[totaltr].stride = strides[1];
+        buffers->worker_thread_args[totaltr].in = rplanes[1];
+        buffers->worker_thread_args[totaltr].in2 = rplanes[2];
+        buffers->worker_thread_args[totaltr].out = wplanes[1];
+        buffers->worker_thread_args[totaltr].out2 = wplanes[2];
+        buffers->worker_thread_args[totaltr].bicubicWeights = buffers->bicubicWeights;
+        totaltr++;
+    }
+
+    for (int tr=0; tr<totaltr; tr++)
+    {
+        pthread_create( &buffers->worker_threads[tr], NULL, worker_thread, (void*) &buffers->worker_thread_args[tr]);
+    }
+    // work in thread workers...
+    for (int tr=0; tr<totaltr; tr++)
+    {
+        pthread_join( buffers->worker_threads[tr], NULL);
+    }
+
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoImageStab::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getImageStab(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoImageStab::getConfiguration(void)
+{
+    static char s[512];
+    const char * algo=NULL;
+    const char * motionEstimation=NULL;
+    switch(_param.algo) {
+        default:
+        case 0: algo="Bilinear";
+            break;
+        case 1: algo="Bicubic";
+            break;
+        case 2: algo="Lanczos";
+            break;
+    }
+    
+    switch(_param.motionEstimation) {
+        default:
+        case 0: motionEstimation="Accurate";
+            break;
+        case 1: motionEstimation="Fast";
+            break;
+    }
+    
+    char grav[16];
+    if (_param.autoGravity)
+        strcpy(grav, "auto");
+    else
+        snprintf(grav,15,"%.2f",_param.gravity);
+
+    snprintf(s,511,"Smoothing: %.2f, Gravity: %s, Scene threshold: %.2f, %s interpolation, Zoom: %.02f, %s motion estimation", _param.smoothing, grav, _param.sceneThreshold, algo, _param.zoom, motionEstimation);
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoImageStab::ADMVideoImageStab(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,imageStab_param,&_param))
+    {
+        // Default value
+        _param.smoothing=0.5;
+        _param.gravity=0.5;
+        _param.autoGravity=true;
+        _param.sceneThreshold=0.5;
+        _param.zoom=1;
+        _param.algo = 0;
+        _param.motionEstimation = 0;
+    }
+    
+    ImageStabCreateBuffers(info.width,info.height, &(_buffers));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoImageStab::update(void)
+{
+}
+/**
+    \fn dtor
+*/
+ADMVideoImageStab::~ADMVideoImageStab()
+{
+    ImageStabDestroyBuffers(&(_buffers));
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoImageStab::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, imageStab_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoImageStab::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, imageStab_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoImageStab::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    ImageStabProcess_C(image,info.width,info.height,_param, &(_buffers), NULL, NULL);
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/ADM_vidImageStab.h Added

@@ -0,0 +1,89 @@
+/***************************************************************************
+                          ImageStab filter
+    Algorithm:
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "ADM_default.h"
+#include "ADM_threads.h"
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+#include "ADM_coreVideoFilter.h"
+#include "motest.h"
+
+#define MOTION_ESTIMATION_CONTRAST_THRESHOLD	(16)
+/**
+    \class ADMVideoImageStab
+*/
+class  ADMVideoImageStab:public ADM_coreVideoFilter
+{
+  public:
+    typedef struct {
+        int         w,h;
+        int         ystart, yincr;
+        int         algo;
+        double *    xs;
+        double *    ys;
+        int         stride;
+        uint8_t *   in;
+        uint8_t *   in2;
+        uint8_t *   out;
+        uint8_t *   out2;
+        int *       bicubicWeights;
+        uint8_t     blackLevel;
+    } worker_thread_arg;
+
+    typedef struct {
+        uint64_t              prevPts;
+        ADMImage *            imgCopy;
+        int *                 bicubicWeights;
+        float                 prevChromaHist[64];
+        motest *              motestp;
+        double                hist[3];
+        double                last[3];
+        double                lastSameImage[3];
+        bool                  newSceneSameImage;
+        float                 sceneDiffSameImage;
+        int threads;
+        int threadsUV;
+        pthread_t  * worker_threads;
+        worker_thread_arg * worker_thread_args;
+    } imageStab_buffers_t;
+
+  protected:
+    void                  update(void);
+    imageStab             _param;
+    imageStab_buffers_t   _buffers;
+    static void           bilinear(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, uint8_t * out);
+    static void           bicubic(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, int * weights, uint8_t * out);
+    
+
+    static void * worker_thread( void *ptr );
+    
+  public:
+    ADMVideoImageStab(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoImageStab();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface
+
+    static void ImageStabCreateBuffers(int w, int h, imageStab_buffers_t * buffers);
+    static void ImageStabDestroyBuffers(imageStab_buffers_t * buffers);
+    static void ImageStabProcess_C(ADMImage *img, int w, int h, imageStab param, imageStab_buffers_t * buffers, bool * newScene, float * sceneDiff);
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/cli/DIA_imageStab.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/imageStab.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/imageStab.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/imageStab_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/imageStab_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/motest.cpp Added

@@ -0,0 +1,700 @@
+/***************************************************************************
+                          Motion estimation
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 "motest.h"
+#include "prefs.h"
+#include <cmath>
+
+#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+        #define CAN_DO_INLINE_X86_ASM
+#endif
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+motest::motest(int width, int height, int minContrast)
+{
+    frameW = width;
+    frameH = height;
+    frameA = new ADMImageDefault(width, height);
+    frameB = new ADMImageDefault(width, height);
+    pyramidA = new ADMImage* [MOTEST_MAX_PYRAMID_LEVELS];
+    pyramidB = new ADMImage* [MOTEST_MAX_PYRAMID_LEVELS];
+    pyramidWA = new ADMImage* [MOTEST_MAX_PYRAMID_LEVELS];
+    upScalers   = new ADMColorScalerFull* [MOTEST_MAX_PYRAMID_LEVELS];
+    downScalers = new ADMColorScalerFull* [MOTEST_MAX_PYRAMID_LEVELS];
+    
+    int lv,wp,hp,pw,ph;
+    lv = 0;
+    wp = frameW;
+    hp = frameH;
+    do {
+        pw = wp;
+        ph = hp;
+        if ((wp < 32) || (hp < 32))
+            break;
+        pyramidA[lv] = new ADMImageDefault(wp, hp);
+        pyramidB[lv] = new ADMImageDefault(wp, hp);
+        pyramidWA[lv] = new ADMImageDefault(wp, hp);
+        
+        wp = ((wp /4) * 2);
+        hp = ((hp /4) * 2);
+        upScalers[lv] = new ADMColorScalerFull(ADM_CS_LANCZOS,pw,ph,wp,hp,ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+        downScalers[lv] = new ADMColorScalerFull(ADM_CS_LANCZOS,wp,hp,pw,ph,ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+        lv += 1;
+        if (lv >= MOTEST_MAX_PYRAMID_LEVELS)
+            break;
+    } while(1);
+    
+    pyramidLevels = lv;
+    
+    threads = ADM_cpu_num_processors();
+    if (threads < 1)
+        threads = 1;
+    if (threads > 64)
+        threads = 64;
+        
+    me_threads1 = new pthread_t [threads];
+    me_threads2 = new pthread_t [threads];
+    worker_thread_args1 = new worker_thread_arg [threads];
+    worker_thread_args2 = new worker_thread_arg [threads];
+    
+    validPrevFrame = 0;
+    contrastThreshold = minContrast;
+    
+    motionMap[0] = new int [(width/2)*(height/2)];
+    motionMap[1] = new int [(width/2)*(height/2)];
+    contrastMap = new int [(width/2)*(height/2)];
+    angleMap = new double [(width/2)*(height/2)];
+    for (int j=0; j<(height/2); j++)
+    {
+        for (int i=0; i<(width/2); i++)
+        {
+            angleMap[j*(width/2) + i] = std::atan2(j-(height/4), i-(width/4));
+        }
+    }
+
+}
+
+
+motest::~motest()
+{
+    delete frameA;
+    delete frameB;
+
+    for (int lv=0; lv<pyramidLevels; lv++)
+    {
+        delete upScalers[lv];
+        delete downScalers[lv];
+        delete pyramidA[lv];
+        delete pyramidB[lv];
+        delete pyramidWA[lv];
+    }
+    
+    
+    delete [] upScalers;
+    delete [] downScalers;
+    delete [] pyramidA;
+    delete [] pyramidB;
+    delete [] pyramidWA;
+    delete [] me_threads1;
+    delete [] me_threads2;
+    delete [] worker_thread_args1;
+    delete [] worker_thread_args2;
+    delete [] motionMap[0];
+    delete [] motionMap[1];
+    delete [] contrastMap;
+    delete [] angleMap;
+}
+
+void motest::addNextImage(ADMImage * img)
+{
+    if (img == NULL)
+    {
+        validPrevFrame = 0;
+        return;
+    }
+    if (pyramidLevels < 1)
+        return;
+    if ((frameW < 128) || (frameH < 128))    // can not handle small images
+        return;
+    if (validPrevFrame < 2)
+        validPrevFrame++;
+
+    ADMImage * swap;
+    swap = frameB;
+    frameB = frameA;
+    frameA = swap;
+    frameB->duplicateFull(img);
+    
+    ADMImage ** swapy;
+    swapy = pyramidB;
+    pyramidB = pyramidA;
+    pyramidA = swapy;
+    pyramidB[0]->duplicateFull(img);
+
+    for (int lv=0; lv<(pyramidLevels-1); lv++)
+    {
+        upScalers[lv]->convertImage(pyramidB[lv], pyramidB[lv+1]);
+    }
+}
+
+int motest::sad(uint8_t * p1, uint8_t * p2, int stride, int x1, int y1, int x2, int y2)
+{
+    volatile int tmp = 0;
+    unsigned int a,b,i,j;
+    uint8_t * ptrb1, * ptrb2, * ptr1, * ptr2;
+
+    x1 -= 3;
+    y1 -= 3;
+    x2 -= 3;
+    y2 -= 3;
+    
+    ptrb1 = p1 + x1 + y1*stride;
+    ptrb2 = p2 + x2 + y2*stride;
+    
+#ifdef CAN_DO_INLINE_X86_ASM
+ if(CpuCaps::hasMMX())
+ {
+    __asm__(
+    ADM_ASM_ALIGN16
+    "pxor %%mm7,%%mm7\n"
+    ::);
+    
+    uint8_t * ptrb3, * ptrb4;
+    ptrb3 = ptrb1 + stride;
+    ptrb4 = ptrb2 + stride;
+
+    for (j=0; j<4; j++)
+    {
+        __asm__(
+        ADM_ASM_ALIGN16
+        "movq (%0),%%mm0 \n"
+        "movq (%1),%%mm1 \n"
+        "psadbw %%mm1,%%mm0\n"
+        "movq (%2),%%mm2 \n"
+        "movq (%3),%%mm3 \n"
+        "psadbw %%mm3,%%mm2\n"
+        "paddd %%mm0,%%mm7 \n"
+        "paddd %%mm2,%%mm7 \n"
+        : : "r" (ptrb1) , "r" (ptrb2) , "r" (ptrb3) , "r" (ptrb4)
+        );
+        ptrb1 += stride*2;
+        ptrb2 += stride*2;
+        ptrb3 += stride*2;
+        ptrb4 += stride*2;
+    }
+    
+    __asm__(
+    ADM_ASM_ALIGN16
+    "movd %%mm7,(%0)\n"
+    "emms \n"
+    :: "r" (&tmp)
+    );
+ }
+ else
+#endif 
+ {
+    for (j=0; j<8; j++)
+    {
+            ptr1 = ptrb1;
+            ptr2 = ptrb2;
+            ptrb1 += stride;
+            ptrb2 += stride;
+        //for (i=0; i<8; i++)
+        //{ unroll ->
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+        //}
+    }
+ }
+    return tmp;
+}
+
+
+void *motest::me_worker_thread( void *ptr )
+{
+    worker_thread_arg * arg = (worker_thread_arg*)ptr;
+    int lv = arg->lv;
+    uint8_t ** plA = arg->plA;
+    uint8_t ** plB = arg->plB;
+    uint8_t ** plW = arg->plW;
+    int * strides = arg->strides;
+    uint32_t w = arg->w;
+    uint32_t h = arg->h;
+    uint32_t ystart = arg->ystart;
+    uint32_t yincr = arg->yincr;
+    unsigned int speedup = arg->speedup;
+    int * motionMap[2];
+    motionMap[0] = arg->motionMap[0];
+    motionMap[1] = arg->motionMap[1];
+    int * contrastMap = arg->contrastMap;
+    int x,y,bx,by;
+
+    int penaltyTable[MOTEST_SEARCH_RADIUS+2][MOTEST_SEARCH_RADIUS+2];
+
+    for (y=0; y<(MOTEST_SEARCH_RADIUS+2); y++)
+    {
+        for (x=0; x<(MOTEST_SEARCH_RADIUS+2); x++)
+        {
+            penaltyTable[y][x] = std::round(std::pow((y*y + x*x), 1/3.)  * 256);  // add distance penalty <-- this looks like better than sqrt or double sqrt
+        }
+    }
+    w /= 2;
+    h /= 2;
+    
+    for (y=ystart; y<h; y+=yincr)    // line-by-line threading faster than partitioning
+    {
+        if ((lv==0)&&(speedup>0))
+        {
+            if (y%8)
+                continue;
+        }
+        if ((lv==1)&&(speedup>0))
+        {
+            if (y%4)
+                continue;
+        }
+        for (x=0; x<w; x++)
+        {
+            if ((lv==0)&&(speedup>0))
+            {
+                if (x%8)
+                    continue;
+            }
+            if ((lv==1)&&(speedup>0))
+            {
+                if (x%4)
+                    continue;
+            }
+            
+            int initX = (unsigned int)plW[1][y*strides[1]+x];
+            int initY = (unsigned int)plW[2][y*strides[2]+x];
+            initX -= 128;
+            initY -= 128;
+            initX *= 2;
+            initY *= 2;
+            initX += x*2;
+            initY += y*2;
+            
+            if ((initX < 0+3) || (initX >= w*2-1-3) || (initY < 0+3) || (initY >= h*2-1-3))
+            {
+                initX -= x*2;
+                initY -= y*2;
+                initX += 128;
+                initY += 128;
+                plW[1][y*strides[1]+x] = initX;
+                plW[2][y*strides[2]+x] = initY;
+                continue;
+            }
+            
+            if (lv==0)
+            {
+                int pix, pmin=255,pmax=0;
+                bool fail=false;
+                for (by=(y*2-3);by<=(y*2+4);by++)
+                {
+                    if ((by < 0+3) || (by >= (h*2-1)-3))
+                    {
+                        fail = true;
+                        break;
+                    }
+                    for (bx=(x*2-3);bx<=(x*2+4);bx++)
+                    {
+                        if ((bx < 0+3) || (bx >= (w*2-1)-3))
+                        {
+                            fail = true;
+                            break;
+                        }
+                        pix = plA[0][by*strides[0]+bx];
+                        if (pmin > pix)
+                            pmin = pix;
+                        if (pmax < pix)
+                            pmax = pix;
+                    }
+                    if (fail)
+                        break;
+                }
+                
+                if (fail)
+                    continue;
+
+                contrastMap[y*w+x] = (pmax - pmin);
+            }
+            
+            int best[2];
+            best[0] = initX;
+            best[1] = initY;
+            int sad0 = sad(plA[0], plB[0], strides[0], x*2, y*2, initX, initY);
+            
+            int radius = MOTEST_SEARCH_RADIUS + ((lv > 0) ? 1:0);
+            for (by=(initY-radius);by<=(initY+radius);by++)
+            {
+                if (by < 0+3)
+                    continue;
+                if (by >= (h*2-1)-3)
+                    continue;
+                for (bx=(initX-radius);bx<=(initX+radius);bx++)
+                {
+                    if (bx < 0+3)
+                        continue;
+                    if (bx >= (w*2-1)-3)
+                        continue;
+                    if ((bx == initX) && (by == initY))
+                        continue;
+                    
+                    int sadc = sad(plA[0], plB[0], strides[0], x*2, y*2, bx, by);
+                    sadc = (sadc * penaltyTable[abs(by-initY)][abs(bx-initX)]) / 256;
+                    
+                    if (sadc < sad0)
+                    {
+                        sad0 = sadc;
+                        best[0] = bx;
+                        best[1] = by;
+                    }
+                }
+            }
+            
+            best[0] -= x*2;
+            best[1] -= y*2;
+            if (lv==0)
+            {
+                motionMap[0][y*w+x] = best[0];
+                motionMap[1][y*w+x] = best[1];
+            }
+            else
+            {
+                best[0] += 128;
+                best[1] += 128;
+                for (int bl=0; bl<2; bl++)
+                {
+                    if (best[bl] < 16)
+                        best[bl] = 16;
+                    if (best[bl] > 240)
+                        best[bl] = 240;
+                }
+                plW[1][y*strides[1]+x] = best[0];
+                plW[2][y*strides[2]+x] = best[1];
+                if ((lv==1)&&(speedup>0))
+                {
+                    for (by=(y-2);by<=(y+2);by++)
+                    {
+                        if (by < 0)
+                            continue;
+                        if (by >= h)
+                            continue;
+                        for (bx=(x-2);bx<=(x+2);bx++)
+                        {
+                            if (bx < 0)
+                                continue;
+                            if (bx >= w)
+                                continue;
+                            if ((bx == x) && (by == y))
+                                continue;
+                            plW[1][by*strides[1]+bx] = best[0];
+                            plW[2][by*strides[2]+bx] = best[1];
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    pthread_exit(NULL);
+    return NULL;
+}
+
+void *motest::spf_worker_thread( void *ptr )
+{
+    worker_thread_arg * arg = (worker_thread_arg*)ptr;
+    int lv = arg->lv;
+    uint8_t ** plA = arg->plA;
+    uint8_t ** plB = arg->plB;
+    uint8_t ** plW = arg->plW;
+    int * strides = arg->strides;
+    uint32_t w = arg->w;
+    uint32_t h = arg->h;
+    uint32_t ystart = arg->ystart;
+    uint32_t yincr = arg->yincr;
+    int x,y,bx,by;
+
+    w /= 2;
+    h /= 2;
+    
+    // threat edges (motion estimate not working on the edges)
+    if (lv > 0)
+    {
+        // top edge
+        for (int p=1; p<3; p++)
+        {
+            memcpy(plW[p]+0*strides[p], plW[p]+4*strides[p], w);
+            memcpy(plW[p]+1*strides[p], plW[p]+4*strides[p], w);
+            memcpy(plW[p]+2*strides[p], plW[p]+4*strides[p], w);
+            memcpy(plW[p]+3*strides[p], plW[p]+4*strides[p], w);
+        }
+        // bottom edge
+        for (int p=1; p<3; p++)
+        {
+            memcpy(plW[p]+(h-4)*strides[p], plW[p]+(h-5)*strides[p], w);
+            memcpy(plW[p]+(h-3)*strides[p], plW[p]+(h-5)*strides[p], w);
+            memcpy(plW[p]+(h-2)*strides[p], plW[p]+(h-5)*strides[p], w);
+            memcpy(plW[p]+(h-1)*strides[p], plW[p]+(h-5)*strides[p], w);
+        }
+        // left-right edges
+        for (int p=1; p<3; p++)
+        {
+            for (y=0; y<h; y++)
+            {
+                for (x=0;x<4;x++)
+                    plW[p][x] = plW[p][4];
+                for (x=(w-4);x<w;x++)
+                    plW[p][x] = plW[p][w-5];
+            }
+        }
+
+        // spatial filter
+        for (y=0; y<h; y++)
+        {
+            for (x=0; x<w; x++)
+            {
+                unsigned int sumX, sumY, cnt;
+                sumX = 0;
+                sumY = 0;
+                cnt = 0;
+                for (by=y-1;by<=y+1;by++)
+                {
+                    if (by < 0)
+                        continue;
+                    if (by >= h)
+                        continue;
+                    for (bx=x-1;bx<=x+1;bx++)
+                    {
+                        if (bx < 0)
+                            continue;
+                        if (bx >= w)
+                            continue;
+                        sumX += plW[1][bx + by*strides[1]];
+                        sumY += plW[2][bx + by*strides[2]];
+                        cnt += 1;
+                    }
+                }
+                sumX /= cnt;
+                sumY /= cnt;
+                plA[1][x + y*strides[1]] = sumX;
+                plA[2][x + y*strides[2]] = sumY;
+            }
+        }
+        for (y=0; y<h; y++)
+        {
+            for (x=0; x<w; x++)
+            {
+                plW[1][x + y*strides[1]] = plA[1][x + y*strides[1]];
+                plW[2][x + y*strides[2]] = plA[2][x + y*strides[2]];
+            }
+        }
+    }
+
+    pthread_exit(NULL);
+    return NULL;
+}
+
+    
+    
+void motest::estimateMotion(unsigned int speed)
+{
+    if (validPrevFrame < 2)
+        return;
+    if ((frameW < 128) || (frameH < 128))    // can not handle small images
+        return;
+
+    uint8_t * planes[3];
+    uint8_t * wplanes[3];
+    int strides[3];
+    uint32_t w,h;
+
+    pyramidWA[pyramidLevels-1]->getWidthHeight(&w,&h);
+    w /= 2;
+    h /= 2;
+    pyramidWA[pyramidLevels-1]->GetPitches(strides);
+
+    pyramidWA[pyramidLevels-1]->GetWritePlanes(wplanes);
+    for (int y = 0; y<h; y++)
+    {
+        memset(wplanes[1] + y*strides[1], 128, w);
+        memset(wplanes[2] + y*strides[2], 128, w);
+    }
+
+    memset(contrastMap, 0, sizeof(int)*(frameW/2)*(frameH/2));
+
+
+    for (int lv=pyramidLevels-1; lv>=0; lv--)
+    {
+        {
+            uint8_t * plW[3];
+            int strides[3];
+            uint32_t w,h;
+            
+            
+            pyramidWA[lv]->GetWritePlanes(plW);
+            pyramidA[lv]->GetPitches(strides);
+            pyramidA[lv]->getWidthHeight(&w, &h);
+            for (int y=0; y<h; y++)
+                memset(plW[0]+y*strides[0], 128, w);
+        }
+        
+        for (int tr=0; tr<threads; tr++)
+        {
+            worker_thread_args1[tr].lv = lv;
+            pyramidA[lv]->GetWritePlanes(worker_thread_args1[tr].plA);
+            pyramidB[lv]->GetWritePlanes(worker_thread_args1[tr].plB);
+            pyramidWA[lv]->GetWritePlanes(worker_thread_args1[tr].plW);
+            pyramidA[lv]->GetPitches(worker_thread_args1[tr].strides);
+            pyramidA[lv]->getWidthHeight(&worker_thread_args1[tr].w, &worker_thread_args1[tr].h);
+            worker_thread_args1[tr].ystart = tr;
+            worker_thread_args1[tr].yincr = threads;
+            worker_thread_args1[tr].speedup = speed;
+            worker_thread_args1[tr].contrastMap = contrastMap;
+            worker_thread_args1[tr].motionMap[0] = motionMap[0];
+            worker_thread_args1[tr].motionMap[1] = motionMap[1];
+        }
+        for (int tr=0; tr<threads; tr++)
+        {
+            pthread_create( &me_threads1[tr], NULL, me_worker_thread, (void*) &worker_thread_args1[tr]);
+        }
+        
+        // work in thread workers...
+        
+        for (int tr=0; tr<threads; tr++)
+        {
+            pthread_join( me_threads1[tr], NULL);
+        }
+        
+        // spatial filters (reuse pthread and arg variables)
+        pthread_create( &me_threads1[0], NULL, spf_worker_thread, (void*) &worker_thread_args1[0]);
+        // work in thread workers...
+        pthread_join( me_threads1[0], NULL);
+
+        if (lv>0)
+        {
+            downScalers[lv-1]->convertImage(pyramidWA[lv], pyramidWA[lv-1]);
+        }
+    }
+}
+
+void motest::getMotionParameters(double * global, double * rotation)
+{
+    if ((!global) || (!rotation))
+        return;
+    memset(global, 0, 2*sizeof(double));
+    *rotation = 0.0;
+    
+    if (validPrevFrame < 2)
+        return;
+    if ((frameW < 128) || (frameH < 128))    // can not handle small images
+        return;
+        
+    int x,y,w,h;
+    w = frameW/2;
+    h = frameH/2;
+    
+    int count;
+    double avgx = 0.0;
+    double avgy = 0.0;
+    count = 0;
+    for(y=0; y<h; y++)
+    {
+        for(x=0; x<w; x++)
+        {
+            if (contrastMap[y*w+x] >= contrastThreshold)
+            {
+                avgx += motionMap[0][x + y*w];
+                avgy += motionMap[1][x + y*w];
+                count++;
+            }
+        }
+    }
+    if (count == 0)
+        return;
+    global[0] = avgx / count;
+    global[1] = avgy / count;
+
+    double resx,resy,angle,avgangle;
+    int mx,my;
+    avgangle = 0.0;
+    count = 0;
+    for(y=0; y<h; y++)
+    {
+        for(x=0; x<w; x++)
+        {
+            if ((y > (h/4)) && (y < (h-h/4)))
+            {
+                if (x == w/4)
+                    x = w-w/4;    // skip center
+            }
+            if (contrastMap[y*w+x] >= contrastThreshold)
+            {
+                
+                resx = motionMap[0][x + y*w];
+                resy = motionMap[1][x + y*w];
+                resx -= global[0];
+                resy -= global[1];
+                mx = std::round(resx/2);
+                my = std::round(resy/2);
+                mx += x;
+                my += y;
+                if ((mx < 0) || (mx >= w) || (my < 0) || (my >= h))
+                    continue;
+                angle = angleMap[my*w+mx] - angleMap[y*w+x];
+                if (angle > M_PI)
+                    angle -= 2.0*M_PI;
+                else
+                if (angle < -1.0*M_PI)
+                    angle += 2.0*M_PI;
+                if ((angle > -1.0*(M_PI/8)) && (angle < (M_PI/8)))    // limit to between +- 22.5 degree
+                {
+                    avgangle += angle;
+                    count++;
+                }
+            }
+        }
+    }
+    if (count == 0)
+        return;
+    *rotation = avgangle / count;
+}
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/motest.h Added

@@ -0,0 +1,74 @@
+/***************************************************************************
+                          Motion estimation
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
+#pragma once
+
+#include "ADM_default.h"
+#include "ADM_threads.h"
+#include "ADM_image.h"
+
+#define MOTEST_MAX_PYRAMID_LEVELS  (7)
+#define MOTEST_SEARCH_RADIUS       (2)
+
+class  motest
+{
+
+  protected:
+    uint32_t    threads;
+    int         frameW, frameH;
+    int         validPrevFrame;
+    int         pyramidLevels;
+    int         contrastThreshold;
+    ADMImage *  frameA;
+    ADMImage *  frameB;
+    ADMImage ** pyramidA;
+    ADMImage ** pyramidB;
+    ADMImage ** pyramidWA;
+    ADMColorScalerFull ** upScalers;
+    ADMColorScalerFull ** downScalers;
+    int *       motionMap[2];
+    int *       contrastMap;
+    double *    angleMap;
+    
+    typedef struct {
+        int lv;
+        uint8_t * plA[3];
+        uint8_t * plB[3];
+        uint8_t * plW[3];
+        int strides[3];
+        uint32_t w,h;
+        uint32_t ystart, yincr;
+        unsigned int speedup;
+        int * motionMap[2];
+        int * contrastMap;
+    } worker_thread_arg;
+    
+    pthread_t  * me_threads1;
+    pthread_t  * me_threads2;
+    worker_thread_arg * worker_thread_args1;
+    worker_thread_arg * worker_thread_args2;
+    
+    static void *me_worker_thread( void *ptr );
+    static void *spf_worker_thread( void *ptr );
+    
+    static int sad(uint8_t * p1, uint8_t * p2, int stride, int x1, int y1, int x2, int y2);
+
+  public:
+    motest(int width, int height, int minContrast);
+    ~motest();
+    
+    void addNextImage(ADMImage * img);
+    void estimateMotion(unsigned int speed);
+    void getMotionParameters(double * global, double * rotation);
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/qt4/DIA_flyImageStab.cpp Added

@@ -0,0 +1,62 @@
+/**/
+/***************************************************************************
+                          DIA_flyImageStab
+                             -------------------
+
+			   Ui for ImageStab
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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_image.h"
+#include "DIA_flyImageStab.h"
+
+/************* COMMON PART *********************/
+
+/**
+ */
+flyImageStab::flyImageStab (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+{
+    newScene = false;
+    sceneDiff = 0.;
+    ADMVideoImageStab::ImageStabCreateBuffers(width,height,&buffers);
+}
+/**
+ * 
+ */
+flyImageStab::~flyImageStab()
+{
+    ADMVideoImageStab::ImageStabDestroyBuffers(&buffers);
+}
+
+uint8_t  flyImageStab::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyImageStab::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoImageStab::ImageStabProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),param, &buffers, &newScene, &sceneDiff);
+
+    refreshIndicator();
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/qt4/DIA_flyImageStab.h Added

@@ -0,0 +1,44 @@
+/***************************************************************************
+  \fn     DIA_flyImageStab
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for imageStab
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 DIA_FLYIMAGESTAB_H
+#define DIA_FLYIMAGESTAB_H
+#include "imageStab.h"
+#include "ADM_vidImageStab.h"
+#include "DIA_flyDialogQt4.h"
+/**
+    \class flyImageStab
+*/
+class flyImageStab : public ADM_flyDialogYuv
+{
+  private:
+    ADMVideoImageStab::imageStab_buffers_t  buffers;
+    bool       newScene;
+    float      sceneDiff;
+
+    void       refreshIndicator(void);
+
+  public:
+    imageStab  param;
+
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyImageStab (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+              ~flyImageStab();
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/qt4/Q_imageStab.cpp Added

@@ -0,0 +1,238 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include <QPalette>
+#include "ADM_default.h"
+#include "Q_imageStab.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidImageStab.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_imageStabWindow::Ui_imageStabWindow(QWidget *parent, imageStab *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyImageStab( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(imageStab));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(Smoothing,100,2)
+        SPINNER(Gravity,100,2)
+        SPINNER(Zoom,100,2)
+        SPINNER(SceneThreshold,100,2)
+        
+        connect(ui.comboBoxAlgo, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+        connect(ui.comboBoxMotionEstimation, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+
+#define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        CHKBOX(AutoGravity);
+
+        QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+        setModal(true);
+}
+void Ui_imageStabWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_imageStabWindow::gather(imageStab *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(imageStab));
+}
+Ui_imageStabWindow::~Ui_imageStabWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL;
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+
+void Ui_imageStabWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+/**
+ * \fn reset
+ */
+void Ui_imageStabWindow::reset( bool f )
+{
+    myFly->param.smoothing=0.5;
+    myFly->param.gravity=0.5;
+    myFly->param.autoGravity=true;
+    myFly->param.sceneThreshold=0.5;
+    myFly->param.zoom=1;
+    myFly->param.algo = 0;
+    myFly->param.motionEstimation = 0;
+    lock++;
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_imageStabWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_imageStabWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSLIDER(x) w->horizontalSlider##x
+#define MYCHKBOX(x) w->checkBox##x
+#define UPLOADSLIDER(x, value) \
+        w->horizontalSlider##x->blockSignals(true); \
+        w->horizontalSlider##x->setValue(value); \
+        w->horizontalSlider##x->blockSignals(false);
+//************************
+uint8_t flyImageStab::upload()
+{
+    Ui_imageStabDialog *w=(Ui_imageStabDialog *)_cookie;
+    MYCOMBOX(Algo)->setCurrentIndex(param.algo);
+    MYCOMBOX(MotionEstimation)->setCurrentIndex(param.motionEstimation);
+    UPLOADSLIDER(Smoothing, (int)round(param.smoothing*100.0));
+    UPLOADSLIDER(Gravity, (int)round(param.gravity*100.0));
+    UPLOADSLIDER(Zoom, (int)round(param.zoom*100.0));
+    UPLOADSLIDER(SceneThreshold, (int)round(param.sceneThreshold*100.0));
+    MYCHKBOX(AutoGravity)->setChecked(param.autoGravity);
+    MYSLIDER(Gravity)->setEnabled(!param.autoGravity);
+
+    return 1;
+}
+uint8_t flyImageStab::download(void)
+{
+    int reject=0;
+    Ui_imageStabDialog *w=(Ui_imageStabDialog *)_cookie;
+    param.algo=MYCOMBOX(Algo)->currentIndex();
+    param.motionEstimation=MYCOMBOX(MotionEstimation)->currentIndex();
+    param.smoothing = ((float)MYSLIDER(Smoothing)->value()) / 100.0;
+    param.gravity = ((float)MYSLIDER(Gravity)->value()) / 100.0;
+    param.zoom = ((float)MYSLIDER(Zoom)->value()) / 100.0;
+    param.sceneThreshold = ((float)MYSLIDER(SceneThreshold)->value()) / 100.0;
+    param.autoGravity = MYCHKBOX(AutoGravity)->isChecked();
+    MYSLIDER(Gravity)->setEnabled(!param.autoGravity);
+
+    upload();
+    return 1;
+}
+void flyImageStab::setTabOrder(void)
+{
+    Ui_imageStabDialog *w=(Ui_imageStabDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSHCOMBOX(x) controls.push_back(MYCOMBOX(x));
+#define PUSHSLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSHCHKBOX(x) controls.push_back(MYCHKBOX(x));
+    PUSHSLIDER(Smoothing)
+    PUSHSLIDER(Gravity)
+    PUSHCOMBOX(Algo)
+    PUSHCOMBOX(MotionEstimation)
+    PUSHCHKBOX(AutoGravity)
+    PUSHSLIDER(Zoom)
+    PUSHSLIDER(SceneThreshold)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+void flyImageStab::refreshIndicator(void)
+{
+    Ui_imageStabDialog *w=(Ui_imageStabDialog *)_cookie;
+    QPalette indctrPalette(w->lineEditNewScene->palette());
+    QColor color;
+
+    color.setRgb(0,(newScene ? 255:64),0,255);
+    indctrPalette.setColor(QPalette::Window,color);
+    indctrPalette.setColor(QPalette::Base,color);
+    indctrPalette.setColor(QPalette::AlternateBase,color);
+
+    w->lineEditNewScene->setPalette(indctrPalette);
+    w->progressBarScene->setValue(round(sceneDiff*100.0));
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getImageStab(imageStab *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_imageStabWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/qt4/Q_imageStab.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/imageStab/qt4/imageStab.ui Added

@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>imageStabDialog</class>
+ <widget class="QDialog" name="imageStabDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>523</width>
+    <height>364</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Image stabilizer</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="labelFilterSmoothing">
+       <property name="text">
+        <string>Smoothing</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ADM_SliderIndicator" name="horizontalSliderSmoothing">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelGravity">
+       <property name="text">
+        <string>Gravity</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ADM_SliderIndicator" name="horizontalSliderGravity">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="labelInterpolation">
+       <property name="text">
+        <string>Interpolation</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxAlgo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>Bilinear</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Bicubic</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelMotionEstimation">
+       <property name="text">
+        <string>Motion estimation</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxMotionEstimation">
+       <item>
+        <property name="text">
+         <string>accurate</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>fast</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxAutoGravity">
+       <property name="text">
+        <string>Auto Gravity</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="1" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderSceneThreshold">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelChromaShiftAngle">
+       <property name="text">
+        <string>Scene threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelZoom">
+       <property name="text">
+        <string>Zoom</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QProgressBar" name="progressBarScene">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="value">
+        <number>24</number>
+       </property>
+       <property name="format">
+        <string notr="true"/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderZoom">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>100</number>
+       </property>
+       <property name="maximum">
+        <number>250</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QLineEdit" name="lineEditNewScene">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>imageStabDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>imageStabDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/kernelDeint/ADM_vidKernelDeint.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.cpp Added

@@ -0,0 +1,335 @@
+/***************************************************************************
+                          lumaStab filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "lumaStab.h"
+#include "lumaStab_desc.cpp"
+#include "ADM_vidLumaStab.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getLumaStab(lumaStab *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoLumaStab,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoLumaStab,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_COLORS,            // Category
+                                      "lumaStab",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("lumaStab","Luma stabilizer"),            // Display name
+                                      QT_TRANSLATE_NOOP("lumaStab","Reduce flickering.") // Description
+                                  );
+/**
+    \fn LumaStabProcess_C
+*/
+void ADMVideoLumaStab::LumaStabProcess_C(ADMImage *img, uint32_t filterLength, float cbratio, float sceneThreshold, bool chroma, float * yHyst, int * yHystlen, float * prevChromaHist, bool * newScene, float * sceneDiff)
+{
+    if ((!img) || (!yHyst) || (!yHystlen) || (!prevChromaHist)) return;
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int ystride,ustride,vstride;
+    uint8_t * yptr, * uptr, * vptr;
+    int pixel,cpmul,pmul,padd;
+    int i,j,x,y;
+    int limitL = 0;
+    int limitH = 255;
+    int limitcL = 0;
+    int limitcH = 255;
+    float avgY;
+    bool scdet = false;
+    float currChromaHist[64];
+    memset(currChromaHist, 0, 64*sizeof(float));
+
+    if (filterLength < 2) filterLength = 2;
+    if (filterLength > 256) filterLength = 256;
+    if (cbratio < 0.0) cbratio = 0.0;
+    if (cbratio > 1.0) cbratio = 1.0;
+    if (sceneThreshold < 0.0) sceneThreshold = 0.0;
+    if (sceneThreshold > 1.0) sceneThreshold = 1.0;
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+    {
+        limitL = 16;
+        limitH = 235;
+        limitcL = 16;
+        limitcH = 239;
+    }
+
+    if (*yHystlen == 0) scdet = true;
+
+    avgY = 0.0;
+    // Y plane: get average luma
+    ystride=img->GetPitch(PLANAR_Y);
+    yptr=img->GetWritePtr(PLANAR_Y);
+    for(y=0;y<height;y++)
+    {
+        int linesum=0;
+        for (x=0;x<width;x++)
+        {
+            linesum += yptr[x];
+        }
+        yptr+=ystride;
+        avgY += linesum;
+    }
+    avgY /= (height*width);    // normalize
+    if (avgY < 1.0) scdet = true;
+
+    // UV planes: get histograms
+    ustride=img->GetPitch(PLANAR_U);
+    uptr=img->GetWritePtr(PLANAR_U);
+    vstride=img->GetPitch(PLANAR_V);
+    vptr=img->GetWritePtr(PLANAR_V);
+    for(y=0;y<height/2;y++)	// 4:2:0
+    {
+        for (x=0;x<width/2;x++)
+        {
+            currChromaHist[uptr[x]/8 +  0]++;
+            currChromaHist[vptr[x]/8 + 32]++;
+        }
+        uptr+=ustride;
+        vptr+=vstride;
+    }
+
+    if (!scdet)
+    {
+        float sum = 0.0;
+        float sum2 = 0.0;
+        for(i=0; i<64; i++)
+        {
+            sum += fabs(currChromaHist[i] - prevChromaHist[i]);
+        }
+        for(i=0; i<64; i++)
+        {
+            sum2 += fabs(currChromaHist[i] - prevChromaHist[i+64]);
+        }
+        if (sum2 > sum) sum = sum2;
+        sum /= ((height/2) * (width/2));
+        sum=std::sqrt(sum/2);
+
+        if ((sceneThreshold < 1.0) && (sum > sceneThreshold))    // disable detect, if sceneThreshold set to max
+            scdet = true;
+
+        if (sceneDiff) *sceneDiff = sum;
+    }
+
+    if (scdet)
+    {
+        memcpy(&prevChromaHist[64], currChromaHist, 64*sizeof(float));
+    } else {
+        memcpy(&prevChromaHist[64], prevChromaHist, 64*sizeof(float));
+    }
+    memcpy(prevChromaHist, currChromaHist, 64*sizeof(float));
+
+    if (scdet)
+    {
+        for(i=0; i<256; i++)
+        {
+            yHyst[i] = avgY;
+        }
+        *yHystlen = 1;
+        // No change on Y plane
+    } else {
+        float filtY = 0.0;
+
+        *yHystlen += 1;
+        if (*yHystlen > 256) *yHystlen = 256;
+
+        memmove(&yHyst[1], &yHyst[0], 255*sizeof(float));
+        yHyst[0] = avgY;
+
+        for (i=0; i<filterLength; i++)
+        {
+            filtY += yHyst[i];
+        }
+        filtY /= filterLength;
+
+        cpmul = (filtY/avgY)*256;
+        pmul = (((filtY/avgY)-1.0)*(1.0-cbratio)+1.0)*256;
+        padd = (filtY-avgY)*cbratio*256;
+
+        // Y plane: apply changes
+        yptr=img->GetWritePtr(PLANAR_Y);
+        for(y=0;y<height;y++)
+        {
+            for (x=0;x<width;x++)
+            {
+                pixel = yptr[x];
+                pixel = (pixel*pmul+padd)>>8;
+                if (pixel < limitL) pixel = limitL;
+                if (pixel > limitH) pixel = limitH;
+                yptr[x] = pixel;
+            }
+            yptr+=ystride;
+        }
+
+        if (chroma)
+        {
+            uptr=img->GetWritePtr(PLANAR_U);
+            vptr=img->GetWritePtr(PLANAR_V);
+            for(y=0;y<height/2;y++)	// 4:2:0
+            {
+                for (x=0;x<width/2;x++)
+                {
+                    pixel = uptr[x];
+                    pixel = (((pixel-128)*cpmul)>>8)+128;
+                    if (pixel<limitcL) pixel = limitcL; 
+                    if (pixel>limitcH) pixel = limitcH; 
+                    uptr[x] = pixel;
+                    pixel = vptr[x];
+                    pixel = (((pixel-128)*cpmul)>>8)+128;
+                    if (pixel<limitcL) pixel = limitcL; 
+                    if (pixel>limitcH) pixel = limitcH; 
+                    vptr[x] = pixel;
+                }
+                uptr+=ustride;
+                vptr+=vstride;
+            }
+        }
+    }
+
+    if (newScene) *newScene= scdet;
+
+}
+/**
+    \fn configure
+*/
+bool ADMVideoLumaStab::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getLumaStab(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoLumaStab::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255," Filter length: %u frames, Contrast/Brightness ratio: %.2f, Scene threshold: %.2f, Apply to chroma: %s",_param.filterLength, _param.cbratio, _param.sceneThreshold, (_param.chroma ? "true":"false"));
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoLumaStab::ADMVideoLumaStab(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,lumaStab_param,&_param))
+        reset(&_param);
+    update();
+    _yHystlen = 0;
+    _yHyst = (float*)malloc(256*sizeof(float));
+    memset(_prevChromaHist,0,128*sizeof(float));
+
+}
+/**
+    \fn reset
+*/
+void ADMVideoLumaStab::reset(lumaStab *cfg)
+{
+    cfg->filterLength = 8;
+    cfg->cbratio = 0.0;
+    cfg->sceneThreshold = 0.5;
+    cfg->chroma = false;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoLumaStab::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoLumaStab::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoLumaStab::update(void)
+{
+    _filterLength=valueLimit(_param.filterLength,2,32);
+    _cbratio=valueLimit(_param.cbratio,0.0,1.0);
+    _sceneThreshold=valueLimit(_param.sceneThreshold,0.0,1.0);
+    _chroma=_param.chroma;
+}
+/**
+    \fn dtor
+*/
+ADMVideoLumaStab::~ADMVideoLumaStab()
+{
+    free(_yHyst);
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoLumaStab::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, lumaStab_param,&_param);
+}
+
+void ADMVideoLumaStab::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, lumaStab_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoLumaStab::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    LumaStabProcess_C(image, _filterLength, _cbratio, _sceneThreshold, _chroma, _yHyst, &_yHystlen, _prevChromaHist, NULL, NULL);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/ADM_vidLumaStab.h Added

@@ -0,0 +1,52 @@
+/***************************************************************************
+                          lumaStab filter 
+    Algorithm:
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoLumaStab
+*/
+class  ADMVideoLumaStab:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    lumaStab       _param;
+    uint32_t       _filterLength;
+    float          _cbratio;
+    float          _sceneThreshold;
+    bool           _chroma;
+    float *        _yHyst;
+    int            _yHystlen;
+    float          _prevChromaHist[128];
+  public:
+    ADMVideoLumaStab(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoLumaStab();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static void          LumaStabProcess_C(ADMImage *img, uint32_t filterLength, float cbratio, float sceneThreshold, bool chroma, float * yHyst, int * yHystlen, float * prevChromaHist, bool * newScene, float * sceneDiff);
+    static void          reset(lumaStab *cfg);
+
+  private:
+    float   valueLimit(float val, float min, float max);
+    int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/cli/DIA_lumaStab.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/lumaStab_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/DIA_flyLumaStab.cpp Added

@@ -0,0 +1,55 @@
+/**/
+/***************************************************************************
+                          DIA_LumaStab
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyLumaStab.h"
+#include "ADM_vidLumaStab.h"
+#include <QPalette>
+#include <cmath>
+
+/************* COMMON PART *********************/
+uint8_t  flyLumaStab::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyLumaStab::processYuv(ADMImage *in,ADMImage *out )
+{
+    bool newScene;
+    float sceneDiff;
+    QPalette indctrPalette(indctr->palette());
+    QColor color;
+
+    out->duplicate(in);
+    // Do it!
+    ADMVideoLumaStab::LumaStabProcess_C(out, param.filterLength, param.cbratio, param.sceneThreshold, param.chroma, yHyst, &yHystlen, prevChromaHist, &newScene, &sceneDiff);
+
+    color.setRgb(0,(newScene ? 255:64),0,255);
+    indctrPalette.setColor(QPalette::Window,color);
+    indctrPalette.setColor(QPalette::Base,color);
+    indctrPalette.setColor(QPalette::AlternateBase,color);
+    indctr->setPalette(indctrPalette);
+    indctrPB->setValue(round(sceneDiff*100.0));
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/DIA_flyLumaStab.h Added

@@ -0,0 +1,49 @@
+/***************************************************************************
+  \fn     DIA_flyLumaStab
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for lumaStab
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_LumaStab_H
+#define FLY_LumaStab_H
+#include "lumaStab.h"
+#include <QLineEdit>
+#include <QProgressBar>
+/**
+    \class flyLumaStab
+*/
+class flyLumaStab : public ADM_flyDialogYuv
+{
+  protected:
+    float *        yHyst;
+    int            yHystlen;
+    float          prevChromaHist[128];
+  public:
+    lumaStab  param;
+    QLineEdit * indctr;
+    QProgressBar * indctrPB;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyLumaStab (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {
+                                        yHystlen = 0;
+                                        yHyst = (float*)malloc(256*sizeof(float));
+                                        memset(prevChromaHist,0,128*sizeof(float));
+               };
+    virtual ~flyLumaStab() {
+                                        free(yHyst);
+               };
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/Q_lumaStab.cpp Added

@@ -0,0 +1,191 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_lumaStab.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidLumaStab.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_lumaStabWindow::Ui_lumaStabWindow(QWidget *parent, lumaStab *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyLumaStab( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(lumaStab));
+        myFly->indctr=ui.lineEditNewScene;
+        myFly->indctrPB=ui.progressBarScene;
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x,y,z) ui.horizontalSlider##x->setScale(1,y,z); \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+        SPINNER(FilterLength,1,0)
+        SPINNER(SceneThreshold,100,2)
+        SPINNER(CBRatio,100,2)
+
+#define CHKBOX(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        CHKBOX(Chroma);
+
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_lumaStabWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_lumaStabWindow::gather(lumaStab *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(lumaStab));
+}
+Ui_lumaStabWindow::~Ui_lumaStabWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+void Ui_lumaStabWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    //myFly->sameImage();
+    lock--;
+}
+void Ui_lumaStabWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoLumaStab::reset(&myFly->param);
+    myFly->upload();
+    //myFly->sameImage();
+    lock--;
+}
+
+void Ui_lumaStabWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_lumaStabWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYCHECK(x) w->checkBox##x
+//************************
+uint8_t flyLumaStab::upload(void)
+{
+    Ui_lumaStabDialog *w=(Ui_lumaStabDialog *)_cookie;
+    MYSPIN(FilterLength)->setValue((int)param.filterLength);
+    MYSPIN(CBRatio)->setValue((int)round(param.cbratio*100.0));
+    MYSPIN(SceneThreshold)->setValue((int)round(param.sceneThreshold*100.0));
+    MYCHECK(Chroma)->setChecked(param.chroma);
+    return 1;
+}
+uint8_t flyLumaStab::download(void)
+{
+    Ui_lumaStabDialog *w=(Ui_lumaStabDialog *)_cookie;
+    param.filterLength=MYSPIN(FilterLength)->value();
+    param.cbratio=((float)MYSPIN(CBRatio)->value()) / 100.0;
+    param.sceneThreshold=((float)MYSPIN(SceneThreshold)->value()) / 100.0;
+    param.chroma=MYCHECK(Chroma)->isChecked();
+    return 1;
+}
+void flyLumaStab::setTabOrder(void)
+{
+    Ui_lumaStabDialog *w=(Ui_lumaStabDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    PUSH_SPIN(FilterLength)
+    PUSH_SPIN(CBRatio)
+    PUSH_SPIN(SceneThreshold)
+    PUSH_TOG(Chroma)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getLumaStab(lumaStab *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_lumaStabWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/Q_lumaStab.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/lumaStab/qt4/lumaStab.ui Added

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>lumaStabDialog</class>
+ <widget class="QDialog" name="lumaStabDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>579</width>
+    <height>327</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Luma stabilizer</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="1" column="1" colspan="3">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderFilterLength">
+       <property name="minimum">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <number>256</number>
+       </property>
+       <property name="pageStep">
+        <number>20</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1" colspan="3">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderSceneThreshold">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelFilterLength">
+       <property name="text">
+        <string>Filter length</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="labelChromaShiftAngle">
+       <property name="text">
+        <string>Scene threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="5">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="5" column="5">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="4">
+      <widget class="QLabel" name="labelFrames">
+       <property name="text">
+        <string>frames</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="4">
+      <widget class="QLineEdit" name="lineEditNewScene">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
+      <widget class="QCheckBox" name="checkBoxChroma">
+       <property name="text">
+        <string>Adjust chroma</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" colspan="3">
+      <widget class="ADM_SliderIndicator" name="horizontalSliderCBRatio">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="5">
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="6" column="1" colspan="3">
+      <widget class="QProgressBar" name="progressBarScene">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="value">
+        <number>24</number>
+       </property>
+       <property name="format">
+        <string notr="true"/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelAdjust">
+       <property name="text">
+        <string>Adjust target</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="labelPreferContrast">
+       <property name="text">
+        <string>Prefer contrast</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="3">
+      <widget class="QLabel" name="labelPreferBrightness">
+       <property name="text">
+        <string>Prefer brightness</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ADM_SliderIndicator</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>lumaStabDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>lumaStabDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp Changed

@@ -49,7 +49,6 @@
  {
      blur=  new ADMImageDefault(_w/2,_h);
      work=  new ADMImageDefault(_w,_h);;     //<-dafuq ?
-     fullpreview = false;
  }
  /**
   * 
@@ -69,7 +68,6 @@
 uint8_t    flyMSharpen::processYuv(ADMImage* in, ADMImage *out)
 {
     uint32_t outw = _w;
-    if(!fullpreview) outw >>= 1;
     if(blur->_width != outw)
     {
         delete blur;
@@ -79,15 +77,13 @@
     ADMImageRef          refIn(outw,_h);
     ADMImageRefWrittable refOut(outw,_h);
 
-    if(!fullpreview)
-        in->copyLeftSideTo(out);
     for(int i=0;i<3;i++)
     {
         int halfWidth=in->GetWidth((ADM_PLANE)i)/2; // in and out have the same width
         refIn._planeStride[i] =in->_planeStride[i];
         refOut._planeStride[i]=out->_planeStride[i];
         refIn._planes[i]      =in->_planes[i];//+halfWidth;
-        refOut._planes[i] = fullpreview ? out->_planes[i] : out->_planes[i] + halfWidth;
+        refOut._planes[i] = out->_planes[i];
     }
     
     for (int i=0;i<(param.chroma ? 3:1);i++)
@@ -105,10 +101,6 @@
         (&refOut)->copyPlane(&refIn,&refOut,PLANAR_V);
     }
     out->copyInfo(in);
-    if(fullpreview)
-        return 1;
-    out->printString(1,1,"Original"); // printString can't handle non-ascii input, do not translate this!
-    out->printString(in->GetWidth(PLANAR_Y)/24+1,1,"Processed"); // as above, don't try to translate
 
     return 1;
 }
@@ -132,7 +124,6 @@
     MYTOGGLE(Chroma,chroma)
 #undef MYSPIN
 #undef MYTOGGLE
-    w->checkBoxFullPreview->setChecked(fullpreview);
     blockChanges(false);
     invstrength = 255-param.strength;
     return 1;
@@ -154,7 +145,6 @@
     MYTOGGLE(Chroma,chroma)
 #undef MYSPIN
 #undef MYTOGGLE
-    fullpreview = w->checkBoxFullPreview->isChecked();
     blockChanges(false);
     if(param.strength > 255) param.strength=255;
     invstrength = 255-param.strength;
@@ -165,7 +155,7 @@
 */
 #define APPLY_TO_ALL(x) w->horizontalSliderThreshold->x; w->horizontalSliderStrength->x; \
                         w->spinBoxThreshold->x; w->spinBoxStrength->x; \
-                        w->checkBoxHQ->x; w->checkBoxChroma->x; w->checkBoxMask->x; w->checkBoxFullPreview;
+                        w->checkBoxHQ->x; w->checkBoxChroma->x; w->checkBoxMask->x;
 void flyMSharpen::blockChanges(bool block)
 {
     Ui_msharpenDialog *w=(Ui_msharpenDialog *)_cookie;
@@ -188,7 +178,6 @@
     MYTOGGLE(HQ)
     MYTOGGLE(Chroma)
     MYTOGGLE(Mask)
-    MYTOGGLE(FullPreview)
 
     controls.insert(controls.end(), buttonList.begin(), buttonList.end());
     controls.push_back(w->horizontalSlider);

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp Changed

@@ -41,7 +41,7 @@
         flymsharpen=new flyMSharpen( this,width, height,in,canvas,ui.horizontalSlider);
         memcpy(&(flymsharpen->param),param,sizeof(*param));
         flymsharpen->_cookie=&ui;
-        flymsharpen->addControl(ui.toolboxLayout);
+        flymsharpen->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
         flymsharpen->setTabOrder();
         flymsharpen->upload();
         flymsharpen->sliderChanged();
@@ -62,7 +62,6 @@
 
         QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
         connect(resetButton,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
-        connect(ui.checkBoxFullPreview,SIGNAL(stateChanged(int)),this,SLOT(toggleFullPreview(int)));
 
         setModal(true);
   }
@@ -91,14 +90,6 @@
   flymsharpen->sameImage();
   lock--;
 }
-void Ui_msharpenWindow::toggleFullPreview(int state)
-{
-    if(lock) return;
-    lock++;
-    flymsharpen->fullpreview = state != Qt::Unchecked;
-    flymsharpen->sameImage();
-    lock--;
-}
 void Ui_msharpenWindow::reset(bool checked)
 {
     if(lock) return;

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>481</width>
-    <height>454</height>
+    <width>551</width>
+    <height>382</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -39,30 +39,7 @@
    </item>
    <item row="0" column="0">
     <layout class="QGridLayout" name="mainControls">
-     <item row="0" column="2">
-      <widget class="QSpinBox" name="spinBoxStrength">
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>255</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QCheckBox" name="checkBoxChroma">
        <property name="text">
         <string>Process chroma</string>
@@ -76,17 +53,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QSlider" name="horizontalSliderStrength">
-       <property name="maximum">
-        <number>255</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QCheckBox" name="checkBoxHQ">
        <property name="text">
         <string>HighQuality</string>
@@ -100,7 +67,24 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
+     <item row="3" column="2">
+      <widget class="QCheckBox" name="checkBoxMask">
+       <property name="text">
+        <string>Mask</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxStrength">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>255</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
       <widget class="QSpinBox" name="spinBoxThreshold">
        <property name="minimum">
         <number>0</number>
@@ -110,8 +94,21 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QSlider" name="horizontalSliderThreshold">
+     <item row="0" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1" colspan="3">
+      <widget class="QSlider" name="horizontalSliderStrength">
        <property name="maximum">
         <number>255</number>
        </property>
@@ -120,19 +117,28 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="checkBoxFullPreview">
-       <property name="text">
-        <string>Show full preview</string>
+     <item row="1" column="1" colspan="3">
+      <widget class="QSlider" name="horizontalSliderThreshold">
+       <property name="maximum">
+        <number>255</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="checkBoxMask">
-       <property name="text">
-        <string>Mask</string>
+     <item row="3" column="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-      </widget>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
     </layout>
    </item>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp Changed

@@ -271,7 +271,7 @@
 /**
  *  \fn boundCheck
  */
-bool flyMpDelogo::boundCheck(void)
+bool flyMpDelogo::boundCheck(bool sizeHasPriority)
 {
     Ui_mpdelogoDialog *w=(Ui_mpdelogoDialog *)_cookie;
     bool passed = true;
@@ -280,9 +280,17 @@
         param.lw = _w;
         passed = false;
     }
+    if(param.xoff > _w)
+    {
+        param.xoff = _w;
+        passed = false;
+    }
     if(param.xoff + param.lw > _w)
     {
-        param.xoff = _w - param.lw;
+        if(sizeHasPriority)
+            param.xoff = _w - param.lw;
+        else
+            param.lw = _w - param.xoff;
         passed = false;
     }
     if(param.lh > _h)
@@ -290,9 +298,17 @@
         param.lh = _h;
         passed = false;
     }
+    if(param.yoff > _h)
+    {
+        param.yoff = _h;
+        passed = false;
+    }
     if(param.yoff + param.lh > _h)
     {
-        param.yoff = _h - param.lh;
+        if(sizeHasPriority)
+            param.yoff = _h - param.lh;
+        else
+            param.lh = _h - param.yoff;
         passed = false;
     }
     /* Setting maximum dynamically breaks auto-repeat of
@@ -332,7 +348,7 @@
 /**
  *  \fn download
  */
-uint8_t flyMpDelogo::download(void)
+uint8_t flyMpDelogo::download(bool sizeHasPriority)
 {
     Ui_mpdelogoDialog *w=(Ui_mpdelogoDialog *)_cookie;
 #define GETSPIN(x,y) param.y=w->spin##x->value();
@@ -342,7 +358,7 @@
     GETSPIN(H,lh)
     GETSPIN(Band,band)
 
-    if(!boundCheck())
+    if(!boundCheck(sizeHasPriority))
         upload(false,true);
     //printf(">>>Download event : x = %d y = %d w = %d h = %d\n",param.xoff,param.yoff,param.lw,param.lh);
     return 1;
@@ -419,7 +435,7 @@
     myCrop->addControl(ui.toolboxLayout);
     myCrop->setTabOrder();
     myCrop->setPreview(false);
-#define SPINENTRY(x,y) ui.spin##x->setMaximum(y);
+#define SPINENTRY(x,y) ui.spin##x->setMaximum(y); ui.spin##x->setKeyboardTracking(false);
     SPINENTRY(X,width)
     SPINENTRY(W,width)
     SPINENTRY(Y,height)
@@ -434,11 +450,13 @@
 
     connect(ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
 #define SPINNER(x) connect(ui.spin##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
+    SPINNER(Band)
     SPINNER(X)
     SPINNER(Y)
+#undef SPINNER
+#define SPINNER(x) connect(ui.spin##x,SIGNAL(valueChanged(int)),this,SLOT(sizeChanged(int)));
     SPINNER(W)
     SPINNER(H)
-    SPINNER(Band)
 
     connect(ui.checkBoxPreview, SIGNAL(stateChanged(int )),this, SLOT(preview(int)));
 
@@ -545,13 +563,24 @@
         memcpy(param, myCrop->getParam(), sizeof(delogo));
 }
 /**
+ *  \fn sizeChanged
+ */
+void Ui_mpdelogoWindow::sizeChanged(int f)
+{
+    if(lock) return;
+    lock++;
+    myCrop->download(true);
+    myCrop->sameImage();
+    lock--;
+}
+/**
  *  \fn valueChanged
  */
 void Ui_mpdelogoWindow::valueChanged(int f)
 {
     if(lock) return;
     lock++;
-    myCrop->download();
+    myCrop->download(false);
     myCrop->sameImage();
     lock--;
 }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.cpp Added

@@ -0,0 +1,645 @@
+/***************************************************************************
+                          QuadTrans filter ported from frei0r
+    Algorithm:
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "quadTrans.h"
+#include "quadTrans_desc.cpp"
+#include "ADM_vidQuadTrans.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getQuadTrans(quadTrans *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoQuadTrans,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoQuadTrans,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_TRANSFORM,            // Category
+                                      "quadTrans",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("quadTrans","Quadrilateral transformation"),            // Display name
+                                      QT_TRANSLATE_NOOP("quadTrans","Four point transform.") // Description
+                                  );
+
+/**
+    \fn QuadTransCreateBuffers
+*/
+void ADMVideoQuadTrans::QuadTransCreateBuffers(int w, int h, quadTrans_buffers_t * buffers)
+{
+    buffers->prevparam.algo = 9999;  // invalidate
+    buffers->imgCopy = new ADMImageDefault(w,h);
+
+    buffers->integerMap = new int [w*h*2+2];
+    buffers->fractionalMap = new int [w*h*2+2];
+    buffers->integerMapUV = new int [(w/2)*(h/2)*2+2];
+    buffers->fractionalMapUV = new int [(w/2)*(h/2)*2+2];
+    
+    buffers->bicubicWeights = new int [257*4];
+    for (int i=0; i<=256; i++)
+    {
+        float tmp;
+        tmp = 1.0 + i/256.0;    buffers->bicubicWeights[i*4+0] = ((-0.75*(tmp-5.0)*tmp-6.0)*tmp+3.0)*256.0 + 0.5;
+        tmp = tmp - 1.0;        buffers->bicubicWeights[i*4+1] = ((1.25*tmp-2.25)*tmp*tmp+1.0)*256.0 + 0.5;
+        tmp = 1.0 - tmp;        buffers->bicubicWeights[i*4+2] = ((1.25*tmp-2.25)*tmp*tmp+1.0)*256.0 + 0.5;
+                                buffers->bicubicWeights[i*4+3] = 256 - buffers->bicubicWeights[i*4+0] - buffers->bicubicWeights[i*4+1] - buffers->bicubicWeights[i*4+2];
+    }
+    
+    buffers->threads = ADM_cpu_num_processors();
+    if (buffers->threads < 1)
+        buffers->threads = 1;
+    if (buffers->threads > 64)
+        buffers->threads = 64;
+    buffers->threads /= 2;
+    if (buffers->threads < 1)
+        buffers->threads = 1;
+    buffers->threadsUV = buffers->threads/2;
+    if (buffers->threadsUV < 1)
+        buffers->threadsUV = 1;
+
+    buffers->worker_threads = new pthread_t [buffers->threads + 2*buffers->threadsUV];
+    buffers->worker_thread_args = new worker_thread_arg [buffers->threads + 2*buffers->threadsUV];
+}
+/**
+    \fn QuadTransDestroyBuffers
+*/
+void ADMVideoQuadTrans::QuadTransDestroyBuffers(quadTrans_buffers_t * buffers)
+{
+    delete buffers->imgCopy;
+    delete [] buffers->integerMap;
+    delete [] buffers->fractionalMap;
+    delete [] buffers->integerMapUV;
+    delete [] buffers->fractionalMapUV;
+    delete [] buffers->bicubicWeights;
+    delete [] buffers->worker_threads;
+    delete [] buffers->worker_thread_args;
+}
+
+
+/**
+    \fn bilinear
+*/
+inline void ADMVideoQuadTrans::bilinear(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, uint8_t * out)
+{
+    int i,a,b,k,l,k1,l1;
+    
+    k  = y*stride+x;
+    k1 = k  + 1;
+    l  = k  + stride;
+    l1 = k1 + stride;
+    
+    a=in[k]*256+(in[k1]-in[k])*fx;
+    b=in[l]*256+(in[l1]-in[l])*fx;
+    out[0]=(a*256+(b-a)*fy)/65536;
+}
+
+/**
+    \fn bicubic
+*/
+inline void ADMVideoQuadTrans::bicubic(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, int * weights, uint8_t * out)
+{
+    int m = x-1;
+    int n = y-1;
+    if (m < 0)
+        m = 0;
+    if (n < 0)
+        n = 0;
+    if (m+5 > w)
+        m = w-4;
+    if (n+5 > h)
+        n = h-4;
+
+    int * wx, * wy;
+    wx = weights + fx*4;
+    wy = weights + fy*4;
+    
+    int b,i,k,l, p, pp;
+    k = n*stride + m;
+
+    l = k;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp = wy[0]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[1]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[2]*p;
+    l += stride;
+    p  = wx[0] * in[l+0];
+    p += wx[1] * in[l+1];
+    p += wx[2] * in[l+2];
+    p += wx[3] * in[l+3];
+    pp += wy[3]*p;
+    
+    pp /= 65536;
+    if (pp < 0)
+        pp = 0;
+    if (pp > 255)
+        pp = 255;
+    out[0] = pp;
+}
+
+/**
+    \fn worker_thread
+*/
+void * ADMVideoQuadTrans::worker_thread( void *ptr )
+{
+    worker_thread_arg * arg = (worker_thread_arg*)ptr;
+    int w = arg->w;
+    int h = arg->h;
+    int ystart = arg->ystart;
+    int yincr = arg->yincr;
+    int algo = arg->algo;
+    int * integerMap = arg->integerMap;
+    int * fractionalMap = arg->fractionalMap;
+    int stride = arg->stride;
+    uint8_t * in = arg->in;
+    uint8_t * out = arg->out;
+    int * bicubicWeights = arg->bicubicWeights;
+    uint8_t blackLevel = arg->blackLevel;
+
+    {
+        for (int y=ystart; y<h; y+=yincr)
+        {
+            for (int x=0; x<w; x++)
+            {
+                int ix=integerMap[2*(w*y+x)];
+                int iy=integerMap[2*(w*y+x)+1];
+                int fx=fractionalMap[2*(w*y+x)];
+                int fy=fractionalMap[2*(w*y+x)+1];
+                
+                if (ix>=0)
+                {
+                    switch(algo) {
+                        default:
+                        case 0:
+                                bilinear(w, h, stride, in, ix, iy, fx, fy, out + x + y*stride);
+                            break;
+                        case 1:
+                                bicubic(w, h, stride, in, ix, iy, fx, fy, bicubicWeights, out + x + y*stride);
+                            break;
+                    }
+                } else {
+                    out[x + y*stride] =  blackLevel;
+                }
+            }
+        }
+        
+    }
+    
+    pthread_exit(NULL);
+    return NULL;
+}
+
+
+/**
+    \fn QuadTransProcess_C
+*/
+void ADMVideoQuadTrans::QuadTransProcess_C(ADMImage *img, int w, int h, quadTrans param, quadTrans_buffers_t * buffers)
+{
+    if (!img || !buffers || !buffers->imgCopy || !buffers->integerMap || !buffers->fractionalMap || !buffers->integerMapUV || !buffers->fractionalMapUV) return;
+    uint8_t * line;
+
+    if (param.algo > 1) param.algo = 1;
+    unsigned int algo = param.algo;
+    double xs[4],ys[4];
+    xs[0] = param.dx1;
+    ys[0] = param.dy1;
+    xs[1] = param.dx2 + w;
+    ys[1] = param.dy2;
+    xs[2] = param.dx3;
+    ys[2] = param.dy3 + h;
+    xs[3] = param.dx4 + w;
+    ys[3] = param.dy4 + h;
+    
+    double midx, midy;
+    midx = w-1;
+    midx /= 2.0;
+    midy = h-1;
+    midy /= 2.0;
+    
+    for (int i=0; i<4; i++)
+    {
+        xs[i] = (xs[i]-midx)*param.zoom + midx;
+        ys[i] = (ys[i]-midy)*param.zoom + midy;
+    }
+
+
+    if (memcmp(&(buffers->prevparam), &param, sizeof(quadTrans)))
+    {
+        double a,b,c,d,e,f,g,j,a2,b2,c2,u,v,aa,bb,de,sde,v1,v2,u1,u2;
+        de=0.0;v1=1000.0;v2=1000.0;
+        for (int y=0; y<h; y++)
+        {
+            for (int x=0; x<w; x++)
+            {
+                a=xs[0]-x;
+                b=xs[1]-xs[0];
+                c=xs[2]-xs[0];
+                d=xs[3]-xs[1]-(xs[2]-xs[0]);
+                
+                e=ys[0]-y;
+                f=ys[1]-ys[0];
+                g=ys[2]-ys[0];
+                j=ys[3]-ys[1]-(ys[2]-ys[0]);
+                
+                a2=g*d-j*c; b2=e*d-f*c-j*a+g*b; c2=e*b-f*a;
+                
+                if ((fabs(a2*c2*c2/(b2*b2*b2))< 0.1/w) && (fabs(a2)<1.0))
+                {
+                    v1 = (b2!=0.0) ? -c2/b2 : 1000.0;
+                    v2=1000.0;
+                }
+                else
+                {
+                    de=b2*b2-4.0*a2*c2;
+                    if (de>=0.0)
+                    {
+                        sde=sqrt(de);
+                        v1=(-b2+sde)/2.0/a2;
+                        v2=(-b2-sde)/2.0/a2;
+                    }
+                    else
+                    {
+                        v1=1001.0;
+                        v2=1001.0;
+                    }
+                }
+                aa=b+d*v1; bb=f+j*v1;
+                if (fabs(aa)>fabs(bb))
+                    u1 = (aa!=0.0) ? -(a+c*v1)/aa : 1000.0;
+                else
+                    u1 = (bb!=0.0) ? -(e+g*v1)/bb : 1000.0;
+                aa=b+d*v2; bb=f+j*v2;
+                if (fabs(aa)>fabs(bb))
+                    u2 = (aa!=0.0) ? -(a+c*v2)/aa : 1000.0;
+                else
+                    u2 = (bb!=0.0) ? -(e+g*v2)/bb : 1000.0;
+                
+                if ((u1>=0.0)&&(u1<1.0)&&(v1>=0.0)&&(v1<1.0))
+                {
+                    u=u1;
+                    v=v1;
+                }
+                else
+                {
+                    if ((u2>=0.0)&&(u2<1.0)&&(v2>=0.0)&&(v2<1.0))
+                    {
+                        u=u2;
+                        v=v2;
+                    }
+                    else
+                    {
+                        u=1002.0;
+                        v=1002.0;
+                    }
+                }
+                
+                
+                if ((u>=0.0)&&(u<1.0)&&(v>=0.0)&&(v<1.0))
+                {
+                    u *= w;
+                    v *= h;
+                    int ui = floor(u);
+                    int vi = floor(v);
+                    int uf = (u-floor(u))*256.0 + 0.5;
+                    int vf = (v-floor(v))*256.0 + 0.5;
+                    if (uf > 255)
+                    {
+                        ui++;
+                        uf = 0;
+                    }
+                    if (vf > 255)
+                    {
+                        vi++;
+                        vf = 0;
+                    }
+                    if (ui >= w-1)
+                    {
+                        ui = w-2;
+                        uf = 255;
+                    }
+                    if (vi >= h-1)
+                    {
+                        vi = h-2;
+                        vf = 255;
+                    }
+                    buffers->integerMap[2*(y*w+x)]=ui;
+                    buffers->integerMap[2*(y*w+x)+1]=vi;
+                    buffers->fractionalMap[2*(y*w+x)]=uf;
+                    buffers->fractionalMap[2*(y*w+x)+1]=vf;
+                }
+                else
+                {
+                    buffers->integerMap[2*(y*w+x)]=-1;
+                    buffers->integerMap[2*(y*w+x)+1]=-1;
+                }
+            
+            }
+        }
+        
+        de=0.0;v1=1000.0;v2=1000.0;
+        int wh = w/2;
+        int hh = h/2;
+        for (int y=0; y<hh; y++)
+        {
+            for (int x=0; x<wh; x++)
+            {
+                a=xs[0]/2.0-x;
+                b=xs[1]/2.0-xs[0]/2.0;
+                c=xs[2]/2.0-xs[0]/2.0;
+                d=xs[3]/2.0-xs[1]/2.0-(xs[2]/2.0-xs[0]/2.0);
+                
+                e=ys[0]/2.0-y;
+                f=ys[1]/2.0-ys[0]/2.0;
+                g=ys[2]/2.0-ys[0]/2.0;
+                j=ys[3]/2.0-ys[1]/2.0-(ys[2]/2.0-ys[0]/2.0);
+                
+                a2=g*d-j*c; b2=e*d-f*c-j*a+g*b; c2=e*b-f*a;
+                
+                if ((fabs(a2*c2*c2/(b2*b2*b2))< 0.1/wh) && (fabs(a2)<1.0))
+                {
+                    v1 = (b2!=0.0) ? -c2/b2 : 1000.0;
+                    v2=1000.0;
+                }
+                else
+                {
+                    de=b2*b2-4.0*a2*c2;
+                    if (de>=0.0)
+                    {
+                        sde=sqrt(de);
+                        v1=(-b2+sde)/2.0/a2;
+                        v2=(-b2-sde)/2.0/a2;
+                    }
+                    else
+                    {
+                        v1=1001.0;
+                        v2=1001.0;
+                    }
+                }
+                aa=b+d*v1; bb=f+j*v1;
+                if (fabs(aa)>fabs(bb))
+                    u1 = (aa!=0.0) ? -(a+c*v1)/aa : 1000.0;
+                else
+                    u1 = (bb!=0.0) ? -(e+g*v1)/bb : 1000.0;
+                aa=b+d*v2; bb=f+j*v2;
+                if (fabs(aa)>fabs(bb))
+                    u2 = (aa!=0.0) ? -(a+c*v2)/aa : 1000.0;
+                else
+                    u2 = (bb!=0.0) ? -(e+g*v2)/bb : 1000.0;
+                
+                if ((u1>=0.0)&&(u1<1.0)&&(v1>=0.0)&&(v1<1.0))
+                {
+                    u=u1;
+                    v=v1;
+                }
+                else
+                {
+                    if ((u2>=0.0)&&(u2<1.0)&&(v2>=0.0)&&(v2<1.0))
+                    {
+                        u=u2;
+                        v=v2;
+                    }
+                    else
+                    {
+                        u=1002.0;
+                        v=1002.0;
+                    }
+                }
+                
+                
+                if ((u>=0.0)&&(u<1.0)&&(v>=0.0)&&(v<1.0))
+                {
+                    u *= wh;
+                    v *= hh;
+                    int ui = floor(u);
+                    int vi = floor(v);
+                    int uf = (u-floor(u))*256.0 + 0.5;
+                    int vf = (v-floor(v))*256.0 + 0.5;
+                    if (uf > 255)
+                    {
+                        ui++;
+                        uf = 0;
+                    }
+                    if (vf > 255)
+                    {
+                        vi++;
+                        vf = 0;
+                    }
+                    if (ui >= wh-1)
+                    {
+                        ui = wh-2;
+                        uf = 255;
+                    }
+                    if (vi >= hh-1)
+                    {
+                        vi = hh-2;
+                        vf = 255;
+                    }
+                    buffers->integerMapUV[2*(y*wh+x)]=ui;
+                    buffers->integerMapUV[2*(y*wh+x)+1]=vi;
+                    buffers->fractionalMapUV[2*(y*wh+x)]=uf;
+                    buffers->fractionalMapUV[2*(y*wh+x)+1]=vf;
+                }
+                else
+                {
+                    buffers->integerMapUV[2*(y*wh+x)]=-1;
+                    buffers->integerMapUV[2*(y*wh+x)+1]=-1;
+                }
+            
+            }
+        }
+
+        memcpy(&(buffers->prevparam), &param, sizeof(quadTrans));
+    }
+
+    uint8_t * rplanes[3];
+    uint8_t * wplanes[3];
+    int strides[3];
+
+    buffers->imgCopy->duplicate(img);
+    buffers->imgCopy->GetPitches(strides);
+    buffers->imgCopy->GetWritePlanes(rplanes);
+    img->GetWritePlanes(wplanes);
+    
+    int totaltr = 0;
+    
+    for (int tr=0; tr<buffers->threads; tr++)
+    {
+        buffers->worker_thread_args[totaltr].w = w;
+        buffers->worker_thread_args[totaltr].h = h;
+        buffers->worker_thread_args[totaltr].ystart = tr;
+        buffers->worker_thread_args[totaltr].yincr = buffers->threads;
+        buffers->worker_thread_args[totaltr].algo = algo;
+        buffers->worker_thread_args[totaltr].integerMap = buffers->integerMap;
+        buffers->worker_thread_args[totaltr].fractionalMap = buffers->fractionalMap;
+        buffers->worker_thread_args[totaltr].blackLevel = 0;
+        buffers->worker_thread_args[totaltr].stride = strides[0];
+        buffers->worker_thread_args[totaltr].in = rplanes[0];
+        buffers->worker_thread_args[totaltr].out = wplanes[0];
+        buffers->worker_thread_args[totaltr].bicubicWeights = buffers->bicubicWeights;
+        totaltr++;
+    }
+
+    for (int p=1; p<3; p++)
+    {
+        for (int tr=0; tr<buffers->threadsUV; tr++)
+        {
+            buffers->worker_thread_args[totaltr].w = w/2;
+            buffers->worker_thread_args[totaltr].h = h/2;
+            buffers->worker_thread_args[totaltr].ystart = tr;
+            buffers->worker_thread_args[totaltr].yincr = buffers->threadsUV;
+            buffers->worker_thread_args[totaltr].algo = algo;
+            buffers->worker_thread_args[totaltr].integerMap = buffers->integerMapUV;
+            buffers->worker_thread_args[totaltr].fractionalMap = buffers->fractionalMapUV;
+            buffers->worker_thread_args[totaltr].blackLevel = 128;
+            buffers->worker_thread_args[totaltr].stride = strides[p];
+            buffers->worker_thread_args[totaltr].in = rplanes[p];
+            buffers->worker_thread_args[totaltr].out = wplanes[p];
+            buffers->worker_thread_args[totaltr].bicubicWeights = buffers->bicubicWeights;
+            totaltr++;
+        }
+    }
+
+    for (int tr=0; tr<totaltr; tr++)
+    {
+        pthread_create( &buffers->worker_threads[tr], NULL, worker_thread, (void*) &buffers->worker_thread_args[tr]);
+    }
+    // work in thread workers...
+    for (int tr=0; tr<totaltr; tr++)
+    {
+        pthread_join( buffers->worker_threads[tr], NULL);
+    }
+
+
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoQuadTrans::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getQuadTrans(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+
+const char   *ADMVideoQuadTrans::getConfiguration(void)
+{
+    static char s[256];
+    const char * algo=NULL;
+    switch(_param.algo) {
+        default:
+        case 0: algo="Bilinear";
+            break;
+        case 1: algo="Bicubic";
+            break;
+        case 2: algo="Lanczos";
+            break;
+    }
+    snprintf(s,255,"%s interpolation, Zoom: %.02f, Transform: [%.02f,%.02f], [%.02f,%.02f], [%.02f,%.02f], [%.02f,%.02f]", algo, _param.zoom, _param.dx1, _param.dy1, _param.dx2, _param.dy2, _param.dx3, _param.dy3, _param.dx4, _param.dy4);
+
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoQuadTrans::ADMVideoQuadTrans(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,quadTrans_param,&_param))
+    {
+        // Default value
+        _param.dx1=0;
+        _param.dy1=0;
+        _param.dx2=0;
+        _param.dy2=0;
+        _param.dx3=0;
+        _param.dy3=0;
+        _param.dx4=0;
+        _param.dy4=0;
+        _param.zoom=1;
+        _param.algo = 0;
+    }
+    
+    QuadTransCreateBuffers(info.width,info.height, &(_buffers));
+    update();
+}
+/**
+    \fn update
+*/
+void ADMVideoQuadTrans::update(void)
+{
+}
+/**
+    \fn dtor
+*/
+ADMVideoQuadTrans::~ADMVideoQuadTrans()
+{
+    QuadTransDestroyBuffers(&(_buffers));
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoQuadTrans::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, quadTrans_param,&_param);
+}
+/**
+    \fn setCoupledConf
+*/
+void ADMVideoQuadTrans::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, quadTrans_param, &_param);
+}
+
+
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoQuadTrans::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    QuadTransProcess_C(image,info.width,info.height,_param, &(_buffers));
+ 
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/ADM_vidQuadTrans.h Added

@@ -0,0 +1,78 @@
+/***************************************************************************
+                          QuadTrans filter ported from frei0r
+    Algorithm:
+        Copyright 2010 Marko Cebokli
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_default.h"
+#include "ADM_threads.h"
+#include "ADM_byteBuffer.h"
+#include "ADM_image.h"
+
+/**
+    \class ADMVideoQuadTrans
+*/
+class  ADMVideoQuadTrans:public ADM_coreVideoFilter
+{
+  public:
+    typedef struct {
+        int         w,h;
+        int         ystart, yincr;
+        int         algo;
+        int *       integerMap;
+        int *       fractionalMap;
+        int         stride;
+        uint8_t *   in;
+        uint8_t *   out;
+        int *       bicubicWeights;
+        uint8_t     blackLevel;
+    } worker_thread_arg;
+
+    typedef struct {
+        quadTrans             prevparam;
+        ADMImage *            imgCopy;
+        int *                 integerMap;
+        int *                 fractionalMap;
+        int *                 integerMapUV;
+        int *                 fractionalMapUV;
+        int *                 bicubicWeights;
+        int                   threads;
+        int                   threadsUV;
+        pthread_t *           worker_threads;
+        worker_thread_arg *   worker_thread_args;
+    } quadTrans_buffers_t;
+
+  protected:
+    void                  update(void);
+    quadTrans             _param;
+    quadTrans_buffers_t   _buffers;
+    static void           bilinear(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, uint8_t * out);
+    static void           bicubic(int w, int h, int stride, uint8_t * in, int x, int y, int fx, int fy, int * weights, uint8_t * out);
+    
+    static void * worker_thread( void *ptr );
+  public:
+    ADMVideoQuadTrans(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoQuadTrans();
+
+    virtual const char    *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool          getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool          getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void          setCoupledConf(CONFcouple *couples);
+    virtual bool          configure(void) ;                 /// Start graphical user interface
+
+    static void QuadTransCreateBuffers(int w, int h, quadTrans_buffers_t * buffers);
+    static void QuadTransDestroyBuffers(quadTrans_buffers_t * buffers);
+    static void QuadTransProcess_C(ADMImage *img, int w, int h, quadTrans param, quadTrans_buffers_t * buffers);
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/cli/DIA_quadTrans.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/DIA_flyQuadTrans.cpp Added

@@ -0,0 +1,57 @@
+/**/
+/***************************************************************************
+                          DIA_flyQuadTrans
+                             -------------------
+
+			   Ui for QuadTrans
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyQuadTrans.h"
+
+/************* COMMON PART *********************/
+
+/**
+ */
+flyQuadTrans::flyQuadTrans (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO)
+  {
+  }
+/**
+ * 
+ */
+flyQuadTrans::~flyQuadTrans()
+{
+
+}
+
+uint8_t  flyQuadTrans::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyQuadTrans::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoQuadTrans::QuadTransProcess_C(out,in->GetWidth(PLANAR_Y),in->GetHeight(PLANAR_Y),param, &buffers);
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/DIA_flyQuadTrans.h Added

@@ -0,0 +1,39 @@
+/***************************************************************************
+  \fn     DIA_flyQuadTrans
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for quadTrans
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_QUADTRANS_H
+#define FLY_QUADTRANS_H
+#include "quadTrans.h"
+#include "ADM_vidQuadTrans.h"
+
+/**
+    \class flyQuadTrans
+*/
+class flyQuadTrans : public ADM_flyDialogYuv
+{
+  friend class Ui_quadTransWindow;
+  public:
+    quadTrans            param;
+    ADMVideoQuadTrans::quadTrans_buffers_t  buffers;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+               flyQuadTrans (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider);
+              ~flyQuadTrans();
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/Q_quadTrans.cpp Added

@@ -0,0 +1,243 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_quadTrans.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidQuadTrans.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_quadTransWindow::Ui_quadTransWindow(QWidget *parent, quadTrans *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyQuadTrans( this,width, height,in,canvas,ui.horizontalSlider);
+        ADMVideoQuadTrans::QuadTransCreateBuffers(width,height, &(myFly->buffers));
+        memcpy(&(myFly->param),param,sizeof(quadTrans));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChangedSpinBox(double))); ui.doubleSpinBox##x->setKeyboardTracking(true);
+        SPINNER(Dx1);
+        SPINNER(Dy1);
+        SPINNER(Dx2);
+        SPINNER(Dy2);
+        SPINNER(Dx3);
+        SPINNER(Dy3);
+        SPINNER(Dx4);
+        SPINNER(Dy4);
+        SPINNER(Zoom);
+#undef SPINNER
+        connect(ui.comboBoxAlgo, SIGNAL(currentIndexChanged(int)), this, SLOT(valueChanged(int)));
+
+        QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+        setModal(true);
+}
+void Ui_quadTransWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_quadTransWindow::gather(quadTrans *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(quadTrans));
+}
+Ui_quadTransWindow::~Ui_quadTransWindow()
+{
+    if(myFly) {
+        ADMVideoQuadTrans::QuadTransDestroyBuffers(&(myFly->buffers));
+        delete myFly;
+    }
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+
+void Ui_quadTransWindow::valueChanged( int f )
+{
+    valueChangedSpinBox(0.0);
+}
+
+void Ui_quadTransWindow::valueChangedSpinBox(double foo)
+{
+    if(lock) return;
+    lock++;
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+/**
+ * \fn reset
+ */
+void Ui_quadTransWindow::reset( bool f )
+{
+    myFly->param.dx1=0;
+    myFly->param.dy1=0;
+    myFly->param.dx2=0;
+    myFly->param.dy2=0;
+    myFly->param.dx3=0;
+    myFly->param.dy3=0;
+    myFly->param.dx4=0;
+    myFly->param.dy4=0;
+    myFly->param.zoom=1;
+    myFly->param.algo=0;
+    lock++;
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_quadTransWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_quadTransWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYCOMBOX(x) w->comboBox##x
+#define MYSPIN(x) w->doubleSpinBox##x
+#define UPLOADSPIN(x, value) \
+        w->doubleSpinBox##x->blockSignals(true); \
+        w->doubleSpinBox##x->setValue(value); \
+        w->doubleSpinBox##x->blockSignals(false);
+//************************
+uint8_t flyQuadTrans::upload()
+{
+    Ui_quadTransDialog *w=(Ui_quadTransDialog *)_cookie;
+    MYCOMBOX(Algo)->setCurrentIndex(param.algo);
+    UPLOADSPIN(Dx1, param.dx1);
+    UPLOADSPIN(Dy1, param.dy1);
+    UPLOADSPIN(Dx2, param.dx2);
+    UPLOADSPIN(Dy2, param.dy2);
+    UPLOADSPIN(Dx3, param.dx3);
+    UPLOADSPIN(Dy3, param.dy3);
+    UPLOADSPIN(Dx4, param.dx4);
+    UPLOADSPIN(Dy4, param.dy4);
+    UPLOADSPIN(Zoom, param.zoom);
+
+    return 1;
+}
+uint8_t flyQuadTrans::download(void)
+{
+    int reject=0;
+    Ui_quadTransDialog *w=(Ui_quadTransDialog *)_cookie;
+    param.algo=MYCOMBOX(Algo)->currentIndex();
+
+#define SPIN_GET(x,y) x=w->doubleSpinBox##y->value();
+    SPIN_GET(param.dx1, Dx1);
+    SPIN_GET(param.dy1, Dy1);
+    SPIN_GET(param.dx2, Dx2);
+    SPIN_GET(param.dy2, Dy2);
+    SPIN_GET(param.dx3, Dx3);
+    SPIN_GET(param.dy3, Dy3);
+    SPIN_GET(param.dx4, Dx4);
+    SPIN_GET(param.dy4, Dy4);
+    SPIN_GET(param.zoom, Zoom);
+
+    upload();
+    return 1;
+}
+void flyQuadTrans::setTabOrder(void)
+{
+    Ui_quadTransDialog *w=(Ui_quadTransDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSHCOMBOX(x) controls.push_back(MYCOMBOX(x));
+#define PUSHSLIDER(x) controls.push_back(MYSLIDER(x));
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(w->checkBox##x);
+    PUSHCOMBOX(Algo)
+    PUSH_SPIN(Zoom)
+    
+    PUSH_SPIN(Dx1)
+    PUSH_SPIN(Dy1)
+    PUSH_SPIN(Dx2)
+    PUSH_SPIN(Dy2)
+    PUSH_SPIN(Dx3)
+    PUSH_SPIN(Dy3)
+    PUSH_SPIN(Dx4)
+    PUSH_SPIN(Dy4)
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+uint8_t DIA_getQuadTrans(quadTrans *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_quadTransWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/Q_quadTrans.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/qt4/quadTrans.ui Added

@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>quadTransDialog</class>
+ <widget class="QDialog" name="quadTransDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>579</width>
+    <height>379</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Quadrilateral transformation</string>
+  </property>
+  <layout class="QGridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="2" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item row="7" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" rowspan="2" colspan="2">
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="0" column="3">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxZoom">
+       <property name="decimals">
+        <number>2</number>
+       </property>
+       <property name="minimum">
+        <double>0.100000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>10.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="comboBoxAlgo">
+       <item>
+        <property name="text">
+         <string>Bilinear</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Bicubic</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelInterpolation">
+       <property name="text">
+        <string>Interpolation:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="labelZoom">
+       <property name="text">
+        <string>Zoom:</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="2">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Δy:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="8">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDy2">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" colspan="9">
+      <widget class="QGraphicsView" name="graphicsView"/>
+     </item>
+     <item row="0" column="5">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Δx:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="7">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Δy:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Δx:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDx1">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDx2">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDy1">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Δx:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDx3">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Δy:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="3">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDy3">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="5">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>Δx:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="6">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDx4">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="7">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>Δy:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="8">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxDy4">
+       <property name="minimum">
+        <double>-9999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>horizontalSlider</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>quadTransDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>quadTransDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/quadTrans/quadTrans_json.cpp Added

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp Changed

@@ -24,6 +24,7 @@
 
 #include "confResampleFps.h"
 #include "confResampleFps_desc.cpp"
+#include "motin.h"
 
 #if 1
     #define aprintf(...) {}
@@ -63,6 +64,7 @@
         ADMImage            *frames[2];
         bool                refill(void);   // Fetch next frame
         bool                prefillDone;        // If true we already have 2 frames fetched
+        motin *             motinp;
 public:
                             resampleFps(ADM_coreVideoFilter *previous,CONFcouple *conf);
                             ~resampleFps();
@@ -104,8 +106,24 @@
 */
 const char *resampleFps::getConfiguration( void )
 {
-static char buf[100];
- snprintf(buf,99," Resample to %2.2f fps",(double)configuration.newFpsNum/configuration.newFpsDen);
+static char buf[256];
+ const char * intpn = NULL;
+ switch (configuration.interpolation)
+ {
+     case 0:
+         intpn = "none";
+         break;
+     case 1:
+         intpn = "blend";
+         break;
+     case 2:
+         intpn = "motion compensation";
+         break;
+     default:
+         intpn = "INVALID";
+         break;
+ }
+ snprintf(buf,255," Resample to %2.2f fps. Interpolation: %s", (double)configuration.newFpsNum/configuration.newFpsDen, intpn);
  return buf;  
 }
 /**
@@ -123,9 +141,11 @@
         configuration.mode=0;
         configuration.newFpsNum=ADM_Fps1000FromUs(previous->getInfo()->frameIncrement);
         configuration.newFpsDen=1000;
+        configuration.interpolation=0;
     }
     if(!frames[0]) frames[0]=new ADMImageDefault(info.width,info.height);
     if(!frames[1]) frames[1]=new ADMImageDefault(info.width,info.height);
+    motinp = new motin(info.width,info.height);
     updateIncrement();
 }
 /**
@@ -137,6 +157,7 @@
     if(frames[0]) delete frames[0];
     if(frames[1]) delete frames[1];
     frames[0]=frames[1]=NULL;
+    delete motinp;
 }
 /**
      \fn refill
@@ -150,7 +171,14 @@
     uint32_t img=0;
     frames[0]=frames[1];
     frames[1]=nw;
-    return previousFilter->getNextFrame(&img,nw);
+    if (!previousFilter->getNextFrame(&img,nw))
+        return false;
+    if (configuration.interpolation == 2)
+    {
+        motinp->createPyramids(frames[0],frames[1]);
+        motinp->estimateMotion();
+    }
+    return true;
 }
 /**
     \fn goToTime
@@ -217,15 +245,61 @@
         *fn=nextFrame++;
         return true;
     }
+    if (configuration.interpolation > 0)
+    {
+        double diff1=(double)thisTime-double(frame1Dts);
+        double diff2=(double)thisTime-double(frame2Dts);
+        if(diff1<0) diff1=-diff1;
+        if(diff2<0) diff2=-diff2;
+        int bl1,bl2;
+        bl1 = round((diff2/(diff1+diff2)) * 256.0);
+        bl2 = round((diff1/(diff1+diff2)) * 256.0);
+        if (bl1==0)
+            image->duplicate(frames[1]);
+        else
+        if (bl2==0)
+            image->duplicate(frames[0]);
+        else
+        {
+            image->duplicate(frames[0]);
+            for (int p=0; p<3; p++)
+            {
+                int width=image->GetWidth((ADM_PLANE)p); 
+                int height=image->GetHeight((ADM_PLANE)p);
+                int ipixel, bpixel;
+                int istride = image->GetPitch((ADM_PLANE)p);
+                int bstride = frames[1]->GetPitch((ADM_PLANE)p);
+                uint8_t * iptr = image->GetWritePtr((ADM_PLANE)p);
+                uint8_t * bptr = frames[1]->GetWritePtr((ADM_PLANE)p);
+                for (int y=0; y<height; y++)
+                {
+                    for(int x=0; x<width; x++)
+                    {
+                        ipixel = iptr[x];
+                        bpixel = bptr[x];
+                        iptr[x] = (ipixel*bl1 + bpixel*bl2) >> 8;
+                    }
+                    iptr += istride;
+                    bptr += bstride;
+                }
+            }
+            
+            if (configuration.interpolation == 2)
+            {
+                motinp->interpolate(image, bl2);
+            }
+        }
+    } else {
     // In between, take closer
-    double diff1=(double)thisTime-double(frame1Dts);
-    double diff2=(double)thisTime-double(frame2Dts);
-    if(diff1<0) diff1=-diff1;
-    if(diff2<0) diff2=-diff2;
-    int index=1;
-    if(diff1<diff2) index=0;
-
-    image->duplicate(frames[index]);
+        double diff1=(double)thisTime-double(frame1Dts);
+        double diff2=(double)thisTime-double(frame2Dts);
+        if(diff1<0) diff1=-diff1;
+        if(diff2<0) diff2=-diff2;
+        int index=1;
+        if(diff1<diff2) index=0;
+
+        image->duplicate(frames[index]);
+    }
     image->Pts=thisTime;
     *fn=nextFrame++;
     return true;
@@ -353,23 +427,28 @@
     f/=configuration.newFpsDen;
 
 ADM_assert(nbPredefined == 6);
-  
-   diaMenuEntry tFps[]={
-#define Z(x)                 {x,     predefinedFps[x].desc}
-                    Z(0),Z(1),Z(2),Z(3),Z(4),Z(5)
 
-          };
+#define Z(x) {x, predefinedFps[x].desc, NULL}
+    diaMenuEntry tFps[]={Z(0),Z(1),Z(2),Z(3),Z(4),Z(5)};
+
+    diaMenuEntry tInterp[3]={
+            {0,QT_TRANSLATE_NOOP("resampleFps","none"),NULL},
+            {1,QT_TRANSLATE_NOOP("resampleFps","Blend"),NULL},
+            {2,QT_TRANSLATE_NOOP("resampleFps","Motion compensation"),NULL}
+    };
+                          
     uint32_t sel=configuration.mode;
     
 
     diaElemMenu mFps(&(configuration.mode),   QT_TRANSLATE_NOOP("resampleFps","_Mode:"), 6,tFps);
-    diaElemFloat fps(&f,QT_TRANSLATE_NOOP("resampleFps","_New frame rate:"),1,200.);
+    diaElemFloat fps(&f,QT_TRANSLATE_NOOP("resampleFps","_New frame rate:"),1,1000.);
+    diaElemMenu mInterp(&(configuration.interpolation),   QT_TRANSLATE_NOOP("resampleFps","_Interpolation:"), 3,tInterp);
 
     mFps.link(tFps+0,1,&fps); // only activate entry in custom mode
 
-    diaElem *elems[2]={&mFps,&fps};
+    diaElem *elems[3]={&mFps,&fps,&mInterp};
   
-    if( diaFactoryRun(QT_TRANSLATE_NOOP("resampleFps","Resample fps"),2,elems))
+    if( diaFactoryRun(QT_TRANSLATE_NOOP("resampleFps","Resample fps"),3,elems))
     {
       if(!configuration.mode) // Custom mode
       {

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.conf -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.conf Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_desc.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/motin.cpp Added

@@ -0,0 +1,1027 @@
+/***************************************************************************
+                          Motion interpolation
+        Copyright 2021 szlldm
+    Blur algorithm:
+        Copyright Mario Klingemann
+        Copyright Maxim Shemanarev
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 "motin.h"
+#include "prefs.h"
+#include <cmath>
+
+#if defined( ADM_CPU_X86) && !defined(_MSC_VER)
+        #define CAN_DO_INLINE_X86_ASM
+#endif
+
+motin::motin(int width, int height)
+{
+    frameW = width;
+    frameH = height;
+    frameA = new ADMImageDefault(width, height);
+    frameB = new ADMImageDefault(width, height);
+    pyramidA = new ADMImage* [MOTIN_MAX_PYRAMID_LEVELS];
+    pyramidB = new ADMImage* [MOTIN_MAX_PYRAMID_LEVELS];
+    pyramidWA = new ADMImage* [MOTIN_MAX_PYRAMID_LEVELS];
+    pyramidWB = new ADMImage* [MOTIN_MAX_PYRAMID_LEVELS];
+    upScalersA   = new ADMColorScalerFull* [MOTIN_MAX_PYRAMID_LEVELS];
+    upScalersB   = new ADMColorScalerFull* [MOTIN_MAX_PYRAMID_LEVELS];
+    downScalers = new ADMColorScalerFull* [MOTIN_MAX_PYRAMID_LEVELS];
+    
+    int lv,wp,hp,pw,ph;
+    lv = 0;
+    wp = frameW;
+    hp = frameH;
+    do {
+        pw = wp;
+        ph = hp;
+        if ((wp < 32) || (hp < 32))
+            break;
+        pyramidA[lv] = new ADMImageDefault(wp, hp);
+        pyramidB[lv] = new ADMImageDefault(wp, hp);
+        pyramidWA[lv] = new ADMImageDefault(wp, hp);
+        pyramidWB[lv] = new ADMImageDefault(wp, hp);
+        
+        wp = ((wp /4) * 2);
+        hp = ((hp /4) * 2);
+        upScalersA[lv] = new ADMColorScalerFull(ADM_CS_GAUSS,pw,ph,wp,hp,ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+        upScalersB[lv] = new ADMColorScalerFull(ADM_CS_GAUSS,pw,ph,wp,hp,ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+        downScalers[lv] = new ADMColorScalerFull(ADM_CS_BILINEAR,wp,hp,pw,ph,ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+        lv += 1;
+        if (lv >= MOTIN_MAX_PYRAMID_LEVELS)
+            break;
+    } while(1);
+    
+    pyramidLevels = lv;
+    
+    threads = ADM_cpu_num_processors();
+    unithreads = threads;
+    threads /= 2;
+    if (threads < 1)
+        threads = 1;
+    if (threads > 64)
+        threads = 64;
+        
+    me_threads1 = new pthread_t [threads];
+    me_threads2 = new pthread_t [threads];
+    worker_thread_args1 = new worker_thread_arg [threads];
+    worker_thread_args2 = new worker_thread_arg [threads];
+    
+    uniw_threads = new pthread_t [unithreads];
+    uniworker_thread_args = new uniworker_thread_arg [unithreads];
+
+}
+
+
+motin::~motin()
+{
+    delete frameA;
+    delete frameB;
+
+    for (int lv=0; lv<pyramidLevels; lv++)
+    {
+        delete upScalersA[lv];
+        delete upScalersB[lv];
+        delete downScalers[lv];
+        delete pyramidA[lv];
+        delete pyramidB[lv];
+        delete pyramidWA[lv];
+        delete pyramidWB[lv];
+    }
+    
+    
+    delete [] upScalersA;
+    delete [] upScalersB;
+    delete [] downScalers;
+    delete [] pyramidA;
+    delete [] pyramidB;
+    delete [] pyramidWA;
+    delete [] pyramidWB;
+    delete [] me_threads1;
+    delete [] me_threads2;
+    delete [] worker_thread_args1;
+    delete [] worker_thread_args2;
+    delete [] uniw_threads;
+    delete [] uniworker_thread_args;
+}
+
+void *motin::scaler_thread( void *ptr )
+{
+    scaler_thread_arg * arg = (scaler_thread_arg*)ptr;
+    int levels = arg->levels;
+    ADMColorScalerFull ** scalers = arg->scalers;
+    ADMImage ** src = arg->src;
+    ADMImage ** dst = arg->dst;
+    
+    for (int lv=0; lv<levels; lv++)
+    {
+        scalers[lv]->convertImage(src[lv], dst[lv]);
+    }
+    
+    pthread_exit(NULL);
+
+    return NULL;
+}
+
+void motin::createPyramids(ADMImage * imgA, ADMImage * imgB)
+{
+    if (pyramidLevels < 1)
+        return;
+    if ((frameW < 128) || (frameH < 128))    // can not handle small images
+        return;
+    
+    frameA->duplicateFull(imgA);
+    frameB->duplicateFull(imgB);
+    pyramidA[0]->duplicateFull(imgA);
+    pyramidB[0]->duplicateFull(imgB);
+    
+    
+    long int histogramA[32], histogramB[32];
+    double sum = 0.0;
+    uint8_t * plA[3], *plB[3];
+    uint8_t * ptrA, * ptrB;
+    int strides[3];
+    uint32_t w,h;
+    frameA->getWidthHeight(&w,&h);
+    frameA->GetPitches(strides);
+    frameA->GetWritePlanes(plA);
+    frameB->GetWritePlanes(plB);
+    
+    for (int p=0; p<3; p++)
+    {
+        if (p == 1)
+        {
+            w /= 2;
+            h /= 2;
+        }
+        memset(histogramA, 0, sizeof(long int)*32);
+        memset(histogramB, 0, sizeof(long int)*32);
+        for (int y=0; y<h; y++)
+        {
+            ptrA = plA[p] + y*strides[p];
+            ptrB = plB[p] + y*strides[p];
+            for (int x=0; x<w; x++)
+            {
+                histogramA[(*ptrA) / 8]++;
+                histogramB[(*ptrB) / 8]++;
+                ptrA++;
+                ptrB++;
+            }
+        }
+        
+        double tmp_sum = 0.0;
+        for (int i=0; i<32; i++)
+            tmp_sum += abs(histogramA[i] - histogramB[i]);
+        tmp_sum /= w;
+        tmp_sum /= h;
+        sum += tmp_sum;
+    }
+    
+    sum = std::sqrt(sum);
+    sceneChanged = (sum > 0.5);
+
+    if (sceneChanged)
+        return;
+
+    pthread_t scth[2];
+    scaler_thread_arg args[2];
+    
+    args[0].levels = (pyramidLevels-1);
+    args[0].scalers = upScalersA;
+    args[0].src = pyramidA;
+    args[0].dst = pyramidA+1;
+    
+    args[1].levels = (pyramidLevels-1);
+    args[1].scalers = upScalersB;
+    args[1].src = pyramidB;
+    args[1].dst = pyramidB+1;
+
+    pthread_create( &scth[0], NULL, scaler_thread, (void*) &args[0]);
+    pthread_create( &scth[1], NULL, scaler_thread, (void*) &args[1]);
+    // work in thread workers...
+    pthread_join( scth[0], NULL);
+    pthread_join( scth[1], NULL);
+
+}
+
+int motin::sad(uint8_t * p1, uint8_t * p2, int stride, int x1, int y1, int x2, int y2)
+{
+    volatile int tmp = 0;
+    unsigned int a,b,i,j;
+    uint8_t * ptrb1, * ptrb2, * ptr1, * ptr2;
+
+    x1 -= 3;
+    y1 -= 3;
+    x2 -= 3;
+    y2 -= 3;
+    
+    ptrb1 = p1 + x1 + y1*stride;
+    ptrb2 = p2 + x2 + y2*stride;
+    
+#ifdef CAN_DO_INLINE_X86_ASM
+ if(CpuCaps::hasMMX())
+ {
+    __asm__(
+    ADM_ASM_ALIGN16
+    "pxor %%mm7,%%mm7\n"
+    ::);
+    
+    uint8_t * ptrb3, * ptrb4;
+    ptrb3 = ptrb1 + stride;
+    ptrb4 = ptrb2 + stride;
+
+    for (j=0; j<4; j++)
+    {
+        __asm__(
+        ADM_ASM_ALIGN16
+        "movq (%0),%%mm0 \n"
+        "movq (%1),%%mm1 \n"
+        "psadbw %%mm1,%%mm0\n"
+        "movq (%2),%%mm2 \n"
+        "movq (%3),%%mm3 \n"
+        "psadbw %%mm3,%%mm2\n"
+        "paddd %%mm0,%%mm7 \n"
+        "paddd %%mm2,%%mm7 \n"
+        : : "r" (ptrb1) , "r" (ptrb2) , "r" (ptrb3) , "r" (ptrb4)
+        );
+        ptrb1 += stride*2;
+        ptrb2 += stride*2;
+        ptrb3 += stride*2;
+        ptrb4 += stride*2;
+    }
+    
+    __asm__(
+    ADM_ASM_ALIGN16
+    "movd %%mm7,(%0)\n"
+    "emms \n"
+    :: "r" (&tmp)
+    );
+ }
+ else
+#endif 
+ {
+    for (j=0; j<8; j++)
+    {
+            ptr1 = ptrb1;
+            ptr2 = ptrb2;
+            ptrb1 += stride;
+            ptrb2 += stride;
+        //for (i=0; i<8; i++)
+        //{ unroll ->
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+            a = *ptr1++;
+            b = *ptr2++;
+            tmp += abs((int)a - (int)b);
+        //}
+    }
+ }
+    return tmp;
+}
+
+
+void *motin::me_worker_thread( void *ptr )
+{
+    worker_thread_arg * arg = (worker_thread_arg*)ptr;
+    int lv = arg->lv;
+    uint8_t ** plA = arg->plA;
+    uint8_t ** plB = arg->plB;
+    uint8_t ** plW = arg->plW;
+    int * strides = arg->strides;
+    uint32_t w = arg->w;
+    uint32_t h = arg->h;
+    uint32_t ystart = arg->ystart;
+    uint32_t yincr = arg->yincr;
+    int x,y,bx,by;
+
+    int penaltyTable[MOTIN_SEARCH_RADIUS+2][MOTIN_SEARCH_RADIUS+2];
+
+    for (y=0; y<(MOTIN_SEARCH_RADIUS+2); y++)
+    {
+        for (x=0; x<(MOTIN_SEARCH_RADIUS+2); x++)
+        {
+            penaltyTable[y][x] = std::round(std::pow(((y+.5)*(y+.5) + (x+.5)*(x+.5)), 1/3.)  * 256);  // add distance penalty <-- this looks like better than sqrt or double sqrt
+        }
+    }
+    w /= 2;
+    h /= 2;
+    
+    for (y=ystart; y<h; y+=yincr)    // line-by-line threading faster than partitioning
+    {
+        for (x=0; x<w; x++)
+        {
+            int initX = (unsigned int)plW[1][y*strides[1]+x];
+            int initY = (unsigned int)plW[2][y*strides[2]+x];
+            initX -= 128;
+            initY -= 128;
+            initX *= 2;
+            initY *= 2;
+            initX += x*2;
+            initY += y*2;
+            
+            if ((initX < 0+3) || (initX >= w*2-1-3) || (initY < 0+3) || (initY >= h*2-1-3))
+            {
+                initX -= x*2;
+                initY -= y*2;
+                initX += 128;
+                initY += 128;
+                plW[1][y*strides[1]+x] = initX;
+                plW[2][y*strides[2]+x] = initY;
+                continue;
+            }
+            
+            int best[2];
+            best[0] = initX;
+            best[1] = initY;
+            int sad0 = sad(plA[0], plB[0], strides[0], x*2, y*2, initX, initY);
+            
+            int radius = MOTIN_SEARCH_RADIUS + ((lv > 0) ? 1:0);
+            for (by=(initY-radius);by<=(initY+radius);by++)
+            {
+                if (by < 0+3)
+                    continue;
+                if (by >= (h*2-1)-3)
+                    continue;
+                for (bx=(initX-radius);bx<=(initX+radius);bx++)
+                {
+                    if (bx < 0+3)
+                        continue;
+                    if (bx >= (w*2-1)-3)
+                        continue;
+                    if ((bx == initX) && (by == initY))
+                        continue;
+                    
+                    int sadc = sad(plA[0], plB[0], strides[0], x*2, y*2, bx, by);
+                    sadc = (sadc * penaltyTable[abs(by-initY)][abs(bx-initX)]) / 256;
+                    
+                    if (sadc < sad0)
+                    {
+                        sad0 = sadc;
+                        best[0] = bx;
+                        best[1] = by;
+                    }
+                }
+            }
+            
+            best[0] -= x*2;
+            best[1] -= y*2;
+            best[0] += 128;
+            best[1] += 128;
+            for (int bl=0; bl<2; bl++)
+            {
+                if (best[bl] < 16)
+                    best[bl] = 16;
+                if (best[bl] > 240)
+                    best[bl] = 240;
+            }
+            plW[1][y*strides[1]+x] = best[0];
+            plW[2][y*strides[2]+x] = best[1];
+        }
+    }
+
+    pthread_exit(NULL);
+
+    return NULL;
+}
+
+static const uint16_t g_stack_blur8_mul[255] = 
+    {
+        512,512,456,512,328,456,335,512,405,328,271,456,388,335,292,512,
+        454,405,364,328,298,271,496,456,420,388,360,335,312,292,273,512,
+        482,454,428,405,383,364,345,328,312,298,284,271,259,496,475,456,
+        437,420,404,388,374,360,347,335,323,312,302,292,282,273,265,512,
+        497,482,468,454,441,428,417,405,394,383,373,364,354,345,337,328,
+        320,312,305,298,291,284,278,271,265,259,507,496,485,475,465,456,
+        446,437,428,420,412,404,396,388,381,374,367,360,354,347,341,335,
+        329,323,318,312,307,302,297,292,287,282,278,273,269,265,261,512,
+        505,497,489,482,475,468,461,454,447,441,435,428,422,417,411,405,
+        399,394,389,383,378,373,368,364,359,354,350,345,341,337,332,328,
+        324,320,316,312,309,305,301,298,294,291,287,284,281,278,274,271,
+        268,265,262,259,257,507,501,496,491,485,480,475,470,465,460,456,
+        451,446,442,437,433,428,424,420,416,412,408,404,400,396,392,388,
+        385,381,377,374,370,367,363,360,357,354,350,347,344,341,338,335,
+        332,329,326,323,320,318,315,312,310,307,304,302,299,297,294,292,
+        289,287,285,282,280,278,275,273,271,269,267,265,263,261,259
+    };
+
+static const uint8_t g_stack_blur8_shr[255] = 
+    {
+          9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17, 
+         17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 
+         19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20,
+         20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21,
+         21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+         21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 
+         22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+         22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+         23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 
+         23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+         24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
+    };
+
+/**
+    \fn StackBlurLine_C
+*/
+void motin::StackBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius)
+{
+    uint_fast32_t div;
+    uint_fast32_t mul_sum;
+    uint_fast32_t shr_sum;
+
+    uint_fast32_t l, p, i;
+    uint_fast32_t stack_ptr;
+    uint_fast32_t stack_start;
+
+    const uint8_t * src_pix_ptr;
+          uint8_t * dst_pix_ptr;
+    uint8_t *     stack_pix_ptr;
+
+    uint_fast32_t sum_r = 0;
+    uint_fast32_t sum_in_r = 0;
+    uint_fast32_t sum_out_r = 0;
+
+    uint_fast32_t lm  = len - 1;
+
+    if ((radius > 0) && (len > 1))
+    {
+        div = radius * 2 + 1;
+        mul_sum = g_stack_blur8_mul[radius];
+        shr_sum = g_stack_blur8_shr[radius];
+
+        for(i = 0; i <= radius; i++)
+        {
+            if ((radius - i) > lm)
+                src_pix_ptr = line + pixPitch*lm;
+            else
+                src_pix_ptr = line + pixPitch*(radius - i);    // fix flickering at the T/L edges, by reflecting the image backward
+            stack_pix_ptr    = (uint8_t *)&stack[i];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_out_r       += src_pix_ptr[0];
+            sum_r           += src_pix_ptr[0] * (i + 1);
+        }
+        src_pix_ptr = line;
+        for(i = 1; i <= radius; i++)
+        {
+            if(i <= lm) src_pix_ptr += pixPitch; 
+            stack_pix_ptr = (uint8_t *)&stack[i + radius];
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+            sum_in_r        += src_pix_ptr[0];
+            sum_r           += src_pix_ptr[0] * (radius + 1 - i);
+        }
+
+        stack_ptr = radius;
+        p = radius;
+        if(p > lm) p = lm;
+        src_pix_ptr = line + pixPitch*p;
+        dst_pix_ptr = line;
+        for(l = 0; l < len; l++)
+        {
+            dst_pix_ptr[0] = (sum_r * mul_sum) >> shr_sum;
+            dst_pix_ptr   += pixPitch;
+
+            sum_r -= sum_out_r;
+   
+            stack_start = stack_ptr + div - radius;
+            if(stack_start >= div) stack_start -= div;
+            stack_pix_ptr = (uint8_t *)&stack[stack_start];
+
+            sum_out_r -= stack_pix_ptr[0];
+
+            if(p < lm) 
+                src_pix_ptr += pixPitch;
+            else if(p < lm*2) 
+                src_pix_ptr -= pixPitch;    // fix flickering at the B/R edges, by reflecting the image backward
+            ++p;
+
+            *(uint32_t*)stack_pix_ptr = *(uint32_t*)src_pix_ptr;
+
+            sum_in_r += src_pix_ptr[0];
+            sum_r    += sum_in_r;
+
+            ++stack_ptr;
+            if(stack_ptr >= div) stack_ptr = 0;
+            stack_pix_ptr = (uint8_t *)&stack[stack_ptr];
+
+            sum_in_r  -= stack_pix_ptr[0];
+            sum_out_r += stack_pix_ptr[0];
+        }
+    }
+}
+
+void *motin::spf_worker_thread( void *ptr )
+{
+    worker_thread_arg * arg = (worker_thread_arg*)ptr;
+    int lv = arg->lv;
+    uint8_t ** plA = arg->plA;
+    uint8_t ** plB = arg->plB;
+    uint8_t ** plW = arg->plW;
+    int * strides = arg->strides;
+    uint32_t w = arg->w;
+    uint32_t h = arg->h;
+    uint32_t ystart = arg->ystart;
+    uint32_t yincr = arg->yincr;
+    uint32_t plane = arg->plane;
+    int x,y,bx,by;
+
+    w /= 2;
+    h /= 2;
+    
+    // spatial filter
+    #define MAX_BLUR_RADIUS (18)
+    uint32_t stack[MAX_BLUR_RADIUS*2+1];
+    int radius = 6*(lv+1);
+    if (radius > MAX_BLUR_RADIUS) radius= MAX_BLUR_RADIUS;
+    for(y = ystart; y < h; y+=yincr)
+    {
+        StackBlurLine_C((plW[plane] + y*strides[plane]), w, 1, stack, radius);
+    }
+
+    for(x = ystart; x < w; x+=yincr)
+    {
+        StackBlurLine_C((plW[plane] + x), h, strides[plane], stack, radius);
+    }
+    #undef MAX_BLUR_RADIUS
+
+    pthread_exit(NULL);
+
+    return NULL;
+}
+
+void *motin::tmf_worker_thread( void *ptr )
+{
+    uniworker_thread_arg * arg = (uniworker_thread_arg*)ptr;
+    uint8_t ** plA = arg->wAplanes;
+    uint8_t ** plB = arg->wBplanes;
+    int * strides = arg->wstrides;
+    uint32_t w = arg->w;
+    uint32_t h = arg->h;
+    uint32_t ystart = arg->ystart;
+    uint32_t yincr = arg->yincr;
+    uint32_t plane = arg->plane;
+    int x,y,bx,by;
+
+    w /= 2;
+    h /= 2;
+
+    // balance directional estimations
+
+    for (y=ystart; y<h; y+=yincr)
+    {
+        for (x=0; x<w; x++)
+        {
+            int a = (unsigned int)plA[plane][y*strides[plane]+x];
+            int b = (unsigned int)plB[plane][y*strides[plane]+x];
+            a -= 128;
+            b -= 128;
+            a -= b;
+            a /= 2;
+            b = -1*a;
+            a += 128;
+            b += 128;
+            plA[plane][y*strides[plane]+x] = a;
+            plB[plane][y*strides[plane]+x] = b;
+        }
+    }
+
+    pthread_exit(NULL);
+
+    return NULL;
+}
+    
+    
+void motin::estimateMotion()
+{
+    if (sceneChanged)
+        return;
+    if ((frameW < 128) || (frameH < 128))    // can not handle small images
+        return;
+
+    uint8_t * planes[3];
+    uint8_t * wplanes[3];
+    int strides[3];
+    uint32_t w,h;
+
+    pyramidWA[pyramidLevels-1]->getWidthHeight(&w,&h);
+    w /= 2;
+    h /= 2;
+    pyramidWA[pyramidLevels-1]->GetPitches(strides);
+
+    pyramidWA[pyramidLevels-1]->GetWritePlanes(wplanes);
+    for (int y = 0; y<h; y++)
+    {
+        memset(wplanes[1] + y*strides[1], 128, w);
+        memset(wplanes[2] + y*strides[2], 128, w);
+    }
+    pyramidWB[pyramidLevels-1]->GetWritePlanes(wplanes);
+    for (int y = 0; y<h; y++)
+    {
+        memset(wplanes[1] + y*strides[1], 128, w);
+        memset(wplanes[2] + y*strides[2], 128, w);
+    }
+
+
+    for (int lv=pyramidLevels-1; lv>=0; lv--)
+    {
+        {
+            uint8_t * plW[3];
+            int strides[3];
+            uint32_t w,h;
+            
+            
+            pyramidWA[lv]->GetWritePlanes(plW);
+            pyramidA[lv]->GetPitches(strides);
+            pyramidA[lv]->getWidthHeight(&w, &h);
+            for (int y=0; y<h; y++)
+                memset(plW[0]+y*strides[0], 128, w);
+            pyramidWB[lv]->GetWritePlanes(plW);
+            for (int y=0; y<h; y++)
+                memset(plW[0]+y*strides[0], 128, w);
+        }
+
+        for (int tr=0; tr<threads; tr++)
+        {
+            worker_thread_args1[tr].lv = lv;
+            pyramidA[lv]->GetWritePlanes(worker_thread_args1[tr].plA);
+            pyramidB[lv]->GetWritePlanes(worker_thread_args1[tr].plB);
+            pyramidWA[lv]->GetWritePlanes(worker_thread_args1[tr].plW);
+            pyramidA[lv]->GetPitches(worker_thread_args1[tr].strides);
+            pyramidA[lv]->getWidthHeight(&worker_thread_args1[tr].w, &worker_thread_args1[tr].h);
+            worker_thread_args1[tr].ystart = tr;
+            worker_thread_args1[tr].yincr = threads;
+
+            worker_thread_args2[tr].lv = lv;
+            pyramidB[lv]->GetWritePlanes(worker_thread_args2[tr].plA);
+            pyramidA[lv]->GetWritePlanes(worker_thread_args2[tr].plB);
+            pyramidWB[lv]->GetWritePlanes(worker_thread_args2[tr].plW);
+            pyramidA[lv]->GetPitches(worker_thread_args2[tr].strides);
+            pyramidA[lv]->getWidthHeight(&worker_thread_args2[tr].w, &worker_thread_args2[tr].h);
+            worker_thread_args2[tr].ystart = tr;
+            worker_thread_args2[tr].yincr = threads;
+        }
+        for (int tr=0; tr<threads; tr++)
+        {
+            pthread_create( &me_threads1[tr], NULL, me_worker_thread, (void*) &worker_thread_args1[tr]);
+            pthread_create( &me_threads2[tr], NULL, me_worker_thread, (void*) &worker_thread_args2[tr]);
+        }
+        
+        // work in thread workers...
+        
+        for (int tr=0; tr<threads; tr++)
+        {
+            pthread_join( me_threads1[tr], NULL);
+            pthread_join( me_threads2[tr], NULL); 
+        }
+
+        for (int dir=0; dir<2; dir++)
+        {
+            uint8_t * plW[3];
+            int strides[3];
+            uint32_t w,h;
+
+            pyramidWA[lv]->GetPitches(strides);
+            pyramidWA[lv]->getWidthHeight(&w, &h);
+            if (dir==0)
+                pyramidWA[lv]->GetWritePlanes(plW);
+            else
+                pyramidWB[lv]->GetWritePlanes(plW);
+
+            w /= 2;
+            h /= 2;
+
+            // threat edges (motion estimate not working on the edges)
+            if (lv > 0)
+            {
+                // top edge
+                for (int p=1; p<3; p++)
+                {
+                    memcpy(plW[p]+0*strides[p], plW[p]+4*strides[p], w);
+                    memcpy(plW[p]+1*strides[p], plW[p]+4*strides[p], w);
+                    memcpy(plW[p]+2*strides[p], plW[p]+4*strides[p], w);
+                    memcpy(plW[p]+3*strides[p], plW[p]+4*strides[p], w);
+                }
+                // bottom edge
+                for (int p=1; p<3; p++)
+                {
+                    memcpy(plW[p]+(h-4)*strides[p], plW[p]+(h-5)*strides[p], w);
+                    memcpy(plW[p]+(h-3)*strides[p], plW[p]+(h-5)*strides[p], w);
+                    memcpy(plW[p]+(h-2)*strides[p], plW[p]+(h-5)*strides[p], w);
+                    memcpy(plW[p]+(h-1)*strides[p], plW[p]+(h-5)*strides[p], w);
+                }
+                // left-right edges
+                for (int p=1; p<3; p++)
+                {
+                    for (int y=0; y<h; y++)
+                    {
+                        for (int x=0;x<4;x++)
+                            plW[p][x] = plW[p][4];
+                        for (int x=(w-4);x<w;x++)
+                            plW[p][x] = plW[p][w-5];
+                    }
+                }
+            }
+        }
+
+        for (int dir=0; dir<2; dir++)
+        {
+        // spatial filters (reuse pthread and arg variables)
+            for (int tr=0; tr<threads; tr++)
+            {
+                worker_thread_args1[tr].plane = dir+1;
+                worker_thread_args2[tr].plane = dir+1;
+                pthread_create( &me_threads1[tr], NULL, spf_worker_thread, (void*) &worker_thread_args1[tr]);
+                pthread_create( &me_threads2[tr], NULL, spf_worker_thread, (void*) &worker_thread_args2[tr]);
+            }
+            
+            // work in thread workers...
+            
+            for (int tr=0; tr<threads; tr++)
+            {
+                pthread_join( me_threads1[tr], NULL);
+                pthread_join( me_threads2[tr], NULL); 
+            }
+        }
+        
+        // temporal filter
+        for (int tr=0; tr<unithreads; tr++)
+        {
+            pyramidWA[lv]->GetWritePlanes(uniworker_thread_args[tr].wAplanes);
+            pyramidWB[lv]->GetWritePlanes(uniworker_thread_args[tr].wBplanes);
+            pyramidWA[lv]->GetPitches(uniworker_thread_args[tr].wstrides);
+            pyramidWA[lv]->getWidthHeight(&uniworker_thread_args[tr].w, &uniworker_thread_args[tr].h);
+            uniworker_thread_args[tr].ystart = tr;
+            uniworker_thread_args[tr].yincr = unithreads;
+        }
+        for (int dir=0; dir<2; dir++)
+        {
+            for (int tr=0; tr<unithreads; tr++)
+            {
+                uniworker_thread_args[tr].plane = dir+1;
+                pthread_create( &uniw_threads[tr], NULL, tmf_worker_thread, (void*) &uniworker_thread_args[tr]);
+            }
+            
+            // work in thread workers...
+            
+            for (int tr=0; tr<unithreads; tr++)
+            {
+                pthread_join( uniw_threads[tr], NULL);
+            }
+        }
+        
+        for (int dir=0; dir<2; dir++)
+        {
+            if (lv>0)
+            {
+                if (dir == 0)
+                {
+                    downScalers[lv-1]->convertImage(pyramidWA[lv], pyramidWA[lv-1]);
+                }
+                else 
+                {
+                    downScalers[lv-1]->convertImage(pyramidWB[lv], pyramidWB[lv-1]);
+                }
+            }
+        }
+    }
+
+}
+
+void *motin::interp_worker_thread( void *ptr )
+{
+    uniworker_thread_arg * arg = (uniworker_thread_arg*)ptr;
+    uint8_t ** dplanes = arg->dplanes;
+    uint8_t ** wAplanes = arg->wAplanes;
+    uint8_t ** wBplanes = arg->wBplanes;
+    uint8_t ** pAplanes = arg->pAplanes;
+    uint8_t ** pBplanes = arg->pBplanes;
+    int * dstrides = arg->dstrides;
+    int * wstrides = arg->wstrides;
+    int * pstrides = arg->pstrides;
+    uint32_t w = arg->w;
+    uint32_t h = arg->h;
+    uint32_t ystart = arg->ystart;
+    uint32_t yincr = arg->yincr;
+    uint32_t plane = arg->plane;
+    int alpha = arg->alpha;
+
+
+    int x,y,p,alpham,error;
+    alpham = 256-alpha;
+
+    for (y=ystart; y<h/2; y+=yincr)
+    {
+        for (x=0; x<w/2; x++)
+        {
+            int mxA,myA,mxB,myB;
+            mxA = (unsigned int)wAplanes[1][x + y*wstrides[1]];
+            myA = (unsigned int)wAplanes[2][x + y*wstrides[2]];
+            mxB = (unsigned int)wBplanes[1][x + y*wstrides[1]];
+            myB = (unsigned int)wBplanes[2][x + y*wstrides[2]];
+            mxA -= 128;
+            myA -= 128;
+            mxB -= 128;
+            myB -= 128;
+            mxA = (mxA*alpha)/256;
+            myA = (myA*alpha)/256;
+            mxB = (mxB*alpham)/256;
+            myB = (myB*alpham)/256;
+            mxA *= -1;
+            myA *= -1;
+            mxB *= -1;
+            myB *= -1;
+            mxA += x*2;
+            myA += y*2;
+            mxB += x*2;
+            myB += y*2;
+
+            error = 0;
+            if ((mxA < 0) || (mxA >= w-1) || (myA < 0) || (myA >= h-1))
+                error += 1;
+            if ((mxB < 0) || (mxB >= w-1) || (myB < 0) || (myB >= h-1))
+                error += 2;
+
+            switch (error)
+            {
+                case 0:    // both valid
+                    {
+                        int px, pxA, pxB;
+                        uint8_t *ptrD, * ptrA, * ptrB;
+                        // Luma:
+                        ptrD = &dplanes[0][x*2+y*2*dstrides[0]];
+                        ptrA = &pAplanes[0][mxA+myA*pstrides[0]];
+                        ptrB = &pBplanes[0][mxB+myB*pstrides[0]];
+                        pxA = (unsigned int)(*(ptrA));
+                        pxB = (unsigned int)(*(ptrB));
+                        px = (pxA*alpham + pxB*alpha)/256;
+                        *(ptrD) = px;
+                        pxA = (unsigned int)(*(ptrA+1));
+                        pxB = (unsigned int)(*(ptrB+1));
+                        px = (pxA*alpham + pxB*alpha)/256;
+                        *(ptrD+1) = px;
+                        ptrD += dstrides[0];
+                        ptrA += pstrides[0];
+                        ptrB += pstrides[0];
+                        pxA = (unsigned int)(*(ptrA));
+                        pxB = (unsigned int)(*(ptrB));
+                        px = (pxA*alpham + pxB*alpha)/256;
+                        *(ptrD) = px;
+                        pxA = (unsigned int)(*(ptrA+1));
+                        pxB = (unsigned int)(*(ptrB+1));
+                        px = (pxA*alpham + pxB*alpha)/256;
+                        *(ptrD+1) = px;
+                        
+                        // Chroma:
+                        mxA /= 2;
+                        myA /= 2;
+                        mxB /= 2;
+                        myB /= 2;
+                        pxA = (unsigned int)pAplanes[1][mxA+myA*pstrides[1]];
+                        pxB = (unsigned int)pBplanes[1][mxB+myB*pstrides[1]];
+                        px = (pxA*alpham + pxB*alpha)/256;
+                        dplanes[1][x+y*dstrides[1]] = px;
+                        pxA = (unsigned int)pAplanes[2][mxA+myA*pstrides[2]];
+                        pxB = (unsigned int)pBplanes[2][mxB+myB*pstrides[2]];
+                        px = (pxA*alpham + pxB*alpha)/256;
+                        dplanes[2][x+y*dstrides[2]] = px;
+                    }
+                    break;
+                case 1:    // only B valid
+                    {
+                        int px, pxB;
+                        uint8_t *ptrD, * ptrB;
+                        // Luma:
+                        ptrD = &dplanes[0][x*2+y*2*dstrides[0]];
+                        ptrB = &pBplanes[0][mxB+myB*pstrides[0]];
+                        pxB = (unsigned int)(*(ptrB));
+                        *(ptrD) = pxB;
+                        pxB = (unsigned int)(*(ptrB+1));
+                        *(ptrD+1) = pxB;
+                        ptrD += dstrides[0];
+                        ptrB += pstrides[0];
+                        pxB = (unsigned int)(*(ptrB));
+                        *(ptrD) = pxB;
+                        pxB = (unsigned int)(*(ptrB+1));
+                        *(ptrD+1) = pxB;
+                        
+                        // Chroma:
+                        mxB /= 2;
+                        myB /= 2;
+                        pxB = (unsigned int)pBplanes[1][mxB+myB*pstrides[1]];
+                        dplanes[1][x+y*dstrides[1]] = pxB;
+                        pxB = (unsigned int)pBplanes[2][mxB+myB*pstrides[2]];
+                        dplanes[2][x+y*dstrides[2]] = pxB;
+
+                    }
+                    break;
+                case 2:    // only A valid
+                    {
+                        int px, pxA;
+                        uint8_t *ptrD, * ptrA;
+                        // Luma:
+                        ptrD = &dplanes[0][x*2+y*2*dstrides[0]];
+                        ptrA = &pAplanes[0][mxA+myA*pstrides[0]];
+                        pxA = (unsigned int)(*(ptrA));
+                        *(ptrD) = pxA;
+                        pxA = (unsigned int)(*(ptrA+1));
+                        *(ptrD+1) = pxA;
+                        ptrD += dstrides[0];
+                        ptrA += pstrides[0];
+                        pxA = (unsigned int)(*(ptrA));
+                        *(ptrD) = pxA;
+                        pxA = (unsigned int)(*(ptrA+1));
+                        *(ptrD+1) = pxA;
+                        
+                        // Chroma:
+                        mxA /= 2;
+                        myA /= 2;
+                        pxA = (unsigned int)pAplanes[1][mxA+myA*pstrides[1]];
+                        dplanes[1][x+y*dstrides[1]] = pxA;
+                        pxA = (unsigned int)pAplanes[2][mxA+myA*pstrides[2]];
+                        dplanes[2][x+y*dstrides[2]] = pxA;
+                    }
+                    break;
+                default:    // neither valid
+                    // use blend
+                    break;
+            }
+
+        }
+    }
+
+    pthread_exit(NULL);
+
+    return NULL;
+}
+
+void motin::interpolate(ADMImage * dst, int alpha)
+{
+    if (sceneChanged)
+        return;
+    if ((frameW < 128) || (frameH < 128))    // can not handle small images
+        return;
+
+    if (alpha > 256)
+        alpha = 256;
+
+    for (int tr=0; tr<unithreads; tr++)
+    {
+        dst->GetPitches(uniworker_thread_args[tr].dstrides);
+        dst->GetWritePlanes(uniworker_thread_args[tr].dplanes);
+        pyramidWA[0]->GetPitches(uniworker_thread_args[tr].wstrides);
+        pyramidWA[0]->GetWritePlanes(uniworker_thread_args[tr].wAplanes);
+        pyramidWB[0]->GetWritePlanes(uniworker_thread_args[tr].wBplanes);
+        frameA->GetPitches(uniworker_thread_args[tr].pstrides);
+        frameA->GetWritePlanes(uniworker_thread_args[tr].pAplanes);
+        frameB->GetWritePlanes(uniworker_thread_args[tr].pBplanes);
+        frameA->getWidthHeight(&uniworker_thread_args[tr].w, &uniworker_thread_args[tr].h);
+        uniworker_thread_args[tr].ystart = tr;
+        uniworker_thread_args[tr].yincr = unithreads;
+        uniworker_thread_args[tr].alpha = alpha;
+    }
+
+    for (int tr=0; tr<unithreads; tr++)
+    {
+        pthread_create( &uniw_threads[tr], NULL, interp_worker_thread, (void*) &uniworker_thread_args[tr]);
+    }
+    
+    // work in thread workers...
+    
+    for (int tr=0; tr<unithreads; tr++)
+    {
+        pthread_join( uniw_threads[tr], NULL);
+    }
+}
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/motin.h Added

@@ -0,0 +1,100 @@
+/***************************************************************************
+                          Motion interpolation
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+ 
+#pragma once
+
+#include "ADM_default.h"
+#include "ADM_threads.h"
+#include "ADM_image.h"
+
+#define MOTIN_MAX_PYRAMID_LEVELS  (7)
+#define MOTIN_SEARCH_RADIUS       (2)
+
+class  motin
+{
+
+  protected:
+    uint32_t    threads;
+    uint32_t    unithreads;
+    int         frameW, frameH;
+    int         pyramidLevels;
+    bool        sceneChanged;
+    ADMImage *  frameA;
+    ADMImage *  frameB;
+    ADMImage ** pyramidA;
+    ADMImage ** pyramidB;
+    ADMImage ** pyramidWA;
+    ADMImage ** pyramidWB;
+    ADMColorScalerFull ** upScalersA;
+    ADMColorScalerFull ** upScalersB;
+    ADMColorScalerFull ** downScalers;
+    
+    typedef struct {
+        int levels;
+        ADMColorScalerFull ** scalers;
+        ADMImage ** src;
+        ADMImage ** dst;
+    } scaler_thread_arg;
+    
+    static void *scaler_thread( void *ptr );
+    
+    typedef struct {
+        int lv;
+        uint8_t * plA[3];
+        uint8_t * plB[3];
+        uint8_t * plW[3];
+        int strides[3];
+        uint32_t w,h;
+        uint32_t ystart, yincr, plane;
+    } worker_thread_arg;
+    
+    pthread_t  * me_threads1;
+    pthread_t  * me_threads2;
+    worker_thread_arg * worker_thread_args1;
+    worker_thread_arg * worker_thread_args2;
+    
+    static void *me_worker_thread( void *ptr );
+    static void *spf_worker_thread( void *ptr );
+    static void *tmf_worker_thread( void *ptr );
+    
+    static int sad(uint8_t * p1, uint8_t * p2, int stride, int x1, int y1, int x2, int y2);
+    static void StackBlurLine_C(uint8_t * line, int len, int pixPitch, uint32_t * stack, unsigned int radius);
+    
+    typedef struct {
+        uint8_t * dplanes[3];
+        uint8_t * wAplanes[3];
+        uint8_t * wBplanes[3];
+        uint8_t * pAplanes[3];
+        uint8_t * pBplanes[3];
+        int dstrides[3];
+        int wstrides[3];
+        int pstrides[3];
+        uint32_t w,h;
+        uint32_t ystart, yincr, plane;
+        int alpha;
+    } uniworker_thread_arg;
+
+    pthread_t  * uniw_threads;
+    uniworker_thread_arg * uniworker_thread_args;
+    
+    static void *interp_worker_thread( void *ptr );
+
+  public:
+    motin(int width, int height);
+    ~motin();
+    
+    void createPyramids(ADMImage * imgA, ADMImage * imgB);
+    void estimateMotion();
+    void interpolate(ADMImage * dst, int alpha);
+};

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.cpp Changed

@@ -46,6 +46,7 @@
 {
     ui.setupUi(this);
     lastPercentage = 100;
+    labelOutArFWidth = labelOutArFWidth10 = 0;
     _param=param;
 
 #define ADD_PAR(x) ui.comboBoxSource->addItem(x); ui.comboBoxDestination->addItem(x);
@@ -65,7 +66,20 @@
     }
 
     ui.lockArCheckBox->setChecked(_param->rsz.lockAR);
-    ui.comboBoxRoundup->setCurrentIndex(_param->rsz.roundup);
+
+#define STR(x) #x
+#define MKSTRING(x) STR(x)
+#define CHECK_COMBO(x,y,z) if(_param->rsz.x>=ui.comboBox##y->count()) \
+    { \
+        ADM_warning("Invalid " MKSTRING(x) " index %d, using default = %d\n",_param->rsz.x,z); \
+        _param->rsz.x = z; \
+    } \
+    ui.comboBox##y->setCurrentIndex(_param->rsz.x);
+    CHECK_COMBO(roundup,Roundup,0)
+    CHECK_COMBO(algo,Algo,1) // bicubic
+    CHECK_COMBO(sourceAR,Source,0)
+    CHECK_COMBO(targetAR,Destination,0)
+#undef CHECK_COMBO
 
     ui.spinBoxWidth->setKeyboardTracking(false);
     ui.spinBoxHeight->setKeyboardTracking(false);
@@ -74,13 +88,12 @@
     ui.spinBoxWidth->setValue(_param->rsz.width & 0xfffffe);
     ui.spinBoxHeight->setValue(_param->rsz.height & 0xfffffe);
     ui.horizontalSlider->setValue(100);
-    ui.comboBoxAlgo->setCurrentIndex(_param->rsz.algo);
-    ui.comboBoxSource->setCurrentIndex(_param->rsz.sourceAR);
-    ui.comboBoxDestination->setCurrentIndex(_param->rsz.targetAR);
     if(_param->rsz.lockAR)
         updateWidthHeightSpinners();
     enableControls(_param->rsz.lockAR);
     roundupChanged(_param->rsz.roundup);
+    
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
 
     connect(ui.comboBoxSource, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
     connect(ui.comboBoxDestination, SIGNAL(currentIndexChanged(int)), this, SLOT(aspectRatioChanged(int)));
@@ -91,6 +104,21 @@
     connectDimensionControls();
 }
 
+void resizeWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    /* Avoid shifting the layout displaying output aspect ratio
+    by setting a sufficient minimum width based on font metrics. */
+    QFontMetrics fm = ui.labelOutArFloat->fontMetrics(); // we may assume that both labels use the same font
+    QString text = "0.0000";
+    labelOutArFWidth = 1.05 * fm.boundingRect(text).width();
+    text = "00.0000";
+    labelOutArFWidth10 = 1.05 * fm.boundingRect(text).width();
+    ui.labelOutArFloat->setMinimumWidth(labelOutArFWidth);
+    text = "(00:00)";
+    ui.labelOutArDef->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+}
+
 void resizeWindow::gather(void)
 {
     _param->rsz.width=ui.spinBoxWidth->value();
@@ -147,6 +175,8 @@
 
     lastPercentage = ui.percentageSpinBox->value();
 
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
+
     connectDimensionControls();
 }
 
@@ -157,7 +187,9 @@
     if (ui.lockArCheckBox->isChecked())
         updateWidthHeightSpinners(false);
     else
-        ui.spinBoxWidth->setValue((uint32_t)value & 0xfffffe);
+        roundUp(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
+
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
 
     connectDimensionControls();
 }
@@ -169,7 +201,9 @@
     if (ui.lockArCheckBox->isChecked())
         updateWidthHeightSpinners(true);
     else
-        ui.spinBoxHeight->setValue((uint32_t)value & 0xfffffe);
+        roundUp(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
+
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
 
     connectDimensionControls();
 }
@@ -181,6 +215,8 @@
     if (ui.lockArCheckBox->isChecked())
         updateWidthHeightSpinners();
 
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
+
     connectDimensionControls();
 }
 
@@ -283,12 +319,73 @@
     ui.labelErrorXY->setText(QString("%1").arg(erx * 100., 0, 'f', 2) + " / " + QString("%1").arg(ery * 100., 0, 'f', 2));
 }
 
+void resizeWindow::printOutAR(int w, int h)
+{
+    static const double arlist[][2] = {
+        {9, 16}, {1, 1}, {6, 5}, {5, 4}, {4, 3}, {11, 8}, {1.43, 1}, {3, 2}, {14, 9}, {16, 10}, {5, 3}, {16, 9}, {1.85, 1}, {1.9, 1}, {2, 1}, {2.2, 1}, {64, 27}, {2.35, 1}, {2.39, 1}, {2.4, 1}, {2.76, 1}, {32, 9}, {18, 5}, {4, 1}
+    };
+    
+    double xx = w;
+    double yy = h;
+    
+    if (ui.lockArCheckBox->isChecked())
+    {
+        int sar = ui.comboBoxSource->currentIndex();
+        int dar = ui.comboBoxDestination->currentIndex();
+        if (sar)
+            yy /= aspectRatio[_param->pal][sar];
+        if (dar)
+            yy /= aspectRatio[_param->pal][dar];
+    }
+    
+    double outar = xx/yy;
+    outar = round(outar*10000.0) / 10000.0;
+    
+    double mindiff = 9999;
+    int minindex = 0;
+    for (int i=0; i<sizeof(arlist) / sizeof(arlist[0]); i++)
+    {
+        double lsar = arlist[i][0] / arlist[i][1];
+        if (mindiff > fabs(lsar - outar))
+        {
+            mindiff = fabs(lsar - outar);
+            minindex = i;
+        }
+    }
+    
+    double lsar = arlist[minindex][0] / arlist[minindex][1];
+    if (outar > lsar)
+        mindiff = outar/lsar - 1.0;
+    else
+        mindiff = lsar/outar - 1.0;
+
+    if (outar < 10.)
+    {
+        if (labelOutArFWidth > 0)
+            ui.labelOutArFloat->setMinimumWidth(labelOutArFWidth);
+    } else
+    {
+        if (labelOutArFWidth10 > 0)
+            ui.labelOutArFloat->setMinimumWidth(labelOutArFWidth10);
+    }
+
+    QString arfloat = QString("%1").arg(outar, 0, 'f', 4);
+    ui.labelOutArFloat->setText(arfloat);
+
+    QString arstr;
+    if (mindiff <= 0.005)
+        arstr = QString("(%1:%2)").arg(arlist[minindex][0]).arg(arlist[minindex][1]);
+    ui.labelOutArDef->setText(arstr);
+}
+
 void resizeWindow::lockArToggled(bool toggled)
 {
     if (ui.lockArCheckBox->isChecked())
         widthSpinBoxChanged(0);
-    else
-        ui.comboBoxRoundup->setCurrentIndex(0);
+    /*else
+        ui.comboBoxRoundup->setCurrentIndex(0);*/
+
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
 
     enableControls(toggled);
 }
@@ -310,6 +407,8 @@
         ui.spinBoxWidth->setSingleStep(2);
         ui.spinBoxHeight->setSingleStep(2);
     }
+
+    printOutAR(ui.spinBoxWidth->value(), ui.spinBoxHeight->value());
 }
 
 void resizeWindow::enableControls(bool lockArChecked)
@@ -324,7 +423,6 @@
     ENABLE(label_10)
     ENABLE(horizontalSlider)
     ENABLE(percentageSpinBox)
-    ENABLE(comboBoxRoundup)
     ENABLE(labelErrorXY)
     ENABLE(comboBoxSource)
     ENABLE(comboBoxDestination)

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/qt4/resizing.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>522</width>
-    <height>405</height>
+    <width>591</width>
+    <height>429</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -191,7 +191,7 @@
            <number>16</number>
           </property>
           <property name="maximum">
-           <number>4096</number>
+           <number>8192</number>
           </property>
           <property name="singleStep">
            <number>2</number>
@@ -227,7 +227,7 @@
            <number>16</number>
           </property>
           <property name="maximum">
-           <number>2160</number>
+           <number>8192</number>
           </property>
           <property name="singleStep">
            <number>2</number>
@@ -477,7 +477,7 @@
            </widget>
           </item>
           <item>
-           <spacer>
+           <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -489,6 +489,33 @@
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QLabel" name="labelOutAR">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string notr="true">Aspect Ratio:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="labelOutArFloat">
+            <property name="text">
+             <string>0.0000</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="labelOutArDef">
+            <property name="text">
+             <string>(00:00)</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
@@ -558,6 +585,11 @@
          <string>Spline</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Nearest neighbor</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/resize/swScaleResize.cpp Changed

@@ -43,7 +43,8 @@
 				DECLARE(BILINEAR),
 				DECLARE(BICUBIC),
 				DECLARE(LANCZOS),
-				DECLARE(SPLINE)
+				DECLARE(SPLINE),
+				DECLARE(POINT)
 		};
 
 
@@ -103,7 +104,12 @@
         configuration.roundup=0;
     }
     resizer=NULL;
-	reset(configuration.width,configuration.height,configuration.algo);
+    if(configuration.algo > 4)
+    {
+        ADM_warning("Invalid algo value %u, using default = 1\n",configuration.algo);
+        configuration.algo = 1;
+    }
+    reset(configuration.width,configuration.height,configuration.algo);
 }
 /**
     \fn swScaleResizeFilter
@@ -211,6 +217,8 @@
                 scalerAlgo=ADM_CS_LANCZOS;break;
         case 3: //spline
                 scalerAlgo=ADM_CS_SPLINE;break;
+        case 4: //nearest neighbor
+                scalerAlgo=ADM_CS_POINT;break;
         default:
                 ADM_error("Invalid algo: %u\n",algo);
                 ADM_assert(0);
@@ -218,7 +226,7 @@
     resizer=new ADMColorScalerFull(scalerAlgo, 
                         previousFilter->getInfo()->width, previousFilter->getInfo()->height, 
                         nw,nh,
-                        ADM_COLOR_YV12,ADM_COLOR_YV12);
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
     return 1;
 }

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/stillimage/stillimage.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/vdpauFilters/ADM_vidVdpauFilter.cpp Changed

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.cpp Added

@@ -0,0 +1,395 @@
+/***************************************************************************
+                          waveletDenoise filter 
+    Algorithm:
+        Copyright 2008 Marco Rossini
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "waveletDenoise.h"
+#include "waveletDenoise_desc.cpp"
+#include "ADM_vidWaveletDenoise.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getWaveletDenoise(waveletDenoise *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoWaveletDenoise,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoWaveletDenoise,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_NOISE,            // Category
+                                      "waveletDenoise",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("waveletDenoise","Wavelet denoiser"),            // Display name
+                                      QT_TRANSLATE_NOOP("waveletDenoise","Based on Marco Rossini's denoiser.") // Description
+                                  );
+
+/**
+    \fn WaveletDenoiseProcess_HatTransformHorizontal
+*/
+inline void ADMVideoWaveletDenoise::WaveletDenoiseProcess_HatTransformHorizontal(int32_t *temp, int32_t *base, int size, int sc)
+{
+    int i;
+    for (i = 0; i < sc; i++)
+        temp[i] = 2 * base[i] + base[sc - i] + base[i + sc];
+    for (; i + sc < size; i++)
+        temp[i] = 2 * base[i] + base[i - sc] + base[i + sc];
+    for (; i < size; i++)
+        temp[i] = 2 * base[i] + base[i - sc] + base[2 * size - 2 - (i + sc)];
+}
+/**
+    \fn WaveletDenoiseProcess_HatTransformVertical
+*/
+inline void ADMVideoWaveletDenoise::WaveletDenoiseProcess_HatTransformVertical(int i, int32_t *temp, int32_t *base, int st, int size, int sc)
+{
+    if (i < sc)
+        temp[0] = (2 * base[st * i] + base[st * (sc - i)] + base[st * (i + sc)])>>4;
+    else if (i + sc < size)
+        temp[0] = (2 * base[st * i] + base[st * (i - sc)] + base[st * (i + sc)])>>4;
+    else if (i < size)
+        temp[0] = (2 * base[st * i] + base[st * (i - sc)] + base[st * (2 * size - 2 - (i + sc))])>>4;
+}
+/**
+    \fn WaveletDenoiseProcess_Core
+*/
+void ADMVideoWaveletDenoise::WaveletDenoiseProcess_Core(int32_t *buf[4], int levels, unsigned int width, unsigned int height, double amount, double softness)
+{
+    int32_t thold, tsoft;
+    unsigned int i, lev, minDim, sc, lpass, hpass, size, col, row;
+    minDim = ((width < height) ? width : height);
+    size = width * height;
+    hpass = 0;
+    int64_t stdev[8];
+    unsigned int samples[8];
+    uint32_t sqr;
+    int tholds[8], tsofts[8], soft;
+
+    soft = std::round(softness * (1 << 8));
+
+    for (lev = 0; lev < levels; lev++)
+    {
+        sc = (1 << lev);
+        if (sc*2 >= minDim) break;
+        lpass = ((lev & 1) + 1);
+        for (row = 0; row < height; row++)
+        {
+            WaveletDenoiseProcess_HatTransformHorizontal(buf[lpass] + row * width, buf[hpass] + row * width, width, sc);
+        }
+        for (row = 0; row < height; row++)
+        {
+            for (col = 0; col < width; col++)
+            {
+                WaveletDenoiseProcess_HatTransformVertical(row, buf[3]+ row * width + col, buf[lpass] + col, width, height, sc);
+            }
+        }
+        memcpy(buf[lpass],buf[3],size*sizeof(int32_t));
+
+        thold = std::round((5.0 / (1 << 6) * exp (-2.6 * std::sqrt (lev + 1)) * 0.8002 / exp (-2.6))* (1 << 16));
+
+        for (i=0; i<8; i++)
+        {
+            stdev[i] = 0;
+            samples[i] = 0;
+        }
+
+        for (i = 0; i < size; i++)
+        {
+            buf[hpass][i] -= buf[lpass][i];
+            if (buf[hpass][i] < thold && buf[hpass][i] > -thold)
+            {
+                sqr = buf[hpass][i];    // if negative --> uint will be huge, but huge*huge == negative*negative
+                sqr = sqr*sqr;
+                stdev[(buf[lpass][i] >> 13) & 0x7] += sqr;
+                samples[(buf[lpass][i] >> 13) & 0x7]++;
+            }
+        }
+
+        for (i = 0; i < 8; i++)
+        {
+            tholds[i] = std::round(amount * std::sqrt ((double)stdev[i] / (samples[i] + 1)));
+            tsofts[i] = std::round((1.0 - softness) * amount * std::sqrt ((double)stdev[i] / (samples[i] + 1)));
+        }
+
+        for (i = 0; i < size; i++)
+        {
+            thold = tholds[(buf[lpass][i] >> 13) & 0x7];
+            tsoft = tsofts[(buf[lpass][i] >> 13) & 0x7];
+
+            if (buf[hpass][i] < -thold)
+                buf[hpass][i] += tsoft;
+            else if (buf[hpass][i] > thold)
+                buf[hpass][i] -= tsoft;
+            else {
+                buf[hpass][i] *= soft;
+                buf[hpass][i] >>= 8;
+            }
+
+            if (hpass)
+                buf[0][i] += buf[hpass][i];
+        }
+
+        hpass = lpass;
+    }
+
+    for (i = 0; i < size; i++)
+    {
+        buf[0][i] = buf[0][i] + buf[lpass][i];
+    }
+}
+/**
+    \fn WaveletDenoiseProcess_C
+*/
+void ADMVideoWaveletDenoise::WaveletDenoiseProcess_C(ADMImage *img, float threshold, float softness, bool highq, bool chroma)
+{
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int stride;
+    uint8_t * ptr;
+    int pixel;
+    int limitL = 0;
+    int limitH = 255;
+
+    int32_t * buf = (int32_t *)malloc(sizeof(int32_t) * width * height * 4);
+    if (!buf) return;
+
+    if (threshold < 0.0) threshold = 0.0;
+    if (threshold > 1.0) threshold = 1.0;
+    if (softness < 0.0) softness = 0.0;
+    if (softness > 1.0) softness = 1.0;
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+    {
+        limitL = 16;
+        limitH = 235;
+    }
+
+    threshold = (threshold*threshold)*10.0;
+
+    int32_t *buffer[4];
+    buffer[0] = &buf[width * height * 0];
+    buffer[1] = &buf[width * height * 1];
+    buffer[2] = &buf[width * height * 2];
+    buffer[3] = &buf[width * height * 3];
+    int32_t * bufptr;
+
+    // Y plane
+    stride=img->GetPitch(PLANAR_Y);
+    ptr=img->GetWritePtr(PLANAR_Y);
+    bufptr = buffer[0];
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            pixel = ptr[x];
+            *bufptr = pixel << 8;
+            bufptr++;
+        }
+        ptr+=stride;
+    }
+
+    // Algo
+    WaveletDenoiseProcess_Core(buffer, (highq ? 5:3), width, height, threshold, softness);
+
+    // Y plane
+    stride=img->GetPitch(PLANAR_Y);
+    ptr=img->GetWritePtr(PLANAR_Y);
+    bufptr = buffer[0];
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            pixel = *bufptr >> 8;
+            bufptr++;
+            if (pixel < limitL) pixel = limitL;
+            if (pixel > limitH) pixel = limitH;
+            ptr[x] = pixel;
+        }
+        ptr+=stride;
+    }
+
+    if (chroma)
+    {
+        if(img->_range == ADM_COL_RANGE_MPEG)
+        {
+            limitH = 239;
+        }
+
+        for (int p=1; p<3; p++)
+        {
+            // UV planes
+            stride=img->GetPitch((ADM_PLANE)p);
+            ptr=img->GetWritePtr((ADM_PLANE)p);
+            bufptr = buffer[0];
+            for(int y=0;y<(height/2);y++)
+            {
+                for (int x=0;x<(width/2);x++)
+                {
+                    pixel = ptr[x];
+                    *bufptr = pixel << 8;
+                    bufptr++;
+                }
+                ptr+=stride;
+            }
+
+            // Algo
+            WaveletDenoiseProcess_Core(buffer, (highq ? 5:3), (width/2), (height/2), threshold, softness);
+
+            // UV planes
+            stride=img->GetPitch((ADM_PLANE)p);
+            ptr=img->GetWritePtr((ADM_PLANE)p);
+            bufptr = buffer[0];
+            for(int y=0;y<(height/2);y++)
+            {
+                for (int x=0;x<(width/2);x++)
+                {
+                    pixel = *bufptr >> 8;
+                    bufptr++;
+                    if (pixel < limitL) pixel = limitL;
+                    if (pixel > limitH) pixel = limitH;
+                    ptr[x] = pixel;
+                }
+                ptr+=stride;
+            }
+        }
+    }
+
+    free(buf);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoWaveletDenoise::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getWaveletDenoise(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoWaveletDenoise::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255," Strength: %.2f, Radius: %.2f, Chroma denoising: %s%s",_param.threshold, _param.softness,(_param.chroma ? "yes":"no"),(_param.highq ? ", High quality":""));
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoWaveletDenoise::ADMVideoWaveletDenoise(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,waveletDenoise_param,&_param))
+        reset(&_param);
+    update();
+}
+/**
+    \fn reset
+*/
+void ADMVideoWaveletDenoise::reset(waveletDenoise *cfg)
+{
+    cfg->threshold = 0.0;
+    cfg->softness = 0.5;
+    cfg->highq = true;
+    cfg->chroma=false;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoWaveletDenoise::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoWaveletDenoise::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoWaveletDenoise::update(void)
+{
+    _threshold=valueLimit(_param.threshold,0.0,1.0);
+    _softness=valueLimit(_param.softness,0.0,1.0);
+    _highq=_param.highq;
+    _chroma=_param.chroma;
+}
+/**
+    \fn dtor
+*/
+ADMVideoWaveletDenoise::~ADMVideoWaveletDenoise()
+{
+    
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoWaveletDenoise::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, waveletDenoise_param,&_param);
+}
+
+void ADMVideoWaveletDenoise::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, waveletDenoise_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoWaveletDenoise::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    WaveletDenoiseProcess_C(image, _threshold, _softness, _highq, _chroma);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/ADM_vidWaveletDenoise.h Added

@@ -0,0 +1,54 @@
+/***************************************************************************
+                          waveletDenoise filter 
+    Algorithm:
+        Copyright 2008 Marco Rossini
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoWaveletDenoise
+*/
+class  ADMVideoWaveletDenoise:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    waveletDenoise       _param;
+    float           _threshold;
+    float           _softness;
+    bool            _highq;
+    bool            _chroma;
+
+    static void          WaveletDenoiseProcess_HatTransformHorizontal(int32_t *temp, int32_t *base, int size, int sc);
+    static void          WaveletDenoiseProcess_HatTransformVertical(int i, int32_t *temp, int32_t *base, int st, int size, int sc);
+    static void          WaveletDenoiseProcess_Core(int32_t *buf[4], int levels, unsigned int width, unsigned int height, double amount, double softness);
+  public:
+    ADMVideoWaveletDenoise(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoWaveletDenoise();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static void          WaveletDenoiseProcess_C(ADMImage *img, float threshold, float softness, bool highq, bool chroma);
+    static void          reset(waveletDenoise *cfg);
+
+  private:
+    float   valueLimit(float val, float min, float max);
+    int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/cli/DIA_waveletDenoise.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/DIA_flyWaveletDenoise.cpp Added

@@ -0,0 +1,43 @@
+/**/
+/***************************************************************************
+                          DIA_WaveletDenoise
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyWaveletDenoise.h"
+
+#include "ADM_vidWaveletDenoise.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyWaveletDenoise::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyWaveletDenoise::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoWaveletDenoise::WaveletDenoiseProcess_C(out, param.threshold, param.softness, param.highq, param.chroma);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/DIA_flyWaveletDenoise.h Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+  \fn     DIA_flyWaveletDenoise
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for waveletDenoise
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_WaveletDenoise_H
+#define FLY_WaveletDenoise_H
+#include "waveletDenoise.h"
+/**
+    \class flyWaveletDenoise
+*/
+class flyWaveletDenoise : public ADM_flyDialogYuv
+{
+
+  public:
+    waveletDenoise  param;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyWaveletDenoise (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/Q_waveletDenoise.cpp Added

@@ -0,0 +1,221 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_waveletDenoise.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidWaveletDenoise.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_waveletDenoiseWindow::Ui_waveletDenoiseWindow(QWidget *parent, waveletDenoise *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyWaveletDenoise( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(waveletDenoise));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChangedSpinBox(double)));
+        SPINNER(Threshold)
+        SPINNER(Softness)
+
+#define TOGGLER(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        TOGGLER(HQ)
+        TOGGLER(Chroma)
+
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_waveletDenoiseWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_waveletDenoiseWindow::gather(waveletDenoise *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(waveletDenoise));
+}
+Ui_waveletDenoiseWindow::~Ui_waveletDenoiseWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.doubleSpinBox##x->blockSignals(true); \
+        ui.doubleSpinBox##x->setValue((float)ui.horizontalSlider##x->value() / 100.0); \
+        ui.doubleSpinBox##x->blockSignals(false);
+void Ui_waveletDenoiseWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Threshold);
+    COPY_VALUE_TO_SPINBOX(Softness);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue((int)round(ui.doubleSpinBox##x->value() * 100.0)); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_waveletDenoiseWindow::valueChangedSpinBox(double foo)
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Threshold);
+    COPY_VALUE_TO_SLIDER(Softness);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_waveletDenoiseWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoWaveletDenoise::reset(&myFly->param);
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_waveletDenoiseWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_waveletDenoiseWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADDBLSPIN(x, value) \
+        w->doubleSpinBox##x->blockSignals(true); \
+        w->doubleSpinBox##x->setValue(value); \
+        w->doubleSpinBox##x->blockSignals(false);
+//************************
+uint8_t flyWaveletDenoise::upload(void)
+{
+    Ui_waveletDenoiseDialog *w=(Ui_waveletDenoiseDialog *)_cookie;
+    MYSPIN(Threshold)->setValue((int)round(param.threshold*100.0));
+    UPLOADDBLSPIN(Threshold, param.threshold);
+    MYSPIN(Softness)->setValue((int)round(param.softness*100.0));
+    UPLOADDBLSPIN(Softness, param.softness);
+    MYCHECK(HQ)->setChecked(param.highq);
+    MYCHECK(Chroma)->setChecked(param.chroma);
+    return 1;
+}
+uint8_t flyWaveletDenoise::download(void)
+{
+    Ui_waveletDenoiseDialog *w=(Ui_waveletDenoiseDialog *)_cookie;
+    param.threshold=((float)MYSPIN(Threshold)->value()) / 100.0;
+    param.softness=((float)MYSPIN(Softness)->value()) / 100.0;
+    param.highq=MYCHECK(HQ)->isChecked();
+    param.chroma=MYCHECK(Chroma)->isChecked();
+    return 1;
+}
+void flyWaveletDenoise::setTabOrder(void)
+{
+    Ui_waveletDenoiseDialog *w=(Ui_waveletDenoiseDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+    PUSH_SPIN(Threshold)
+    PUSHDBLSPIN(Threshold)
+    PUSH_SPIN(Softness)
+    PUSHDBLSPIN(Softness)
+    PUSH_TOG(HQ)
+    PUSH_TOG(Chroma)
+
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getWaveletDenoise(waveletDenoise *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_waveletDenoiseWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/Q_waveletDenoise.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/qt4/waveletDenoise.ui Added

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>waveletDenoiseDialog</class>
+ <widget class="QDialog" name="waveletDenoiseDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>553</width>
+    <height>401</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Wavelet Denoiser</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelThreshold">
+       <property name="text">
+        <string>Threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelSoftness">
+       <property name="text">
+        <string>Softness</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSlider" name="horizontalSliderThreshold">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSlider" name="horizontalSliderSoftness">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="3">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="3" column="0" colspan="2">
+      <widget class="QCheckBox" name="checkBoxHQ">
+       <property name="text">
+        <string>High quality</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0" colspan="2">
+      <widget class="QCheckBox" name="checkBoxChroma">
+       <property name="text">
+        <string>Denoise chroma</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxThreshold">
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxSoftness">
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>waveletDenoiseDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>waveletDenoiseDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletDenoise/waveletDenoise_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.cpp Added

@@ -0,0 +1,316 @@
+/***************************************************************************
+                          waveletSharp filter 
+    Algorithm:
+        Copyright 2008 Marco Rossini
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#define _USE_MATH_DEFINES // some compilers do not export M_PI etc.. if GNU_SOURCE or that is defined, let's do that
+#include <cmath>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+#include "ADM_coreVideoFilterInternal.h"
+#include "DIA_factory.h"
+#include "waveletSharp.h"
+#include "waveletSharp_desc.cpp"
+#include "ADM_vidWaveletSharp.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+extern uint8_t DIA_getWaveletSharp(waveletSharp *param, ADM_coreVideoFilter *in);
+
+
+// Add the hook to make it valid plugin
+//DECLARE_VIDEO_FILTER(   ADMVideoWaveletSharp,   // Class
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ADMVideoWaveletSharp,   // Class
+                                      1,0,0,              // Version
+                                      ADM_UI_TYPE_BUILD,         // UI
+                                      VF_SHARPNESS,            // Category
+                                      "waveletSharp",            // internal name (must be uniq!)
+                                      QT_TRANSLATE_NOOP("waveletSharp","Wavelet sharpener"),            // Display name
+                                      QT_TRANSLATE_NOOP("waveletSharp","Based on Marco Rossini's sharpener.") // Description
+                                  );
+
+/**
+    \fn WaveletSharpProcess_HatTransformHorizontal
+*/
+inline void ADMVideoWaveletSharp::WaveletSharpProcess_HatTransformHorizontal(int32_t *temp, int32_t *base, int size, int sc)
+{
+    int i;
+    for (i = 0; i < sc; i++)
+        temp[i] = 2 * base[i] + base[sc - i] + base[i + sc];
+    for (; i + sc < size; i++)
+        temp[i] = 2 * base[i] + base[i - sc] + base[i + sc];
+    for (; i < size; i++)
+        temp[i] = 2 * base[i] + base[i - sc] + base[2 * size - 2 - (i + sc)];
+}
+/**
+    \fn WaveletSharpProcess_HatTransformVertical
+*/
+inline void ADMVideoWaveletSharp::WaveletSharpProcess_HatTransformVertical(int i, int32_t *temp, int32_t *base, int st, int size, int sc)
+{
+    if (i < sc)
+        temp[0] = (2 * base[st * i] + base[st * (sc - i)] + base[st * (i + sc)])>>4;
+    else if (i + sc < size)
+        temp[0] = (2 * base[st * i] + base[st * (i - sc)] + base[st * (i + sc)])>>4;
+    else if (i < size)
+        temp[0] = (2 * base[st * i] + base[st * (i - sc)] + base[st * (2 * size - 2 - (i + sc))])>>4;
+}
+/**
+    \fn WaveletSharpProcess_Core
+*/
+void ADMVideoWaveletSharp::WaveletSharpProcess_Core(int32_t *buf[4], int levels, unsigned int width, unsigned int height, double amount, double radius, double cutoff)
+{
+    int32_t amt;
+    unsigned int i, lev, minDim, sc, lpass, hpass, size, col, row;
+    minDim = ((width < height) ? width : height);
+    size = width * height;
+    hpass = 0;
+    int cutoffint = cutoff * 100.0;
+
+    for (lev = 0; lev < levels; lev++)
+    {
+        sc = (1 << lev);
+        if (sc*2 >= minDim) break;
+        lpass = ((lev & 1) + 1);
+        for (row = 0; row < height; row++)
+        {
+            WaveletSharpProcess_HatTransformHorizontal(buf[lpass] + row * width, buf[hpass] + row * width, width, sc);
+        }
+        for (row = 0; row < height; row++)
+        {
+            for (col = 0; col < width; col++)
+            {
+                WaveletSharpProcess_HatTransformVertical(row, buf[3]+ row * width + col, buf[lpass] + col, width, height, sc);
+            }
+        }
+        memcpy(buf[lpass],buf[3],size*sizeof(int32_t));
+
+        amt = std::round((amount * exp (-(lev - radius) * (lev - radius) / 1.5) + 1) * (1 << 8));
+
+        for (i = 0; i < size; i++)
+        {
+            buf[hpass][i] -= buf[lpass][i];
+            if (abs(buf[hpass][i]) > cutoffint)
+            {
+                buf[hpass][i] *= amt;
+                buf[hpass][i] >>= 8;
+            }
+
+            if (hpass)
+                buf[0][i] += buf[hpass][i];
+        }
+        hpass = lpass;
+    }
+
+    for (i = 0; i < size; i++)
+    {
+        buf[0][i] = buf[0][i] + buf[lpass][i];
+    }
+}
+/**
+    \fn WaveletSharpProcess_C
+*/
+void ADMVideoWaveletSharp::WaveletSharpProcess_C(ADMImage *img, float strength, float radius, float cutoff, bool highq)
+{
+    int width=img->GetWidth(PLANAR_Y); 
+    int height=img->GetHeight(PLANAR_Y);
+    int stride;
+    uint8_t * ptr;
+    int pixel;
+    int limitL = 0;
+    int limitH = 255;
+
+    int32_t * buf = (int32_t *)malloc(sizeof(int32_t) * width * height * 4);
+    if (!buf) return;
+
+    if (strength < 0.0) strength = 0.0;
+    if (strength > 1.0) strength = 1.0;
+    if (radius < 0.0) radius = 0.0;
+    if (radius > 2.0) radius = 2.0;
+    if (cutoff < 0.0) cutoff = 0.0;
+    if (cutoff > 10.0) cutoff = 10.0;
+
+    if(img->_range == ADM_COL_RANGE_MPEG)
+    {
+        limitL = 16;
+        limitH = 235;
+    }
+
+    strength = (strength*strength)*16.0;
+
+    int32_t *buffer[4];
+    buffer[0] = &buf[width * height * 0];
+    buffer[1] = &buf[width * height * 1];
+    buffer[2] = &buf[width * height * 2];
+    buffer[3] = &buf[width * height * 3];
+    int32_t * bufptr;
+
+    // Y plane
+    stride=img->GetPitch(PLANAR_Y);
+    ptr=img->GetWritePtr(PLANAR_Y);
+    bufptr = buffer[0];
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            pixel = ptr[x];
+            *bufptr = pixel << 8;
+            bufptr++;
+        }
+        ptr+=stride;
+    }
+
+    // Algo
+    WaveletSharpProcess_Core(buffer, (highq ? 5:3), width, height, strength, radius, cutoff);
+
+    // Y plane
+    stride=img->GetPitch(PLANAR_Y);
+    ptr=img->GetWritePtr(PLANAR_Y);
+    bufptr = buffer[0];
+    for(int y=0;y<height;y++)
+    {
+        for (int x=0;x<width;x++)
+        {
+            pixel = *bufptr >> 8;
+            bufptr++;
+            if (pixel < limitL) pixel = limitL;
+            if (pixel > limitH) pixel = limitH;
+            ptr[x] = pixel;
+        }
+        ptr+=stride;
+    }
+
+    free(buf);
+}
+
+/**
+    \fn configure
+*/
+bool ADMVideoWaveletSharp::configure()
+{
+    uint8_t r=0;
+
+    r=  DIA_getWaveletSharp(&_param, previousFilter);
+    if(r) update();
+    return r;
+}
+/**
+    \fn getConfiguration
+*/
+const char   *ADMVideoWaveletSharp::getConfiguration(void)
+{
+    static char s[256];
+    snprintf(s,255," Strength: %.2f, Radius: %.2f, Cutoff: %.2f%s",_param.strength, _param.radius, _param.cutoff,(_param.highq ? ", High quality":""));
+    return s;
+}
+/**
+    \fn ctor
+*/
+ADMVideoWaveletSharp::ADMVideoWaveletSharp(  ADM_coreVideoFilter *in,CONFcouple *couples)  :ADM_coreVideoFilter(in,couples)
+{
+    if(!couples || !ADM_paramLoad(couples,waveletSharp_param,&_param))
+        reset(&_param);
+    update();
+}
+/**
+    \fn reset
+*/
+void ADMVideoWaveletSharp::reset(waveletSharp *cfg)
+{
+    cfg->strength = 0.0;
+    cfg->radius = 0.5;
+    cfg->cutoff = 0.0;
+    cfg->highq = false;
+}
+/**
+    \fn valueLimit
+*/
+float ADMVideoWaveletSharp::valueLimit(float val, float min, float max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn valueLimit
+*/
+int32_t ADMVideoWaveletSharp::valueLimit(int32_t val, int32_t min, int32_t max)
+{
+    if (val < min) val = min;
+    if (val > max) val = max;
+    return val;
+}
+/**
+    \fn update
+*/
+void ADMVideoWaveletSharp::update(void)
+{
+    _strength=valueLimit(_param.strength,0.0,1.0);
+    _radius=valueLimit(_param.radius,0.0,2.0);
+    _cutoff=valueLimit(_param.cutoff,0.0,10.0);
+    _highq=_param.highq;
+}
+/**
+    \fn dtor
+*/
+ADMVideoWaveletSharp::~ADMVideoWaveletSharp()
+{
+    
+}
+/**
+    \fn getCoupledConf
+*/
+bool ADMVideoWaveletSharp::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, waveletSharp_param,&_param);
+}
+
+void ADMVideoWaveletSharp::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, waveletSharp_param, &_param);
+}
+
+/**
+    
+*/
+
+/**
+    \fn getNextFrame
+    \brief
+*/
+bool ADMVideoWaveletSharp::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    /*
+    ADMImage *src;
+    src=vidCache->getImage(nextFrame);
+    if(!src)
+        return false; // EOF
+    *fn=nextFrame++;
+    image->copyInfo(src);
+    image->copyPlane(src,image,PLANAR_Y); // Luma is untouched
+    src = image;
+
+    DoFilter(...);
+
+    vidCache->unlockAll();
+    */
+    if(!previousFilter->getNextFrame(fn,image)) return false;
+
+    WaveletSharpProcess_C(image, _strength, _radius, _cutoff, _highq);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/ADM_vidWaveletSharp.h Added

@@ -0,0 +1,54 @@
+/***************************************************************************
+                          waveletSharp filter 
+    Algorithm:
+        Copyright 2008 Marco Rossini
+        Copyright 2021 szlldm
+    Ported to Avidemux:
+        Copyright 2021 szlldm
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class ADMVideoWaveletSharp
+*/
+class  ADMVideoWaveletSharp:public ADM_coreVideoFilter
+{
+
+  protected:
+    void            update(void);
+    waveletSharp       _param;
+    float           _strength;
+    float           _radius;
+    float           _cutoff;
+    bool            _highq;
+
+    static void          WaveletSharpProcess_HatTransformHorizontal(int32_t *temp, int32_t *base, int size, int sc);
+    static void          WaveletSharpProcess_HatTransformVertical(int i, int32_t *temp, int32_t *base, int st, int size, int sc);
+    static void          WaveletSharpProcess_Core(int32_t *buf[4], int levels, unsigned int width, unsigned int height, double amount, double radius, double cutoff);
+  public:
+    ADMVideoWaveletSharp(ADM_coreVideoFilter *in,CONFcouple *couples);
+    ~ADMVideoWaveletSharp();
+
+    virtual const char   *getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+
+    static void          WaveletSharpProcess_C(ADMImage *img, float strength, float radius, float cutoff, bool highq);
+    static void          reset(waveletSharp *cfg);
+
+  private:
+    float   valueLimit(float val, float min, float max);
+    int32_t valueLimit(int32_t val, int32_t min, int32_t max);
+
+};

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/cli/DIA_waveletSharp.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/DIA_flyWaveletSharp.cpp Added

@@ -0,0 +1,43 @@
+/**/
+/***************************************************************************
+                          DIA_WaveletSharp
+                             -------------------
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/7 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyWaveletSharp.h"
+
+#include "ADM_vidWaveletSharp.h"
+
+/************* COMMON PART *********************/
+uint8_t  flyWaveletSharp::update(void)
+{
+    return 1;
+}
+/**
+    \fn processYuv
+*/
+uint8_t   flyWaveletSharp::processYuv(ADMImage *in,ADMImage *out )
+{
+    out->duplicate(in);
+
+    // Do it!
+    ADMVideoWaveletSharp::WaveletSharpProcess_C(out, param.strength, param.radius, param.cutoff, param.highq);
+
+    return 1;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/DIA_flyWaveletSharp.h Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+  \fn     DIA_flyWaveletSharp
+  \author (C) 2004/2012 by mean/fixounet@free.fr
+  \brief  Ui for waveletSharp
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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 FLY_WaveletSharp_H
+#define FLY_WaveletSharp_H
+#include "waveletSharp.h"
+/**
+    \class flyWaveletSharp
+*/
+class flyWaveletSharp : public ADM_flyDialogYuv
+{
+
+  public:
+    waveletSharp  param;
+  public:
+    uint8_t    processYuv(ADMImage* in, ADMImage *out);
+    uint8_t    download(void);
+    uint8_t    upload(void);
+    uint8_t    update(void);
+    void       setTabOrder(void);
+    flyWaveletSharp (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider) : ADM_flyDialogYuv(parent, width, height, in, canvas, slider, RESIZE_AUTO) {};
+};
+#endif

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/Q_waveletSharp.cpp Added

@@ -0,0 +1,225 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 <QPushButton>
+#include "Q_waveletSharp.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_vidWaveletSharp.h"
+#include <cmath>
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_waveletSharpWindow::Ui_waveletSharpWindow(QWidget *parent, waveletSharp *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+
+        myFly=new flyWaveletSharp( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(myFly->param),param,sizeof(waveletSharp));
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout, ControlOption::PeekOriginalBtn);
+        myFly->setTabOrder();
+        myFly->upload();
+        myFly->sliderChanged();
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) \
+        connect( ui.horizontalSlider##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); \
+        connect( ui.doubleSpinBox##x,SIGNAL(valueChanged(double)),this,SLOT(valueChangedSpinBox(double)));
+        SPINNER(Strength)
+        SPINNER(Radius)
+        SPINNER(Cutoff)
+
+#define TOGGLER(x) connect(ui.checkBox##x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
+        TOGGLER(HQ)
+
+
+        QPushButton *resetButton = ui.buttonBox->button(QDialogButtonBox::Reset);
+        connect(resetButton,SIGNAL(clicked()),this,SLOT(reset()));
+
+        setModal(true);
+}
+void Ui_waveletSharpWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+void Ui_waveletSharpWindow::gather(waveletSharp *param)
+{
+    myFly->download();
+    memcpy(param,&(myFly->param),sizeof(waveletSharp));
+}
+Ui_waveletSharpWindow::~Ui_waveletSharpWindow()
+{
+    if(myFly) delete myFly;
+    myFly=NULL; 
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+#define COPY_VALUE_TO_SPINBOX(x) \
+        ui.doubleSpinBox##x->blockSignals(true); \
+        ui.doubleSpinBox##x->setValue((float)ui.horizontalSlider##x->value() / 100.0); \
+        ui.doubleSpinBox##x->blockSignals(false);
+void Ui_waveletSharpWindow::valueChanged( int f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SPINBOX(Strength);
+    COPY_VALUE_TO_SPINBOX(Radius);
+    COPY_VALUE_TO_SPINBOX(Cutoff);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+#define COPY_VALUE_TO_SLIDER(x) \
+        ui.horizontalSlider##x->blockSignals(true); \
+        ui.horizontalSlider##x->setValue((int)round(ui.doubleSpinBox##x->value() * 100.0)); \
+        ui.horizontalSlider##x->blockSignals(false);
+void Ui_waveletSharpWindow::valueChangedSpinBox( double f )
+{
+    if(lock) return;
+    lock++;
+    COPY_VALUE_TO_SLIDER(Strength);
+    COPY_VALUE_TO_SLIDER(Radius);
+    COPY_VALUE_TO_SLIDER(Cutoff);
+    myFly->download();
+    myFly->sameImage();
+    lock--;
+}
+void Ui_waveletSharpWindow::reset(void)
+{
+    if(lock) return;
+    lock++;
+    ADMVideoWaveletSharp::reset(&myFly->param);
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+
+void Ui_waveletSharpWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+void Ui_waveletSharpWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing after the dialog has settled
+}
+
+#define MYSPIN(x) w->horizontalSlider##x
+#define MYDBLSPIN(x) w->doubleSpinBox##x
+#define MYCHECK(x) w->checkBox##x
+#define UPLOADDBLSPIN(x, value) \
+        w->doubleSpinBox##x->blockSignals(true); \
+        w->doubleSpinBox##x->setValue(value); \
+        w->doubleSpinBox##x->blockSignals(false);
+//************************
+uint8_t flyWaveletSharp::upload(void)
+{
+    Ui_waveletSharpDialog *w=(Ui_waveletSharpDialog *)_cookie;
+    MYSPIN(Strength)->setValue((int)round(param.strength*100.0));
+    UPLOADDBLSPIN(Strength, param.strength);
+    MYSPIN(Radius)->setValue((int)round(param.radius*100.0));
+    UPLOADDBLSPIN(Radius, param.radius);
+    MYSPIN(Cutoff)->setValue((int)round(param.cutoff*100.0));
+    UPLOADDBLSPIN(Cutoff, param.cutoff);
+    MYCHECK(HQ)->setChecked(param.highq);
+    return 1;
+}
+uint8_t flyWaveletSharp::download(void)
+{
+    Ui_waveletSharpDialog *w=(Ui_waveletSharpDialog *)_cookie;
+    param.strength=((float)MYSPIN(Strength)->value()) / 100.0;
+    param.radius=((float)MYSPIN(Radius)->value()) / 100.0;
+    param.cutoff=((float)MYSPIN(Cutoff)->value()) / 100.0;
+    param.highq=MYCHECK(HQ)->isChecked();
+    return 1;
+}
+void flyWaveletSharp::setTabOrder(void)
+{
+    Ui_waveletSharpDialog *w=(Ui_waveletSharpDialog *)_cookie;
+    std::vector<QWidget *> controls;
+#define PUSH_SPIN(x) controls.push_back(MYSPIN(x));
+#define PUSHDBLSPIN(x) controls.push_back(MYDBLSPIN(x));
+#define PUSH_TOG(x) controls.push_back(MYCHECK(x));
+    PUSH_SPIN(Strength)
+    PUSHDBLSPIN(Strength)
+    PUSH_SPIN(Radius)
+    PUSHDBLSPIN(Radius)
+    PUSH_SPIN(Cutoff)
+    PUSHDBLSPIN(Cutoff)
+    PUSH_TOG(HQ)
+
+
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+/**
+    \fn     DIA_getCropParams
+    \brief  Handle crop dialog
+*/
+uint8_t DIA_getWaveletSharp(waveletSharp *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+    Ui_waveletSharpWindow dialog(qtLastRegisteredDialog(), param,in);
+
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+
+    qtUnregisterDialog(&dialog);
+
+    return ret;
+}
+//____________________________________
+// EOF
+
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/Q_waveletSharp.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/qt4/waveletSharp.ui Added

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>waveletSharpDialog</class>
+ <widget class="QDialog" name="waveletSharpDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>553</width>
+    <height>401</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Wavelet Sharpener</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="1" column="1">
+      <widget class="QSlider" name="horizontalSliderStrength">
+       <property name="minimum">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>10</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSlider" name="horizontalSliderRadius">
+       <property name="maximum">
+        <number>200</number>
+       </property>
+       <property name="pageStep">
+        <number>20</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelRadius">
+       <property name="text">
+        <string>Radius</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="4" column="0">
+      <widget class="QCheckBox" name="checkBoxHQ">
+       <property name="text">
+        <string>High quality</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxStrength">
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxRadius">
+       <property name="maximum">
+        <double>2.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="labelStrength">
+       <property name="text">
+        <string>Strength</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="labelCutoff">
+       <property name="text">
+        <string>Noise cutoff</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QSlider" name="horizontalSliderCutoff">
+       <property name="maximum">
+        <number>1000</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QDoubleSpinBox" name="doubleSpinBoxCutoff">
+       <property name="maximum">
+        <double>10.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>waveletSharpDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>waveletSharpDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/waveletSharp/waveletSharp_json.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/ADM_vidZoom.cpp Added

@@ -0,0 +1,414 @@
+/***************************************************************************
+    \file ADM_vidZoom
+    \brief Zoom Filter
+    \author Mean 2002, fixounet@free.Fr
+            szlldm 2021
+
+          Zoom top/left/right/bottom
+          Each one ,must be even
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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_image.h"
+#include "ADM_coreVideoFilter.h"
+#include "DIA_factory.h"
+#include "zoom.h"
+#include "zoom_desc.cpp"
+#include "math.h"
+
+/**
+    \class ZoomFilter
+*/
+class  ZoomFilter:public ADM_coreVideoFilter
+ {
+  protected:
+    zoom                 configuration;
+    ADMImage *           original;
+    void                 resetConfig(void);
+    void                 getFitParameters(int inW, int inH, int outW, int outH, float tolerance, bool stretching, int * strW, int * strH, int * padLeft, int * padRight, int * padTop, int * padBottom);
+    ADMColorScalerFull * resizer;
+    bool                 reset(int left, int right, int top, int bottom, uint32_t algo, float tolerance, uint32_t pad);
+    bool                 clean( void );
+    ADMImage *           stretch;
+    ADMImage *           echo;
+    ADMColorScalerFull * resizerOrigToEcho;
+    ADMColorScalerFull * resizerEchoToImage;
+    int                  stretchW;
+    int                  stretchH;
+    int                  pads[4];
+
+  public:
+                         ZoomFilter(  ADM_coreVideoFilter *in,CONFcouple *couples);
+    virtual             ~ZoomFilter();
+
+    virtual const char * getConfiguration(void);          /// Return  current configuration as a human readable string
+    virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+    //virtual FilterInfo  *getInfo(void);                    /// Return picture parameters after this filter
+    virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+    virtual void         setCoupledConf(CONFcouple *couples);
+    virtual bool         configure(void) ;                 /// Start graphical user interface
+ };
+ 
+
+// Add the hook to make it valid plugin
+DECLARE_VIDEO_FILTER_PARTIALIZABLE(   ZoomFilter,   // Class
+                        1,0,0,              // Version
+                        ADM_UI_TYPE_BUILD,         // UI
+                        VF_TRANSFORM,            // Category
+                        "zoom",            // internal name (must be uniq!)
+                        QT_TRANSLATE_NOOP("zoom","Zoom"),            // Display name
+                        QT_TRANSLATE_NOOP("zoom","Partializable crop filter.") // Description
+                    );
+
+
+//_______________________________________________________________
+/**
+    \fn ZoomFilter
+*/
+ZoomFilter::ZoomFilter(ADM_coreVideoFilter *in,CONFcouple *couples) :ADM_coreVideoFilter(in,couples)
+{
+    original=new ADMImageDefault(info.width,info.height);
+    echo=new ADMImageDefault(16,16);
+    resetConfig();
+    if(couples && !ADM_paramLoadPartial(couples,zoom_param,&configuration))
+    {
+        resetConfig();
+    }
+    if(info.width < (configuration.right+configuration.left))
+    {
+        ADM_warning("Cropped width for zoom exceeds image width. Resetting left and right crop values.\n");
+        configuration.right=configuration.left=0;
+    }
+    if(info.height < (configuration.bottom+configuration.top))
+    {
+        ADM_warning("Cropped height for zoom exceeds image height. Resetting top and bottom crop values.\n");
+        configuration.bottom=configuration.top=0;
+    }
+
+    resizer=NULL;
+    resizerOrigToEcho=NULL;
+    resizerEchoToImage=NULL;
+    stretch=NULL;
+    reset(configuration.left,configuration.right,configuration.top,configuration.bottom,configuration.algo,configuration.tolerance,configuration.pad);
+
+    ADM_info("%s\n",getConfiguration());
+}
+/**
+    \fn ~ZoomFilter
+*/
+ZoomFilter::~ZoomFilter()
+{
+    if(original) delete original;
+    original=NULL;
+    if (echo) delete echo;
+    echo=NULL;
+    clean();
+}
+/**
+    \fn getFitParameters
+*/
+void ZoomFilter::getFitParameters(int inW, int inH, int outW, int outH, float tolerance, bool stretching, int * strW, int * strH, int * padLeft, int * padRight, int * padTop, int * padBottom)
+{
+    float inAR,outAR;
+    if (inW < 0)
+        inW = 0;
+    if (inH < 0)
+        inH = 0;
+    inAR  = (float)inW/(float)inH;
+    outAR = (float)outW/(float)outH;
+
+    //stretching
+    if (inAR > outAR)    // vertical stretching/padding required
+    {
+        if ((inAR <= outAR*(1.0+tolerance)) || stretching) {    // no padding required
+            *strW = outW;
+            *strH = outH;
+        } else {
+            *strW = outW;
+            *strH = round(((float)outW/inAR)/2.0)*2;
+        }
+    } else {             // horizontal stretching/padding required
+        if ((inAR*(1.0+tolerance) >= outAR) || stretching) {    // no padding required
+            *strW = outW;
+            *strH = outH;
+        } else {
+            *strH = outH;
+            *strW = round(((float)outH*inAR)/2.0)*2;
+        }
+    }
+
+    //safety checks
+    if (*strW > outW) *strW = outW;
+    if (*strH > outH) *strH = outH;
+    if (*strW < 16) *strW = 16;
+    if (*strH < 16) *strH = 16;
+
+    // padding
+    *padLeft = 0;
+    *padRight = 0;
+    *padTop = 0;
+    *padBottom = 0;
+    if (*strW < outW)
+    {
+        if ((outW-*strW) < 4)    // no padding
+        {
+            *strW = outW;
+        } else {
+            int diff = outW-*strW;
+            *padLeft = (diff/4)*2;
+            *padRight = diff-*padLeft;
+        }
+    }
+
+    if (*strH < outH)
+    {
+        if ((outH-*strH) < 4)    // no padding
+        {
+            *strH = outH;
+        } else {
+            int diff = outH-*strH;
+            *padTop = (diff/4)*2;
+            *padBottom = diff-*padTop;
+        }
+    }
+}
+/**
+    \fn clean
+    \brief delete resizer
+*/
+bool ZoomFilter::clean(void)
+{
+    if (resizer) delete resizer;
+    resizer=NULL;
+    if (stretch) delete stretch;
+    stretch=NULL;
+    if (resizerOrigToEcho) delete resizerOrigToEcho;
+    resizerOrigToEcho=NULL;
+    if (resizerEchoToImage) delete resizerEchoToImage;
+    resizerEchoToImage=NULL;
+    return true;
+}
+/**
+    \fn reset
+    \brief reset resizer
+*/
+
+bool ZoomFilter::reset(int left, int right, int top, int bottom, uint32_t algo, float tolerance, uint32_t pad)
+{
+    clean();
+    ADMColorScaler_algo scalerAlgo;
+
+    getFitParameters(info.width - (left+right), info.height - (top+bottom), info.width, info.height, tolerance, pad==2, &stretchW, &stretchH, pads+0, pads+1, pads+2, pads+3);
+
+    switch(algo)
+    {
+        case 0: //bilinear
+                scalerAlgo=ADM_CS_BILINEAR;break;
+        case 1: //bicubic
+                scalerAlgo=ADM_CS_BICUBIC;break;
+        case 2: //Lanczos
+                scalerAlgo=ADM_CS_LANCZOS;break;
+        case 3: //spline
+                scalerAlgo=ADM_CS_SPLINE;break;
+        default:
+                ADM_error("Invalid algo: %u\n",algo);
+                ADM_assert(0);
+    }
+    resizer=new ADMColorScalerFull(scalerAlgo, 
+                        info.width - (left+right), info.height - (top+bottom),
+                        stretchW,stretchH,
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+    resizerOrigToEcho=new ADMColorScalerFull(ADM_CS_BICUBIC, 
+                        info.width - (left+right), info.height - (top+bottom),
+                        16,16,
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+    resizerEchoToImage=new ADMColorScalerFull(ADM_CS_LANCZOS, 
+                        16,16, 
+                        info.width, info.height,
+                        ADM_PIXFRMT_YV12,ADM_PIXFRMT_YV12);
+    stretch=new ADMImageDefault(stretchW,stretchH);
+    return 1;
+}
+/**
+   \fn resetConfig
+*/
+void ZoomFilter::resetConfig(void)
+{
+    configuration.top=0;
+    configuration.bottom=0;
+    configuration.left=0;
+    configuration.right=0;
+    configuration.ar_select=0;
+    configuration.algo=1;
+    configuration.tolerance=0.01;
+    configuration.pad=0;
+}
+/**
+    \fn getNextFrame
+
+*/
+bool ZoomFilter::getNextFrame(uint32_t *fn,ADMImage *image)
+{
+    FilterInfo  *prevInfo=previousFilter->getInfo();
+    // read uncompressed frame
+    if(!previousFilter->getNextFrame(fn,original)) return false;
+
+    int padding = configuration.pad;
+    uint8_t *src[3];
+    uint8_t *dst[3];
+    int stridesrc[3];
+    int stridedst[3];
+
+    original->GetReadPlanes(src);
+    stretch->GetWritePlanes(dst);
+    original->GetPitches(stridesrc);
+    stretch->GetPitches(stridedst);
+    src[0] += (configuration.left + stridesrc[0]*configuration.top);
+    src[1] += (configuration.left/2 + stridesrc[1]*(configuration.top/2));
+    src[2] += (configuration.left/2 + stridesrc[2]*(configuration.top/2));
+    resizer->convertPlanes(stridesrc,stridedst,src,dst);
+
+    if (padding == 1)    // echo mode
+    {
+        echo->GetWritePlanes(dst);
+        echo->GetPitches(stridedst);
+        resizerOrigToEcho->convertPlanes(stridesrc,stridedst,src,dst);
+    }
+
+    image->GetWritePlanes(dst);
+    image->GetPitches(stridedst);
+
+    if (padding == 1)    // echo mode
+    {
+        echo->GetReadPlanes(src);
+        echo->GetPitches(stridesrc);
+        resizerEchoToImage->convertPlanes(stridesrc,stridedst,src,dst);
+    }
+
+    stretch->GetReadPlanes(src);
+    stretch->GetPitches(stridesrc);
+
+    int srcwidth=stretchW;
+    int srcheight=stretchH;
+    int width=image->GetWidth(PLANAR_Y); 
+    int height=image->GetHeight(PLANAR_Y);
+    int pleft = pads[0];
+    int pright = pads[1];
+    int ptop = pads[2];
+    int pbot = pads[3];
+    int blacklevel = ((original->_range == ADM_COL_RANGE_MPEG) ? 16:0);
+    int p,y;
+
+
+    for (p=0; p<3;p++)
+    {
+        for (y=0; y<ptop; y++)
+        {
+            if (padding == 0)
+                memset(dst[p], blacklevel, width);
+
+            dst[p] += stridedst[p];
+        }
+
+        for (y=0; y<srcheight; y++)
+        {
+            if (padding == 0)
+                memset(dst[p], blacklevel, pleft);
+
+            memcpy(dst[p]+pleft, src[p], srcwidth);
+
+            if (padding == 0)
+                memset(dst[p]+pleft+srcwidth, blacklevel, pright);
+
+            src[p] += stridesrc[p];
+            dst[p] += stridedst[p];
+        }
+
+        for (y=0; y<pbot; y++)
+        {
+            if (padding == 0)
+                memset(dst[p], blacklevel, width);
+
+            dst[p] += stridedst[p];
+        }
+
+        if (p == 0)
+        {
+            srcwidth /= 2;
+            srcheight /= 2;
+            width /= 2;
+            height /= 2;
+            pleft /= 2;
+            pright /= 2;
+            ptop /= 2;
+            pbot /= 2;
+            blacklevel = 128;
+        }
+    }
+    image->copyInfo(original);     
+    return 1;
+}
+/**
+    \fn getCoupledConf
+    \brief Return our current configuration as couple name=value
+*/
+bool ZoomFilter::getCoupledConf(CONFcouple **couples)
+{
+    return ADM_paramSave(couples, zoom_param,&configuration);
+}
+
+void ZoomFilter::setCoupledConf(CONFcouple *couples)
+{
+    ADM_paramLoad(couples, zoom_param, &configuration);
+}
+
+/**
+    \fn getConfiguration
+    \brief Return current setting as a string
+*/
+const char *ZoomFilter::getConfiguration(void)
+{
+    static char conf[128];
+    conf[0]=0;
+    snprintf(conf,127,"Selection %dx%d => %dx%d",
+                (int)info.width - (configuration.right+configuration.left),
+                (int)info.height - (configuration.bottom+configuration.top),
+                (int)info.width,(int)info.height
+                );
+
+    return conf;
+}
+/**
+    \fn Configure
+*/
+extern int DIA_getZoomParams(	const char *name,zoom *param,ADM_coreVideoFilter *in);
+
+bool ZoomFilter::configure(void)
+
+{
+    uint8_t r;
+    uint32_t w,h;
+    r = DIA_getZoomParams("Zoom Settings",&configuration,previousFilter );
+    if(r)
+    {
+        w=configuration.left+configuration.right;
+        h=configuration.top+configuration.bottom;
+        ADM_assert(w<previousFilter->getInfo()->width);
+        ADM_assert(h<previousFilter->getInfo()->height);
+        info.width=previousFilter->getInfo()->width;
+        info.height=previousFilter->getInfo()->height;
+        ADM_info("%s\n",getConfiguration());
+        reset(configuration.left,configuration.right,configuration.top,configuration.bottom,configuration.algo,configuration.tolerance,configuration.pad);
+    }
+    return r;
+}
+// EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/CMakeLists.txt Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/cli Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/cli/DIA_zoom.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt4 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt4/DIA_flyZoom.cpp Added

@@ -0,0 +1,64 @@
+/***************************************************************************
+                          DIA_flyZoom.cpp  -  description
+                             -------------------
+
+        Common part of the zoom dialog
+    
+    copyright            : (C) 2002/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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyZoom.h"
+
+
+/**
+ * \fn blank
+ * \brief Green bars
+ */
+static void blank(uint8_t *in, int w, int h, int stride)
+{
+    for(int y=0;y<h;y++)
+    {
+        memset(in,0,4*w);
+        uint8_t *green=in+1;
+        for(int x=0;x<w;x++)
+            green[x<<2]=0xff;
+        uint8_t *alpha=in+3;
+        for(int x=0;x<w;x++)
+            alpha[x<<2]=0xff;
+        in+=stride;
+    }
+}
+
+/**
+ * \fn processRgb
+ * @param imageIn
+ * @param imageOut
+ * @return
+ */
+uint8_t flyZoom::processRgb(uint8_t *imageIn, uint8_t *imageOut)
+{
+    int stride=ADM_IMAGE_ALIGN(_w*4);
+    memcpy(imageOut,imageIn,stride*_h);
+
+    blank(imageOut,_w,top,stride);
+    blank(imageOut+stride*(_h-bottom),_w,bottom,stride);
+    blank(imageOut,left,_h,stride);
+    blank(imageOut+(_w-right)*4,right,_h,stride);
+    return true;
+}
+
+
+//EOF
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt4/DIA_flyZoom.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt4/Q_zoom.cpp Added

@@ -0,0 +1,203 @@
+/***************************************************************************
+                          DIA_zoom.cpp  -  description
+                             -------------------
+
+			    GUI for zooming
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/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 "Q_zoom.h"
+#include "ADM_toolkitQt.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_zoomWindow::Ui_zoomWindow(QWidget* parent, zoom *param,ADM_coreVideoFilter *in) : QDialog(parent)
+  {
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        myFly=new flyZoom( this,width, height,in,canvas,ui.horizontalSlider);
+        myFly->left=param->left;
+        myFly->right=param->right;
+        myFly->top=param->top;
+        myFly->bottom=param->bottom;
+        myFly->_cookie=&ui;
+        myFly->addControl(ui.toolboxLayout);
+        myFly->upload();
+        myFly->sliderChanged();
+
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+        connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+#define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+          SPINNER(Left);
+          SPINNER(Right);
+          SPINNER(Top);
+          SPINNER(Bottom);
+  }
+  void Ui_zoomWindow::sliderUpdate(int foo)
+  {
+    myFly->sliderChanged();
+  }
+  void Ui_zoomWindow::gather(zoom *param)
+  {
+        myFly->download(true);
+        param->left=myFly->left;
+        param->right=myFly->right;
+        param->top=myFly->top;
+        param->bottom=myFly->bottom;
+  }
+Ui_zoomWindow::~Ui_zoomWindow()
+{
+  if(myFly) delete myFly;
+  myFly=NULL; 
+  if(canvas) delete canvas;
+  canvas=NULL;
+}
+void Ui_zoomWindow::valueChanged( int f )
+{
+  if(lock) return;
+  lock++;
+  myFly->download();
+  myFly->sameImage();
+  lock--;
+}
+
+void Ui_zoomWindow::reset( bool f )
+{
+         myFly->left=0;
+         myFly->right=0;
+         myFly->bottom=0;
+         myFly->top=0;
+         lock++;
+         myFly->upload();
+         myFly->sameImage();
+         lock--;
+}
+
+void Ui_zoomWindow::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent(event);
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+}
+
+void Ui_zoomWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+}
+
+//************************
+uint8_t flyZoom::upload(void)
+{
+      Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+        
+        w->spinBoxLeft->setValue(left);
+        w->spinBoxRight->setValue(right);
+        w->spinBoxTop->setValue(top);
+        w->spinBoxBottom->setValue(bottom);
+        
+        return 1;
+}
+uint8_t flyZoom::download(bool even)
+{
+    int reject=0;
+    Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+#define SPIN_GET(x,y) x=w->spinBox##y->value();
+    SPIN_GET(left,Left);
+    SPIN_GET(right,Right);
+    SPIN_GET(top,Top);
+    SPIN_GET(bottom,Bottom);
+
+    printf("%d %d %d %d\n",left,right,top,bottom);
+
+    if((top+bottom)>_h)
+    {
+        top=bottom=0;
+        reject=1;
+        ADM_warning(" ** Rejected top bottom **\n");
+    }
+    if((left+right)>_w)
+    {
+        left=right=0;
+        reject=1;
+        ADM_warning(" ** Rejected left right **\n");
+    }
+    if(reject)
+        return upload();
+
+    if(even)
+    {
+        if((_w-left-right)&1)
+        {
+            if(left&1)
+                left&=0xfffe;
+            else if(right)
+                right--;
+            else if(left)
+                left--;
+            else
+                right++;
+        }
+        if((_h-top-bottom)&1)
+        {
+            if(top&1)
+                top&=0xfffe;
+            else if(bottom)
+                bottom--;
+            else if(top)
+                top--;
+            else
+                bottom++;
+        }
+    }
+    return 1;
+}
+
+/**
+      \fn     DIA_getZoomParams
+      \brief  Handle zoom dialog
+*/
+int DIA_getZoomParams(	const char *name,zoom *param,ADM_coreVideoFilter *in)
+{
+        uint8_t ret=0;
+        
+        Ui_zoomWindow dialog(qtLastRegisteredDialog(), param,in);
+		qtRegisterDialog(&dialog);
+
+        if(dialog.exec()==QDialog::Accepted)
+        {
+            dialog.gather(param); 
+            ret=1;
+        }
+
+		qtUnregisterDialog(&dialog);
+
+        return ret;
+}
+//____________________________________
+// EOF

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt4/Q_zoom.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt4/zoom.ui Added

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>zoomDialog</class>
+ <widget class="QDialog" name="zoomDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>507</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Zoom</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <item row="0" column="3">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Right:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Top:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="6">
+      <widget class="QPushButton" name="pushButtonReset">
+       <property name="text">
+        <string>Reset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Bottom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Left:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>spinBoxLeft</tabstop>
+  <tabstop>spinBoxRight</tabstop>
+  <tabstop>spinBoxTop</tabstop>
+  <tabstop>spinBoxBottom</tabstop>
+  <tabstop>pushButtonReset</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>zoomDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>zoomDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt5 Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.cpp Added

@@ -0,0 +1,824 @@
+/***************************************************************************
+ * \file GUI for zoom filter
+ * \author mean 2002/2017 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 <cmath>
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "./DIA_flyZoom.h"
+#include "./Q_zoom.h"
+#include "ADM_toolkitQt.h"
+#include "ADM_QSettings.h"
+
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+flyZoom::flyZoom (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, ADM_QSlider *slider)
+                : ADM_flyDialogRgb(parent,width, height,in,canvas, slider,RESIZE_LAST)
+{
+    rubber=new ADM_rubberControl(this,canvas);
+    left=right=top=bottom=0;
+    _ox=0;
+    _oy=0;
+    _lw=_ow=width;
+    _lh=_oh=height;
+    ar = (double)width / height;
+}
+flyZoom::~flyZoom()
+{
+    delete rubber;
+    rubber=NULL;
+}
+/**
+ * \fn setAspectRatioIndex
+ */
+void flyZoom::setAspectRatioIndex(int index)
+{
+    ar_select = index;
+    switch(index) {
+        case 1: ar = ((double)_lw / _lh);    // current selection
+            break;
+        case 2: ar = ((double)_w / _h);    // source
+            break;
+        case 3: ar = (64.0/27.0);    // 21:9
+            break;
+        case 4: ar = (2.0);    // 18:9
+            break;
+        case 5: ar = (16.0/9.0);    // 16:9
+            break;
+        case 6: ar = (4.0/3.0);    // 4:3
+            break;
+        case 7: ar = (1.0);    // 1:1
+            break;
+        case 8: ar = (9.0/16.0);    // 9:16
+            break;
+        default:ar_select = 0;
+            break;
+    }
+}
+/**
+ * \fn getZoomMargins
+ */
+bool flyZoom::getZoomMargins(int *lf, int *rt, int *tp, int *bt)
+{
+    if(lf) *lf=left;
+    if(rt) *rt=right;
+    if(tp) *tp=top;
+    if(bt) *bt=bottom;
+    return true;
+}
+/**
+ * \fn setZoomMargins
+ * \brief Negative input values will be ignored
+ */
+void flyZoom::setZoomMargins(int lf, int rt, int tp, int bt)
+{
+    if(lf>=0) left=lf;
+    if(rt>=0) right=rt;
+    if(tp>=0) top=tp;
+    if(bt>=0) bottom=bt;
+}
+/**
+ * \fn initRubber
+ * \brief To be called on show event
+ */
+void flyZoom::initRubber(void)
+{
+    rubber->rubberband->show(); // must be called first
+    rubber->rubberband->setVisible(!rubber_is_hidden);
+    rubber->nestedIgnore = 0;
+}
+/**
+ * \fn hideRubber
+ */
+void flyZoom::hideRubber(bool hide)
+{
+    rubber_is_hidden = hide;
+    rubber->rubberband->setVisible(!hide);
+}
+/**
+ * \fn hideRubberGrips
+ */
+void flyZoom::hideRubberGrips(bool hideTopLeft, bool hideBottomRight)
+{
+    rubber->sizeGripEnable(!hideTopLeft, !hideBottomRight);
+}
+/**
+ * \fn adjustRubber
+ */
+void flyZoom::adjustRubber(int x, int y, int w, int h)
+{
+    rubber->move(x,y);
+    rubber->resize(w,h);
+}
+/**
+ * \fn lockRubber
+ */
+int flyZoom::lockRubber(bool lock)
+{
+    int old = rubber->nestedIgnore;
+    if(lock)
+        rubber->nestedIgnore++;
+    else
+        rubber->nestedIgnore--;
+    return old;
+}
+/**
+ * \fn blank
+ * \brief Green bars
+ */
+
+static void blank(uint8_t *in, int w, int h, int stride)
+{
+    uint32_t * tmp;
+    for(int y=0;y<h;y++)
+    {
+        tmp = (uint32_t*)in;
+        for(int x=0;x<w;x++)
+        {
+            *tmp >>= 2;
+            *tmp &= 0xFF3F3F3F;
+            *tmp |= 0xFF000000;
+            *tmp += (192 << 8);
+            tmp += 1;
+        }
+        in+=stride;
+    }
+}
+
+/**
+ * \fn processRgb
+ * @param imageIn
+ * @param imageOut
+ * @return 
+ */
+uint8_t flyZoom::processRgb(uint8_t *imageIn, uint8_t *imageOut)
+{
+    int stride=ADM_IMAGE_ALIGN(_w*4);
+    memcpy(imageOut,imageIn,stride*_h);
+
+    blank(imageOut,_w,top,stride);
+    blank(imageOut+stride*(_h-bottom),_w,bottom,stride);
+    blank(imageOut,left,_h,stride);
+    blank(imageOut+(_w-right)*4,right,_h,stride);
+    return true;
+}
+/**
+ * 
+ * @param imageIn
+ * @param imageOut
+ * @return 
+ */
+static int bound(int val, int other, int maxx)
+{
+   int r=(int)maxx-(int)(val+other);
+   if(r<0) 
+        r=0;
+   return r;
+}
+/**
+ * \fn boundChecked
+ */
+static int boundChecked(int val, int maxx)
+{
+    if(val<0) return 0;
+    if(val>maxx) return maxx;
+    return val;
+}
+/**
+ * \fn recomputeDimensions
+ * \brief Calculate width and height of output picture for given aspect ratio
+          and top-left corner position, bound-check left and top zoom values.
+ * @param ar  : Aspect ratio
+ * @param inw : Input width
+ * @param inh : Input height
+ * @param left: Left zoom value
+ * @param top : Top zoom value
+ * @param outw: Output width
+ * @param outh: Output height
+ */
+static void recomputeDimensions(const double ar, const int inw, const int inh, int &left, int &top, int &outw, int &outh)
+{
+    int arW, arH;
+    aprintf("Keep aspect ratio: %d/%d == %f\n", inw, inh, ar);
+
+    left = boundChecked(left,inw);
+    top  = boundChecked(top,inh);
+    outw = boundChecked(outw,inw);
+    outh = boundChecked(outh,inh);
+    if(!outw || !outh)
+        return;
+
+    if((double)outw / outh > ar)
+    {
+        arW = outw;
+        arH = (double)outw / ar + 0.49;
+    }else
+    {
+        arW = (double)outh * ar + 0.49;
+        arH = outh;
+    }
+
+    if(left + arW > inw)
+    {
+        arW = inw - left;
+        arH = (double)arW / ar + 0.49;
+    }
+    if (top + arH > inh)
+    {
+        arH = inh - top;
+        arW = (double)arH * ar + 0.49;
+    }
+
+    outw = boundChecked(arW,inw);
+    outh = boundChecked(arH,inh);
+}
+/**
+ * \fn bandResized
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @return 
+ */
+bool    flyZoom::bandResized(int x,int y,int w, int h)
+{
+    aprintf("Rubber resized: x=%d, y=%d, w=%d, h=%d\n",x,y,w,h);
+    aprintf("Debug: old values: x=%d, y=%d, w=%d, h=%d\n",_ox,_oy,_ow,_oh);
+
+    double halfzoom=_zoom/2-0.01;
+    // try to recalculate values only if these values were actually modified by moving the handles
+    bool leftHandleMoved=false;
+    bool rightHandleMoved=false;
+    if((x+w)==(_ox+_ow) && (y+h)==(_oy+_oh))
+        leftHandleMoved=true;
+    if(x==_ox && y==_oy)
+        rightHandleMoved=true;
+
+    _ox=x;
+    _oy=y;
+    _ow=w;
+    _oh=h;
+
+    bool ignore=false;
+    if(leftHandleMoved && rightHandleMoved) // bogus event
+        ignore=true;
+
+    int normX, normY, normW, normH;
+    normX=(int)(((double)x+halfzoom)/_zoom);
+    normY=(int)(((double)y+halfzoom)/_zoom);
+    normW=(int)(((double)w+halfzoom)/_zoom);
+    normH=(int)(((double)h+halfzoom)/_zoom);
+
+    // resize the rubberband back into bounds once the user tries to drag handles out of sight
+    bool resizeRubber=false;
+    if(normX<0 || normY<0 || normX+normW>_w || normY+normH>_h)
+    {
+        resizeRubber=true;
+        aprintf("rubberband out of bounds, will be resized back\n");
+    }
+
+    // keep aspect ratio only when dragged on the bottom-right corner
+    if (ar_select > 0 && !ignore && rightHandleMoved)
+    {
+        recomputeDimensions(ar,_w,_h,normX,normY,normW,normH);
+        resizeRubber=true;
+    }
+
+    if(ignore)
+    {
+        upload(false,resizeRubber);
+        return false;
+    }
+
+    if(rightHandleMoved)
+    {
+        right=bound(normX,normW,_w)&0xfffe;
+        bottom=bound(normY,normH,_h)&0xfffe;
+    }
+
+    if(normX<0) normX=0;
+    if(normY<0) normY=0;
+
+    if(leftHandleMoved)
+    {
+        top=normY&0xfffe;
+        left=normX&0xfffe;
+    }
+
+    upload(false,resizeRubber);
+    sameImage();
+    return true; 
+}
+/**
+ * \fn bandMoved
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @return 
+ */
+bool    flyZoom::bandMoved(int x,int y,int w, int h)
+{
+    double halfzoom=_zoom/2-0.01;
+
+    int normX, normY, normW, normH;
+    normX=(int)(((double)x+halfzoom)/_zoom);
+    normY=(int)(((double)y+halfzoom)/_zoom);
+    normW=(int)(((double)w+halfzoom)/_zoom);
+    normH=(int)(((double)h+halfzoom)/_zoom);
+
+    // bound checks are done in rubber control
+
+    right=bound(normX&0xfffe,normW,_w)&0xfffe;
+    bottom=bound(normY&0xfffe,normH,_h)&0xfffe;
+
+    if(normX<0) normX=0;
+    if(normY<0) normY=0;
+
+    top=normY&0xfffe;
+    left=normX&0xfffe;
+
+    upload(false,false);
+    sameImage();
+    return true; 
+}
+/**
+ * \fn blockChanges
+ * @param block
+ * @return 
+ */
+#define APPLY_TO_ALL(x) {w->spinBoxLeft->x;w->spinBoxRight->x;w->spinBoxTop->x;w->spinBoxBottom->x; \
+                         rubber->x;w->checkBoxRubber->x;w->comboBoxAspectRatio->x;}
+bool flyZoom::blockChanges(bool block)
+{
+    Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+    APPLY_TO_ALL(blockSignals(block));
+    return true;
+}
+/**
+ * 
+ * @param redraw
+ * @return 
+ */
+uint8_t flyZoom::upload(bool redraw, bool toRubber)
+{
+    aprintf("left=%d, right=%d, top=%d, bottom=%d\n",left,right,top,bottom);
+    Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+    if(!redraw)
+    {
+        blockChanges(true);
+    }
+    w->spinBoxLeft->setValue(left);
+    w->spinBoxRight->setValue(right);
+    w->spinBoxTop->setValue(top);
+    w->spinBoxBottom->setValue(bottom);
+    dimensions();
+
+    if(toRubber)
+    {
+        rubber->nestedIgnore++;
+        rubber->move(_zoom*(float)left,_zoom*(float)top);
+        rubber->resize(_zoom*(float)(_w-left-right),_zoom*(float)(_h-top-bottom));
+        rubber->nestedIgnore--;
+    }
+
+    if(!redraw)
+    {
+         blockChanges(false);
+    }
+    return 1;
+}
+/**
+ * Read zoom values from UI
+ * @param even Fixup zoom values to make resulting width and height even
+ * @return 
+ */
+uint8_t flyZoom::download(bool even)
+{
+int reject=0;
+Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+#define SPIN_GET(x,y) x=w->spinBox##y->value();
+    SPIN_GET(left,Left);
+    SPIN_GET(right,Right);
+    SPIN_GET(top,Top);
+    SPIN_GET(bottom,Bottom);
+
+    aprintf("%d %d %d %d\n",left,right,top,bottom);
+
+    if((top+bottom)>_h)
+    {
+            top=bottom=0;
+            reject=1;
+            ADM_warning(" ** Rejected top bottom **\n");
+    }
+    if((left+right)>_w)
+    {
+            left=right=0;
+            reject=1;
+            ADM_warning(" ** Rejected left right **\n");
+    }
+    if(reject)
+            upload(false,true);
+    else
+    {
+        blockChanges(true);
+        if(even)
+        {
+            if((_w-left-right)&1)
+            {
+                if(left&1)
+                    left&=0xfffe;
+                else if(right)
+                    right--;
+                else if(left)
+                    left--;
+                else
+                    right++;
+            }
+            if((_h-top-bottom)&1)
+            {
+                if(top&1)
+                    top&=0xfffe;
+                else if(bottom)
+                    bottom--;
+                else if(top)
+                    top--;
+                else
+                    bottom++;
+            }
+        }
+        rubber->nestedIgnore++;
+        rubber->move(_zoom*left+0.49,_zoom*top+0.49);
+        rubber->resize(_zoom*bound(left,right,_w)+0.49,_zoom*bound(top,bottom,_h)+0.49);
+        rubber->nestedIgnore--;
+        blockChanges(false);
+    }
+    dimensions();
+    return true;
+}
+
+/**
+ * \fn dimensions
+ * \brief Fill in label displaying video size
+ */
+void flyZoom::dimensions(void)
+{
+    Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+    QString dim=QString(QT_TRANSLATE_NOOP("zoom","Selection: "));
+    dim+=QString::number(_w-left-right);
+    dim+=QString(" x ");
+    dim+=QString::number(_h-top-bottom);
+    w->labelSize->setText(dim);
+}
+
+/**
+ * \fn setTabOrder
+ * \brief Move navigation / playback buttons up the tab order list
+ */
+void flyZoom::setTabOrder(void)
+{
+    Ui_zoomDialog *w=(Ui_zoomDialog *)_cookie;
+    std::vector<QWidget *> controls;
+
+#define PUSHME(x) controls.push_back(w->spinBox##x);
+    PUSHME(Left)
+    PUSHME(Right)
+    PUSHME(Top)
+    PUSHME(Bottom)
+
+    controls.push_back(w->checkBoxRubber);
+    controls.push_back(w->comboBoxAspectRatio);
+    controls.insert(controls.end(), buttonList.begin(), buttonList.end());
+    controls.push_back(w->horizontalSlider);
+
+    QWidget *first, *second;
+
+    for(std::vector<QWidget *>::iterator tor = controls.begin(); tor != controls.end(); ++tor)
+    {
+        if(tor+1 == controls.end()) break;
+        first = *tor;
+        second = *(tor+1);
+        _parent->setTabOrder(first,second);
+        //ADM_info("Tab order: %p (%s) --> %p (%s)\n",first,first->objectName().toUtf8().constData(),second,second->objectName().toUtf8().constData());
+    }
+}
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+Ui_zoomWindow::Ui_zoomWindow(QWidget* parent, zoom *param,ADM_coreVideoFilter *in) : QDialog(parent)
+{
+    ui.setupUi(this);
+    lock=0;
+    // Allocate space for green-ised video
+    inputWidth = in->getInfo()->width;
+    inputHeight = in->getInfo()->height;
+
+    canvas = new ADM_QCanvas(ui.graphicsView, inputWidth, inputHeight);
+
+    myFly = new flyZoom(this, inputWidth, inputHeight, in, canvas, ui.horizontalSlider);
+    myFly->setZoomMargins(param->left, param->right, param->top, param->bottom);
+
+    bool rubberIsHidden = false;
+    QSettings *qset = qtSettingsCreate();
+    if(qset)
+    {
+        qset->beginGroup("zoom");
+        rubberIsHidden = qset->value("rubberIsHidden", false).toBool();
+        qset->endGroup();
+        delete qset;
+        qset = NULL;
+    }
+
+    myFly->hideRubber(rubberIsHidden);
+    myFly->_cookie=&ui;
+    myFly->addControl(ui.toolboxLayout);
+    myFly->setTabOrder();
+
+    ui.checkBoxRubber->setChecked(rubberIsHidden);
+    ui.comboBoxAspectRatio->setCurrentIndex(param->ar_select);
+    if(!param->ar_select)
+        myFly->upload(false,true);
+    myFly->sliderChanged();
+    myFly->lockRubber(true);
+
+    connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+    connect( ui.checkBoxRubber,SIGNAL(stateChanged(int)),this,SLOT(toggleRubber(int)));
+    connect( ui.comboBoxAspectRatio,SIGNAL(currentIndexChanged(int)),this,SLOT(changeARSelect(int)));
+
+    ui.comboBoxAlgo->setCurrentIndex(param->algo);
+    ui.comboBoxPad->setCurrentIndex(param->pad);
+
+    QPushButton *pushButtonReset = ui.buttonBox->button(QDialogButtonBox::Reset);
+    connect(pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+
+    changeARSelect(param->ar_select);
+
+#define SPINNER(x) connect(ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(widthChanged(int)));
+    SPINNER(Left)
+    SPINNER(Right)
+#undef SPINNER
+#define SPINNER(x) connect(ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(heightChanged(int)));
+    SPINNER(Top)
+    SPINNER(Bottom)
+
+    setModal(true);
+}
+/**
+ * 
+ * @param foo
+ */
+void Ui_zoomWindow::sliderUpdate(int foo)
+{
+    myFly->sliderChanged();
+}
+/**
+ * 
+ * @param param
+ */
+void Ui_zoomWindow::gather(zoom *param)
+{
+    myFly->download(true);
+    int left,right,top,bottom;
+    myFly->getZoomMargins(&left,&right,&top,&bottom);
+    param->left = left;
+    param->right = right;
+    param->top = top;
+    param->bottom = bottom;
+    param->ar_select = myFly->getAspectRatioIndex();
+    param->algo=ui.comboBoxAlgo->currentIndex();
+    param->pad=ui.comboBoxPad->currentIndex();
+}
+/**
+ * \fn dtor
+ */
+Ui_zoomWindow::~Ui_zoomWindow()
+{
+    if(myFly)
+    {
+        QSettings *qset = qtSettingsCreate();
+        if(qset)
+        {
+            qset->beginGroup("zoom");
+            qset->setValue("rubberIsHidden", myFly->stateOfRubber());
+            qset->endGroup();
+            delete qset;
+            qset = NULL;
+        }
+        delete myFly;
+        myFly=NULL;
+    }
+    if(canvas) delete canvas;
+    canvas=NULL;
+}
+/**
+ * \fn widthChanged
+ */
+void Ui_zoomWindow::widthChanged(int val)
+{
+    if(lock) return;
+    lock++;
+    myFly->lockRubber(true);
+    if(myFly->getKeepAspect())
+        updateRightBottomSpinners(val,false);
+    myFly->download();
+    myFly->sameImage();
+    myFly->lockRubber(false);
+    lock--;
+}
+/**
+ * \fn heightChanged
+ */
+void Ui_zoomWindow::heightChanged(int val)
+{
+    if(lock) return;
+    lock++;
+    myFly->lockRubber(true);
+    if(myFly->getKeepAspect())
+        updateRightBottomSpinners(val,true);
+    myFly->download();
+    myFly->sameImage();
+    myFly->lockRubber(false);
+    lock--;
+}
+/**
+ * \fn updateRightBottomSpinners
+ */
+void Ui_zoomWindow::updateRightBottomSpinners(int val, bool useHeightAsRef)
+{
+    const double ar = myFly->getAspectRatio();
+    int left,top;
+    myFly->getZoomMargins(&left,NULL,&top,NULL);
+    myFly->blockChanges(true);
+
+    if(useHeightAsRef)
+    {
+        int h = boundChecked(inputHeight - top - val, inputHeight);
+        int w = (double)h * ar + 0.49;
+        w = boundChecked(inputWidth - w - left, inputWidth);
+
+        ui.spinBoxRight->setValue(w);
+    }else
+    {
+        int w = boundChecked(inputWidth - left - val, inputWidth);
+        int h = (double)w / ar + 0.49;
+        h = boundChecked(inputHeight - h - top, inputHeight);
+
+        ui.spinBoxBottom->setValue(h);
+    }
+    myFly->blockChanges(false);
+}
+/**
+ * \fn toggleRubber
+ */
+void Ui_zoomWindow::toggleRubber(int checkState)
+{
+    bool visible=true;
+    if(checkState)
+        visible=false;
+    myFly->hideRubber(!visible);
+}
+/**
+ * \fn applyAspectRatio
+ */
+void Ui_zoomWindow::applyAspectRatio(void) {
+    if(!lock)
+    {
+        lock++;
+        int left,right,top,bottom;
+        myFly->getZoomMargins(&left,&right,&top,&bottom);
+        int wout = inputWidth - left - right;
+        int hout = inputHeight - top - bottom;
+        recomputeDimensions(myFly->getAspectRatio(),inputWidth,inputHeight,left,top,wout,hout);
+
+        right = boundChecked(inputWidth - wout - left, inputWidth);
+        bottom = boundChecked(inputHeight - hout - top, inputHeight);
+        myFly->setZoomMargins(left,right,top,bottom);
+        myFly->upload(true,true);
+
+        myFly->lockRubber(true);
+        myFly->download();
+        myFly->sameImage();
+        myFly->lockRubber(false);
+        lock--;
+    }
+}
+/**
+ * \fn changeARSelect
+ */
+void Ui_zoomWindow::changeARSelect(int f)
+{
+    myFly->lockDimensions();
+    myFly->setAspectRatioIndex(f);
+
+    bool keep_aspect = myFly->getKeepAspect();
+    if(keep_aspect)
+        applyAspectRatio();
+    ui.spinBoxLeft->setEnabled(!keep_aspect);
+    ui.spinBoxTop->setEnabled(!keep_aspect);
+    myFly->hideRubberGrips(keep_aspect,false);
+}
+
+/**
+ * 
+ * @param f
+ */
+void Ui_zoomWindow::reset( bool f )
+{
+    lock++;
+    myFly->blockChanges(true);
+    ui.comboBoxAspectRatio->setCurrentIndex(0);
+    myFly->setAspectRatioIndex(0);
+    changeARSelect(0);
+    myFly->setZoomMargins(0,0,0,0);
+    myFly->lockDimensions();
+    myFly->blockChanges(false);
+    ui.comboBoxAlgo->setCurrentIndex(1);
+    ui.comboBoxPad->setCurrentIndex(0);
+    myFly->upload();
+    myFly->sameImage();
+    lock--;
+}
+/**
+ * 
+ * @param event
+ */
+void Ui_zoomWindow::resizeEvent(QResizeEvent *event)
+{
+    if(!canvas->height())
+        return;
+    uint32_t graphicsViewWidth = canvas->parentWidget()->width();
+    uint32_t graphicsViewHeight = canvas->parentWidget()->height();
+    myFly->fitCanvasIntoView(graphicsViewWidth,graphicsViewHeight);
+    myFly->adjustCanvasPosition();
+
+    int left,right,top,bottom;
+    myFly->getZoomMargins(&left,&right,&top,&bottom);
+
+    float z = myFly->getZoomValue();
+    int x = (double)left * z + 0.49;
+    int y = (double)top * z + 0.49;
+    int w = (double)(inputWidth - (left + right)) * z + 0.49;
+    int h = (double)(inputHeight - (top + bottom)) * z + 0.49;
+
+    myFly->blockChanges(true);
+    myFly->lockRubber(true);
+    myFly->adjustRubber(x,y,w,h);
+    myFly->lockRubber(false);
+    myFly->blockChanges(false);
+}
+
+/**
+ * \fn showEvent
+ * \brief set canvas size and position
+ */
+void Ui_zoomWindow::showEvent(QShowEvent *event)
+{
+    myFly->initRubber();
+    QDialog::showEvent(event);
+    /* Avoid shifting the layout displaying output aspect ratio
+    by setting a sufficient minimum width based on font metrics. */
+    QFontMetrics fm = ui.labelSize->fontMetrics(); // we may assume that both labels use the same font
+    QString text = QString(QT_TRANSLATE_NOOP("zoom","Selection: "));
+
+    int w = inputWidth;
+    int h = inputHeight;
+    const char *str[5] = {"0","00","000","0000","00000"};
+
+    int pos = 0;
+    while((w = w / 10) && pos < 4)
+        pos++;
+    text += str[pos];
+    text += " x ";
+    pos = 0;
+    while((h = h / 10) && pos < 4)
+        pos++;
+    text += str[pos];
+
+    ui.labelSize->setMinimumWidth(1.05 * fm.boundingRect(text).width());
+
+    myFly->adjustCanvasPosition();
+    canvas->parentWidget()->setMinimumSize(30,30); // allow resizing both ways after the dialog has settled
+}
+
+//EOF
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt5/DIA_flyZoom.h Added

@@ -0,0 +1,50 @@
+#pragma once
+
+class flyZoom;
+
+class flyZoom : public ADM_flyDialogRgb
+{
+    ADM_rubberControl *rubber;
+    double      ar;
+    int         _ox,_oy,_ow,_oh;
+    uint32_t    left,right,top,bottom;
+    bool        rubber_is_hidden;
+    int         ar_select;
+    int         _lw,_lh;
+
+    void        dimensions();
+
+public:
+    uint8_t     processRgb(uint8_t *imageIn, uint8_t *imageOut);
+    uint8_t     download(void) {return download(false);}
+    uint8_t     download(bool even);
+    uint8_t     upload(void) {return upload(true,true);}
+    uint8_t     upload(bool redraw, bool toRubber);
+    bool        bandResized(int x,int y,int w, int h);
+    bool        bandMoved(int x,int y,int w, int h);
+    bool        blockChanges(bool block);
+
+    void        setTabOrder(void);
+
+    float       getZoomValue(void) {return _zoom;}
+    double      getAspectRatio(void) {return ar;}
+    int         getAspectRatioIndex(void) {return ar_select;}
+    void        setAspectRatioIndex(int index);
+    bool        getKeepAspect(void) {return ar_select > 0;}
+    void        lockDimensions(void) {_lw=_w-left-right; _lh=_h-top-bottom;};
+
+    bool        getZoomMargins(int *marginLeft, int *marginRight, int *marginTop, int *marginBottom);
+    void        setZoomMargins(int marginLeft, int marginRight, int marginTop, int marginBottom);
+
+    void        initRubber(void);
+    void        hideRubber(bool hidden);
+    void        hideRubberGrips(bool hideTopLeft, bool hideBottomRight);
+    void        adjustRubber(int x, int y, int w, int h);
+    bool        stateOfRubber(void) {return rubber_is_hidden;}
+    int         lockRubber(bool lock);
+
+                flyZoom (QDialog *parent, uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
+                         ADM_QCanvas *canvas, ADM_QSlider *slider);
+    virtual     ~flyZoom();
+};
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt5/Q_zoom.cpp Added

@@ -0,0 +1,44 @@
+/***************************************************************************
+                          DIA_flyZoom.cpp  -  description
+                             -------------------
+
+        Common part of the zoom dialog
+    
+    copyright            : (C) 2002/2017 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 "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyZoom.h"
+#include "Q_zoom.h"
+#include "ADM_toolkitQt.h"
+/**
+      \fn     DIA_getZoomParams
+      \brief  Handle zoom dialog
+*/
+int DIA_getZoomParams(	const char *name,zoom *param,ADM_coreVideoFilter *in)
+{
+    uint8_t ret=0;
+
+    Ui_zoomWindow dialog(qtLastRegisteredDialog(), param,in);
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+    qtUnregisterDialog(&dialog);
+    return ret;
+}
+

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt5/Q_zoom.h Added

@@ -0,0 +1,50 @@
+#ifndef Q_zoom_h
+#define Q_zoom_h
+#include <QPushButton>
+#include "ui_zoom.h"
+#include "ADM_image.h"
+#include "DIA_flyDialogQt4.h"
+#include "DIA_flyZoom.h"
+#include "zoom.h"
+
+
+
+#if 0
+    #define aprintf ADM_info
+#else
+    #define aprintf(...) {}
+#endif
+
+class Ui_zoomWindow : public QDialog
+{
+    Q_OBJECT
+
+private:
+    int             lock;
+    int             inputWidth,inputHeight;
+    flyZoom         *myFly;
+    ADM_QCanvas     *canvas;
+    Ui_zoomDialog   ui;
+
+    void updateRightBottomSpinners(int foo, bool useHeightAsRef);
+    void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
+    void applyAspectRatio(void);
+
+public:
+    Ui_zoomWindow(QWidget* parent, zoom *param, ADM_coreVideoFilter *in);
+    ~Ui_zoomWindow();
+
+public slots:
+    void gather(zoom *param);
+
+private slots:
+    void sliderUpdate(int foo);
+    void widthChanged(int foo);
+    void heightChanged(int foo);
+    void reset(bool f);
+    void toggleRubber(int checkState);
+    void changeARSelect(int f);
+};
+
+#endif	// Q_zoom_h

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/qt5/zoom.ui Added

@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>zoomDialog</class>
+ <widget class="QDialog" name="zoomDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>805</width>
+    <height>404</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Zoom</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <item row="0" column="7">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="labelResizeMethod">
+         <property name="text">
+          <string>Resize Method:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxAlgo">
+         <item>
+          <property name="text">
+           <string>Bilinear</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Bicubic</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Lanczos-3</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Spline</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="2">
+      <spacer name="horizontalSpacer_1">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="2">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="labelRight">
+       <property name="text">
+        <string>Right:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
+        <number>16384</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <widget class="QLabel" name="labelBottom">
+       <property name="text">
+        <string>Bottom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="6">
+      <widget class="QLabel" name="labelLockAR">
+       <property name="text">
+        <string>Lock Aspect Ratio:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
+        <number>16384</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>16384</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelTop">
+       <property name="text">
+        <string>Top:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QCheckBox" name="checkBoxRubber">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>&amp;Hide Rubber Band</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelLeft">
+       <property name="text">
+        <string>Left:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="8">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="labelSize">
+         <property name="text">
+          <string>Selection: </string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
+        <number>16384</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="7">
+      <widget class="QComboBox" name="comboBoxAspectRatio">
+       <property name="currentText">
+        <string>Do not lock</string>
+       </property>
+       <item>
+        <property name="text">
+         <string>Do not lock</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Current selection</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Source</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>21:9</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>18:9</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>16:9</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>4:3</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>1:1</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>9:16</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="0" column="8">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="QLabel" name="labelPadding">
+         <property name="text">
+          <string>Padding:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxPad">
+         <item>
+          <property name="text">
+           <string>black bars</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>echo</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>none (stretch)</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="5">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="9">
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="ADM_QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ADM_QSlider</class>
+   <extends>QSlider</extends>
+   <header>ADM_toolkitQt.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>zoomDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>zoomDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/zoom.conf Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/zoom.h Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/zoom_desc.cpp Added

avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6/zoom/zoom_json.cpp Added

avidemux_2.7.8.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp -> avidemux_2.8.0.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeint.cpp Changed

avidemux_2.7.8.tar.gz/avidemux_plugins/CMakeLists.txt -> avidemux_2.8.0.tar.gz/avidemux_plugins/CMakeLists.txt Changed

@@ -2,7 +2,10 @@
 
 PROJECT(AdmPlugins)
 
-SET(AVIDEMUX_API_VERSION 2.7)
+set(ORIGINAL_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake" "${CMAKE_MODULE_PATH}")
+include(avidemuxVersion)
+
 SET(PLUGINS TRUE)
 
 MESSAGE("")
@@ -20,12 +23,10 @@
 	SET(AVIDEMUX_FAKEROOT "${FAKEROOT}")
 endif(NOT FAKEROOT)
 
-
-
+# Locate commonCmakeApplication.cmake
 SET(ADM_HEADER_DIR ${AVIDEMUX_FAKEROOT}${CMAKE_INSTALL_PREFIX}/include/avidemux/${AVIDEMUX_API_VERSION})
 SET(ADM_CMAKE_DIR  ${ADM_HEADER_DIR}/cmake)
-# Common definitions...
-SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${CMAKE_MODULE_PATH}")
+SET(CMAKE_MODULE_PATH "${ADM_CMAKE_DIR}" "${ORIGINAL_CMAKE_MODULE_PATH}")
 MESSAGE(STATUS  "Checking for avidemux include folder (i.e. CMAKE_INSTALL_PREFIX/include/avidemux/${AVIDEMUX_API_VERSION}, looking in ${ADM_HEADER_DIR}")
 if(NOT EXISTS "${ADM_HEADER_DIR}")
         MESSAGE(STATUS  "Make sure you installed all the files.\n i cannot find avidemux include folder.cmake .\nSet CMAKE_INSTALL_PREFIX to the install folder, current value is ${CMAKE_INSTALL_PREFIX}")

avidemux_2.7.8.tar.gz/bootStrap.bash -> avidemux_2.8.0.tar.gz/bootStrap.bash Changed

avidemux_2.7.8.tar.gz/bootStrapOsx_Catalina.bash -> avidemux_2.8.0.tar.gz/bootStrapOsx_Catalina.bash Changed

@@ -1,21 +1,7 @@
 #!/bin/bash
 # Bootstrapper to semi-automatically build avidemux from source on OSX
 # (c) Mean 2009
-fallback_qtdir=/usr/local/opt/qt5
-if [ "x$MYQT" != "x" ] && [ -e "${MYQT}/bin/qmake" ] ; then
-    export PATH=$PATH:$MYQT/bin:/opt/local/libexec/qt5/bin # for macports; /usr/local/bin is in PATH by default anyway
-else
-    export PATH=$PATH:/opt/local/libexec/qt5/bin
-fi
-if ! $(which -s qmake) && [ -e "${fallback_qtdir}/bin/qmake" ] ; then
-    echo "Using ${fallback_qtdir} as fallback qt5 install path"
-    export PATH=$PATH:${fallback_qtdir}/bin
-fi
-if ! $(which -s qmake) ; then
-    echo "Error: No qmake executable found, aborting."
-    exit 1
-fi
-
+set -x
 export MAJOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MAJOR " | sed 's/..$//g' | sed 's/^.*"//g'`
 export MINOR=`cat cmake/avidemuxVersion.cmake | grep "VERSION_MINOR " | sed 's/..$//g' | sed 's/^.*"//g'`
 export PATCH=`cat cmake/avidemuxVersion.cmake | grep "VERSION_P " | sed 's/..$//g' | sed 's/^.*"//g'`
@@ -23,13 +9,10 @@
 
 DAT=`date +"%y%m%d-%Hh%Mm"`
 gt=`git log --format=oneline -1 | head -c 11`
-export REV="${DAT}_$gt"
-#
-# To move as parameter
-#
-export FLAVOR="-DENABLE_QT5=True"
-export qt_ext=Qt5
-#
+REV="${DAT}_$gt"
+
+FLAVOR="-DENABLE_QT5=True"
+qt_ext="Qt5"
 packages_ext=""
 do_core=1
 do_cli=1
@@ -39,6 +22,7 @@
 do_rebuild=0
 debug=0
 create_app_bundle=1
+create_dmg=1
 external_libass=1
 external_liba52=1
 external_libmad=0
@@ -105,8 +89,8 @@
 {
         value=$1
         name=$2
-        if [ "x$value" = "x1" ]; then echo "    $name will be built"
-        else echo "     $name will be skipped"
+        if [ "x$value" = "x1" ]; then echo -e "\t$name will be built"
+        else echo -e "\t$name will be skipped"
         fi
 }
 config()
@@ -114,7 +98,7 @@
         setupPaths
         echo "Build configuration :"
         echo "******************* :"
-        echo "Build type :"
+        echo -n "Build type : "
         if [ "x$debug" = "x1" ] ; then echo   "Debug build"
         else echo   "Release build"
         fi
@@ -141,12 +125,13 @@
         echo "Bootstrap avidemux ${API_VERSION}:"
         echo "***********************"
         echo "  --help                  : Print usage"
-        echo "  --tgz                   : Build tgz packages"
-        echo "  --nopkg                 : Don't create macOS app bundle"
+        echo "  --no-bundle             : Don't create macOS app bundle structure"
+        echo "  --nopkg                 : Don't make macOS app bundle self-contained and package it as DMG"
         echo "  --debug                 : Switch debugging on"
         echo "  --rebuild               : Preserve existing build directories"
         echo "  --output=NAME           : Specify a custom basename for dmg"
         echo "  --version=STRING        : Specify a custom Avidemux version string"
+        echo "  --enable-qt6            : Require Qt6 instead of Qt5"
         echo "  --with-core             : Build core (default)"
         echo "  --without-core          : Don't build core"
         echo "  --with-cli              : Build cli (default)"
@@ -159,7 +144,6 @@
         echo "  --with-internal-liba52  : Use bundled liba52 (a52dec) instead of the system one"
         echo "  --with-external-libmad  : Use system libmad instead of the bundled one"
         echo "  --with-internal-libmp4v2: Use bundled libmp4v2 instead of the system one"
-        config
 }
 option_value()
 {
@@ -198,12 +182,11 @@
          --rebuild)
                 do_rebuild=1
                 ;;
-         --tgz)
-                packages_ext=tar.gz
-                PKG="$PKG -DAVIDEMUX_PACKAGER=tgz"
+         --no-bundle)
+                create_app_bundle=0
                 ;;
          --nopkg)
-                create_app_bundle=0
+                create_dmg=0
                 ;;
          --output=*)
                 output=$(option_value "$config_option")
@@ -211,6 +194,10 @@
          --version=*)
                 adm_version=$(option_value "$config_option")
                 ;;
+         --enable-qt6)
+                FLAVOR="-DENABLE_QT6=True"
+                qt_ext=Qt6
+                ;;
          --without-qt)
                 do_qt4=0
              ;;
@@ -258,6 +245,59 @@
 validate adm_version "$adm_version" || exit 1
 validate output "$output" || exit 1
 config
+# If the path to a custom Qt installation is passed via MYQT variable,
+# check for a conflicting one from Homebrew.
+if [ "x${MYQT}" != "x" ] && [ -f "/usr/local/bin/qmake" ]; then
+    echo -e "\n****************************************************************"
+    echo -e "It seems that you have a Qt installation linked into /usr/local,"
+    echo -e "but MYQT variable is set. Please unlink it first by executing"
+    echo -e "in case of Homebrew and e.g. Qt6\n"
+    echo -e "\tbrew unlink qt6\n"
+    echo -e "then rerun this script."
+    echo -e "****************************************************************\n"
+    exit 1
+fi
+# Homebrew offers formulae both for Qt5 and Qt6. When the version we want
+# doesn't match the one linked into /usr/local, the build will fail.
+qmake_location=$(which qmake)
+if [ "$qmake_location" = "/usr/local/bin/qmake" ]; then
+    linked_qt_version_major=$(qmake -query QT_VERSION)
+    linked_qt_version_major=${linked_qt_version_major:0:1}
+    if [ "${qt_ext}" != "Qt${linked_qt_version_major}" ]; then
+        echo -e "\n*********************** Fatal Error ****************************"
+        echo -e "Qt version of the installation linked into /usr/local does not"
+        echo -e "match the one you are building for. If you use Homebrew, please"
+        echo -e "brew link the matching one and rerun this script."
+        echo -e "****************************************************************\n"
+        exit 1
+    fi
+fi
+if [ "x$MYQT" != "x" ] && [ -f "${MYQT}/bin/qmake" ] ; then
+    export QTDIR="${MYQT}" # needed for translations
+else
+    if [ "${qt_ext}" = "Qt6" ]; then
+        if [ "$qmake_location" != "/usr/local/bin/qmake" ]; then
+            echo -e "\n****************************************************************"
+            echo -e "When using Qt6 from Homebrew, please make sure it is linked into"
+            echo -e "/usr/local by executing\n"
+            echo -e "\tbrew link qt6\n"
+            echo -e "as qmake at least in Qt 6.2.0 reports a wrong path to plugins."
+            echo -e "****************************************************************\n"
+            exit 1
+        fi
+        export QTDIR="/usr/local/opt/qt@6"
+    else
+        export QTDIR="/usr/local/opt/qt@5"
+    fi
+fi
+export PATH=${PATH}:${QTDIR}/bin
+if $(which -s qmake) && [ -f "${QTDIR}/bin/qmake" ]; then
+    echo "Using ${QTDIR} as Qt install path"
+else
+    echo "Error: No matching qmake executable found, aborting."
+    exit 1
+fi
+#
 echo "** BootStrapping avidemux **"
 export TOP=$PWD
 export POSTFIX=""
@@ -326,11 +366,31 @@
     echo "Copying icons"
     cp $TOP/cmake/osx/*.icns $PREFIX/
     mkdir -p $PREFIX/../MacOS
-    mkdir -p installer
-    rm -Rf installer/*
-    cd installer
-    cmake -DAVIDEMUX_VERSION="$ADM_VERSION" -DDMG_BASENAME="$output" -DBUILD_REV="$REV" ../avidemux/osxInstaller
-    make && make package
-echo "** Preparing packaging **"
+    if [ -d $PREFIX/../PlugIns ]; then
+        rm -Rf $PREFIX/../PlugIns
+    fi
+    mkdir -p $PREFIX/../PlugIns
+    # Symlink lib directory
+    if [ -e $PREFIX/../lib ]; then
+        rm $PREFIX/../lib
+    fi
+    ln -s $PREFIX/lib $PREFIX/../
+    # Symlink Qt plugins
+    ln -s ${QTDIR}/share/qt/plugins/platforms $PREFIX/../PlugIns/
+    ln -s ${QTDIR}/share/qt/plugins/styles $PREFIX/../PlugIns/
+    # Create qt.conf
+    echo "[Paths]" > $PREFIX/../Resources/qt.conf
+    echo "Plugins = PlugIns" >> $PREFIX/../Resources/qt.conf
+    if [ "x$create_dmg" = "x1" ] ; then
+        if [ -e installer ]; then
+            chmod -R +w installer || fail "making the old installer directory writable"
+            rm -Rf installer || fail "removing the old installer directory"
+        fi
+        mkdir installer || fail "creating new installer directory"
+        cd installer
+        cmake -DAVIDEMUX_VERSION="$ADM_VERSION" -DDMG_BASENAME="$output" -DBUILD_REV="$REV" $FLAVOR ../avidemux/osxInstaller || fail "cmake"
+        echo "** Preparing packaging **"
+        make install && make package
+    fi
 fi
 echo "** ALL DONE **"

avidemux_2.7.8.tar.gz/cmake/ADM_coreConfig.h.cmake -> avidemux_2.8.0.tar.gz/cmake/ADM_coreConfig.h.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admCheckAudioDeviceLibs.cmake -> avidemux_2.8.0.tar.gz/cmake/admCheckAudioDeviceLibs.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admCheckOpenGl.cmake -> avidemux_2.8.0.tar.gz/cmake/admCheckOpenGl.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admCheckQt.cmake -> avidemux_2.8.0.tar.gz/cmake/admCheckQt.cmake Changed

@@ -1,20 +1,28 @@
-MACRO(checkQt)
-	IF (NOT QT_CHECKED)
-                IF(ENABLE_QT5)
-                        INCLUDE(admCheckQt5)
-                        checkQt5()
-                ENDIF(ENABLE_QT5)
-                IF(QT5_FOUND)
-                        SET(QT_FOUND 1)
-                ELSE(QT5_FOUND)
-                        INCLUDE(admCheckQt4)
-                        checkQt4()
-                        IF(QT4_FOUND)
-                                SET(QT_FOUND 1)
-                        ENDIF(QT4_FOUND)
-                ENDIF(QT5_FOUND)
-		SET(QT_CHECKED 1)
-		MESSAGE("")
-	ENDIF (NOT QT_CHECKED)
-        include(admQtMacro)
-ENDMACRO(checkQt)
+MACRO(checkQt)
+    IF(NOT QT_CHECKED)
+        IF(ENABLE_QT6)
+            INCLUDE(admCheckQt6)
+            checkQt6()
+            IF(QT6_FOUND)
+                SET(QT_FOUND 1)
+            ENDIF(QT6_FOUND)
+        ENDIF(ENABLE_QT6)
+        IF(ENABLE_QT5)
+            INCLUDE(admCheckQt5)
+            checkQt5()
+            IF(QT5_FOUND)
+                SET(QT_FOUND 1)
+            ENDIF(QT5_FOUND)
+        ENDIF(ENABLE_QT5)
+        IF(ENABLE_QT4)
+            INCLUDE(admCheckQt4)
+            checkQt4()
+            IF(QT4_FOUND)
+                SET(QT_FOUND 1)
+            ENDIF(QT4_FOUND)
+        ENDIF(ENABLE_QT4)
+        SET(QT_CHECKED 1)
+        MESSAGE("")
+    ENDIF (NOT QT_CHECKED)
+    include(admQtMacro)
+ENDMACRO(checkQt)

avidemux_2.8.0.tar.gz/cmake/admCheckQt6.cmake Added

@@ -0,0 +1,82 @@
+
+MACRO(checkQt6)
+    IF (NOT QT6_CHECKED)
+        OPTION(QT6 "" ON)
+
+        MESSAGE(STATUS "Checking for Qt6")
+        MESSAGE(STATUS "******************")
+        IF(CROSS)
+            MESSAGE(STATUS "Qt6 is supported only for native builds at the moment")
+        ELSE(CROSS)
+            IF (QT6)
+                MESSAGE(STATUS "Checking for Qt6Core")
+                FIND_PACKAGE(Qt6 COMPONENTS Core)
+
+                MESSAGE(STATUS "Checking for Qt6Gui")
+                FIND_PACKAGE(Qt6 COMPONENTS Gui)
+
+                MESSAGE(STATUS "Checking for Qt6Widgets")
+                FIND_PACKAGE(Qt6 COMPONENTS Widgets)
+
+                MESSAGE(STATUS "Checking for OpenGLWidgets")
+                FIND_PACKAGE(Qt6 COMPONENTS OpenGLWidgets)
+
+                MESSAGE(STATUS "Checking for Qt6Network")
+                FIND_PACKAGE(Qt6 COMPONENTS Network)
+
+                IF(Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND Qt6OpenGLWidgets_FOUND AND Qt6Network_FOUND)
+                    MESSAGE(STATUS "Qt6 found")
+                    SET(QT6_FOUND 1)
+
+                    SET(QT_VERSION_MINOR ${Qt6Core_VERSION_MINOR})
+                    SET(QT_INCLUDES ${Qt6Core_INCLUDE_DIRS} ${Qt6Widgets_INCLUDE_DIRS} ${Qt6OpenGLWidgets_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS})
+                    SET(QT_INCLUDE_DIR ${QT_INCLUDES})
+                    SET(QT_HEADERS_DIR ${QT_INCLUDE_DIR})
+
+                    SET(QT_QTCORE_LIBRARY ${Qt6Core_LIBRARIES})
+                    SET(QT_QTNETWORK_LIBRARY ${Qt6Network_LIBRARIES})
+                    SET(QT_QTGUI_LIBRARY ${Qt6Gui_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6OpenGLWidgets_LIBRARIES})
+
+                    SET(QT_DEFINITIONS ${Qt6Core_DEFINITIONS} ${Qt6Widgets_DEFINITIONS} ${Qt6OpenGLWidgets_DEFINITIONS} ${Qt6Network_DEFINITIONS})
+
+                    MARK_AS_ADVANCED(LRELEASE_EXECUTABLE)
+                    MARK_AS_ADVANCED(QT_MKSPECS_DIR)
+                    MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
+
+                    MACRO(ADM_QT_WRAP_UI a)
+                        qt_wrap_ui(${a} ${ARGN})
+                    ENDMACRO(ADM_QT_WRAP_UI a)
+
+                    MACRO(ADM_QT_WRAP_CPP a)
+                        qt_wrap_cpp(${a} ${ARGN})
+                    ENDMACRO(ADM_QT_WRAP_CPP a)
+
+                    MACRO(ADM_QT_ADD_RESOURCES a)
+                        qt_add_resources(${a} ${ARGN})
+                    ENDMACRO(ADM_QT_ADD_RESOURCES a)
+
+                    SET(QT_EXTENSION qt6)
+                    SET(QT_LIBRARY_EXTENSION QT6)
+                    SET(ADM_QT_VERSION 6)
+
+                    IF(Qt6_POSITION_INDEPENDENT_CODE)
+                        SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+                    ENDIF(Qt6_POSITION_INDEPENDENT_CODE)
+
+                    get_target_property(QMAKE_EXECUTABLE Qt6::qmake LOCATION)
+                    exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE QT_PLUGINS_DIR )
+                    MESSAGE(STATUS "plugin dir = ${QT_PLUGINS_DIR}")
+
+                ELSE(Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND Qt6OpenGLWidgets_FOUND AND Qt6Network_FOUND)
+                    MESSAGE(STATUS "Some Qt6 components are missing")
+                ENDIF(Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND Qt6OpenGLWidgets_FOUND AND Qt6Network_FOUND)
+            ELSE (QT6)
+                MESSAGE("${MSG_DISABLE_OPTION}")
+            ENDIF (QT6)
+        ENDIF(CROSS)
+
+        SET(QT6_CHECKED 1)
+
+        MESSAGE("")
+    ENDIF (NOT QT6_CHECKED)
+ENDMACRO(checkQt6)

avidemux_2.7.8.tar.gz/cmake/admCheckRequiredLibs.cmake -> avidemux_2.8.0.tar.gz/cmake/admCheckRequiredLibs.cmake Changed

avidemux_2.8.0.tar.gz/cmake/admCheckThreads.cmake Added

@@ -0,0 +1,83 @@
+include(FindThreads)
+
+# - This module determines the thread library of the system.
+# The following variables are set
+#  PTHREAD_FOUND - system has pthreads
+#  PTHREAD_INCLUDE_DIR - the pthreads include directory
+#  PTHREAD_LIBRARIES - the libraries needed to use pthreads
+
+INCLUDE (CheckIncludeFile)
+INCLUDE (CheckLibraryExists)
+
+# Do we have pthreads?
+FIND_PATH(PTHREAD_INCLUDE_DIR pthread.h)
+MARK_AS_ADVANCED(PTHREAD_INCLUDE_DIR)
+
+IF(PTHREAD_INCLUDE_DIR)
+	# We have pthread.h
+	# Let's check for the library now.
+
+	# Do we have -lpthreads
+	FIND_LIBRARY(PTHREAD_LIBRARIES "pthreads")
+
+	IF (NOT PTHREAD_LIBRARIES)
+		FIND_LIBRARY(PTHREAD_LIBRARIES "pthread")
+	ENDIF (NOT PTHREAD_LIBRARIES)
+
+	IF (NOT PTHREAD_LIBRARIES AND (WIN32 OR WIN64))
+		FIND_LIBRARY(PTHREAD_LIBRARIES "libwinpthread")
+	ENDIF (NOT PTHREAD_LIBRARIES AND (WIN32 OR WIN64))
+
+	IF (NOT PTHREAD_LIBRARIES AND WIN32)
+		FIND_LIBRARY(PTHREAD_LIBRARIES "pthreadGC2")
+	ENDIF (NOT PTHREAD_LIBRARIES AND WIN32)
+
+	IF (NOT PTHREAD_LIBRARIES)
+		MESSAGE(STATUS "Check if compiler accepts -pthread")
+
+		TRY_RUN(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
+			${CMAKE_BINARY_DIR}
+			${CMAKE_ROOT}/Modules/CheckForPthreads.c
+			CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
+			OUTPUT_VARIABLE OUTPUT)
+
+		IF (THREADS_HAVE_PTHREAD_ARG)
+			IF(THREADS_PTHREAD_ARG MATCHES "^2$")
+				MESSAGE(STATUS "Check if compiler accepts -pthread - yes")
+			ELSE (THREADS_PTHREAD_ARG MATCHES "^2$")
+				MESSAGE(STATUS "Check if compiler accepts -pthread - no")
+
+				FILE(APPEND 
+					${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
+					"Determining if compiler accepts -pthread returned ${THREADS_PTHREAD_ARG} instead of 2. The compiler had the following output:\n${OUTPUT}\n\n")
+			ENDIF (THREADS_PTHREAD_ARG MATCHES "^2$")
+		ELSE (THREADS_HAVE_PTHREAD_ARG)
+			MESSAGE(STATUS "Check if compiler accepts -pthread - no")
+
+			FILE(APPEND 
+				${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
+				"Determining if compiler accepts -pthread failed with the following output:\n${OUTPUT}\n\n")
+		ENDIF (THREADS_HAVE_PTHREAD_ARG)
+
+		IF (THREADS_HAVE_PTHREAD_ARG)
+			SET(PTHREAD_LIBRARIES "-pthread")
+		ENDIF (THREADS_HAVE_PTHREAD_ARG)
+	ENDIF (NOT PTHREAD_LIBRARIES)
+
+	MARK_AS_ADVANCED(PTHREAD_LIBRARIES)
+
+	IF (PTHREAD_LIBRARIES)
+		SET(PTHREAD_FOUND 1)
+	ENDIF (PTHREAD_LIBRARIES)
+ENDIF(PTHREAD_INCLUDE_DIR)
+
+
+MACRO(ADM_LINK_THREAD target)
+    IF (CMAKE_THREAD_LIBS_INIT)
+        TARGET_LINK_LIBRARIES(${target} ${CMAKE_THREAD_LIBS_INIT})
+    ELSE (CMAKE_THREAD_LIBS_INIT)
+        IF (WIN32 OR (UNIX AND PTHREAD_FOUND))
+            TARGET_LINK_LIBRARIES(${target} "${PTHREAD_LIBRARIES}")
+        ENDIF (WIN32 OR (UNIX AND PTHREAD_FOUND))
+    ENDIF (CMAKE_THREAD_LIBS_INIT)
+ENDMACRO(ADM_LINK_THREAD)
\ No newline at end of file

avidemux_2.7.8.tar.gz/cmake/admDetermineSystem.cmake -> avidemux_2.8.0.tar.gz/cmake/admDetermineSystem.cmake Changed

@@ -76,14 +76,20 @@
 
                                 IF(ARM64_SUPPORTED)
                                         set(ADM_CPU_ARM64 1)
+                                ELSE (ARM64_SUPPORTED)
+                                        PERFORM_SYSTEM_TEST(cpu_riscv_check.cpp "RISCV" RISCV_SUPPORTED)
+                                        IF(RISCV_SUPPORTED)
+                                                set(ADM_CPU_RISCV 1)
+                                                set(ADM_CPU_RISCV_64 1)
+                                        endif(RISCV_SUPPORTED)
                                 endif(ARM64_SUPPORTED)
                         ENDIF(ARMEL_SUPPORTED)
 	        ENDIF (X86_32_SUPPORTED)
         ENDIF (X86_64_SUPPORTED)
 
-        IF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL AND NOT ADM_CPU_ARM64)
+        IF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL AND NOT ADM_CPU_ARM64 AND NOT ADM_CPU_RISCV AND NOT ADM_CPU_RISCV_64)
 	        MESSAGE(FATAL_ERROR "CPU not supported")
-        ENDIF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL AND NOT ADM_CPU_ARM64)
+        ENDIF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL AND NOT ADM_CPU_ARM64 AND NOT ADM_CPU_RISCV AND NOT ADM_CPU_RISCV_64)
 
         TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)

avidemux_2.7.8.tar.gz/cmake/admFFmpegBuild_helpers.cmake -> avidemux_2.8.0.tar.gz/cmake/admFFmpegBuild_helpers.cmake Changed

@@ -24,8 +24,8 @@
                         flac  flv  fraps  h263  h264  hevc  huffyuv  lagarith
                         mjpeg  mjpegb  mp2  mp3  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3
                         msvideo1  nellymoser  png  prores  qdm2  rawvideo  snow  svq3  theora
-                        tscc  utvideo  vc1  vorbis  vp3  vp6  vp6a  vp6f  vp8
-                        vp9  wmapro  wmav2  wmv1  wmv2  wmv3)
+                        tscc  truehd  utvideo  vc1  vorbis  vp3  vp6  vp6a  vp6f  vp8
+                        vp9  wmapro  wmalossless  wmav2  wmv1  wmv2  wmv3)
 
 set(FFMPEG_ENCODERS     aac  ac3  dvvideo  ffv1  ffvhuff  flac  flv  h263  huffyuv
                         mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  png  snow  utvideo)
@@ -177,7 +177,14 @@
 
     INSTALL(FILES "${FFMPEG_BINARY_DIR}/libavutil/avconfig.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)
 
-    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h" "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/avcodec.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/bsf.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/codec.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/codec_desc.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/codec_id.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/codec_par.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/packet.h"
+            "${FFMPEG_SOURCE_DIR}/libavcodec/vdpau.h"
             "${FFMPEG_SOURCE_DIR}/libavcodec/videotoolbox.h"
             "${FFMPEG_SOURCE_DIR}/libavcodec/version.h"
             DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)
@@ -204,6 +211,8 @@
             "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext_vaapi.h"
             "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext_vdpau.h"
             "${FFMPEG_SOURCE_DIR}/libavutil/hwcontext_dxva2.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/mastering_display_metadata.h"
+            "${FFMPEG_SOURCE_DIR}/libavutil/hdr_dynamic_metadata.h"
 
             "${FFMPEG_SOURCE_DIR}/libavutil/rational.h" DESTINATION "${AVIDEMUX_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavutil" COMPONENT dev)

avidemux_2.7.8.tar.gz/cmake/admFFmpegBuild_native.cmake -> avidemux_2.8.0.tar.gz/cmake/admFFmpegBuild_native.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admFFmpegBuild_vs_import.cmake -> avidemux_2.8.0.tar.gz/cmake/admFFmpegBuild_vs_import.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admFFmpegVersion.cmake -> avidemux_2.8.0.tar.gz/cmake/admFFmpegVersion.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admInstallDir.cmake -> avidemux_2.8.0.tar.gz/cmake/admInstallDir.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admMainChecks.cmake -> avidemux_2.8.0.tar.gz/cmake/admMainChecks.cmake Changed

avidemux_2.7.8.tar.gz/cmake/admQtMacro.cmake -> avidemux_2.8.0.tar.gz/cmake/admQtMacro.cmake Changed

@@ -1,41 +1,59 @@
 #
 #
 #
-FUNCTION(ADM_QT_WRAP_UI in )
-       SET(INLIST ${ARGN})
-       if(QT5_FOUND)
-         QT5_WRAP_UI(out ${INLIST})
-       ELSE(QT5_FOUND)
-         QT4_WRAP_UI(out ${INLIST})
-       ENDIF(QT5_FOUND)
-       SET( ${in} ${out} PARENT_SCOPE)
-        MESSAGE(STATUS "UI:${INLIST} -> ${out}")
+FUNCTION(ADM_QT_WRAP_UI in)
+    SET(INLIST ${ARGN})
+    IF(QT6_FOUND)
+        QT6_WRAP_UI(out ${INLIST})
+    ELSE(QT6_FOUND)
+        IF(QT5_FOUND)
+            QT5_WRAP_UI(out ${INLIST})
+        ELSE(QT5_FOUND)
+            IF(QT4_FOUND)
+                QT4_WRAP_UI(out ${INLIST})
+            ENDIF(QT4_FOUND)
+        ENDIF(QT5_FOUND)
+    ENDIF(QT6_FOUND)
+    SET( ${in} ${out} PARENT_SCOPE)
+    MESSAGE(STATUS "UI:${INLIST} -> ${out}")
 ENDFUNCTION(ADM_QT_WRAP_UI in)
 #
 #
 #
-FUNCTION(ADM_QT_WRAP_CPP in )
-       SET(INLIST ${ARGN})
-       if(QT5_FOUND)
-         QT5_WRAP_CPP(out ${INLIST})
-       ELSE(QT5_FOUND)
-         QT4_WRAP_CPP(out ${INLIST})
-       ENDIF(QT5_FOUND)
-       SET(${in} ${out} PARENT_SCOPE)
-       SET( plop ${${in}})
-       MESSAGE(STATUS "CPP:${INLIST} -> ${in}=${plop}")
-       MESSAGE(STATUS "CPP:${INLIST} -> ${in}=${out}")
+FUNCTION(ADM_QT_WRAP_CPP in)
+    SET(INLIST ${ARGN})
+    IF(QT6_FOUND)
+        QT6_WRAP_CPP(out ${INLIST})
+    ELSE(QT6_FOUND)
+        IF(QT5_FOUND)
+            QT5_WRAP_CPP(out ${INLIST})
+        ELSE(QT5_FOUND)
+            IF(QT4_FOUND)
+                QT4_WRAP_CPP(out ${INLIST})
+            ENDIF(QT4_FOUND)
+        ENDIF(QT5_FOUND)
+    ENDIF(QT6_FOUND)
+    SET(${in} ${out} PARENT_SCOPE)
+    SET( plop ${${in}})
+    MESSAGE(STATUS "CPP:${INLIST} -> ${in}=${plop}")
+    MESSAGE(STATUS "CPP:${INLIST} -> ${in}=${out}")
 ENDFUNCTION(ADM_QT_WRAP_CPP in)
 #
 #
 #
 FUNCTION(ADM_QT_ADD_RESOURCES in)
-       SET(INLIST ${ARGN})
-       if(QT5_FOUND)
-         QT5_ADD_RESOURCES(out ${INLIST})
-       ELSE(QT5_FOUND)
-         QT4_ADD_RESOURCES(out ${INLIST})
-       ENDIF(QT5_FOUND)
-       SET( ${in} ${out} PARENT_SCOPE)
+    SET(INLIST ${ARGN})
+    IF(QT6_FOUND)
+        QT6_ADD_RESOURCES(out ${INLIST})
+    ELSE(QT6_FOUND)
+        IF(QT5_FOUND)
+            QT5_ADD_RESOURCES(out ${INLIST})
+        ELSE(QT5_FOUND)
+            IF(QT4_FOUND)
+                QT4_ADD_RESOURCES(out ${INLIST})
+            ENDIF(QT4_FOUND)
+        ENDIF(QT5_FOUND)
+    ENDIF(QT6_FOUND)
+    SET( ${in} ${out} PARENT_SCOPE)
 ENDFUNCTION(ADM_QT_ADD_RESOURCES in)

avidemux_2.8.0.tar.gz/cmake/attic Added

avidemux_2.8.0.tar.gz/cmake/attic/FindThreads.cmake Changed

avidemux_2.7.8.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.8.0.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.8.0.tar.gz/cmake/cmake_compile_check/cpu_riscv_check.cpp Added

avidemux_2.7.8.tar.gz/cmake/commonCmakeApplication.cmake -> avidemux_2.8.0.tar.gz/cmake/commonCmakeApplication.cmake Changed

avidemux_2.7.8.tar.gz/myOwnPlugins/demuxer/CMakeLists.txt -> avidemux_2.8.0.tar.gz/myOwnPlugins/demuxer/CMakeLists.txt Changed

avidemux_2.7.8.tar.gz/run_avidemux_template.sh -> avidemux_2.8.0.tar.gz/run_avidemux_template.sh Changed

avidemux_2.7.8.tar.gz/run_jobs_template.sh -> avidemux_2.8.0.tar.gz/run_jobs_template.sh Changed

Build Results
RPM Lint

Refresh

Comments for request 5480 0

Request History

enzokiel created request almost 3 years ago

enzokiel accepted request almost 3 years ago