Request 4659 (accepted)

Overview

Request 4659 (accepted)

No description set

Created by enzokiel almost 6 years ago
In state accepted
4 package maintainers

Submit handbrake

Submit package Staging / handbrake to package Multimedia / handbrake

handbrake.changes Changed

@@ -1,4 +1,193 @@
 -------------------------------------------------------------------
+Wed Jan 01 16:31:49 UTC 2020 - enzokiel@kabelmail.de
+
+- update to version 1.3.0
+  + General
+    - HandBrake is now translated into many more languages
+    - Redesigned queue UI
+    - Removed Windows Mobile presets
+      + See the [list of compatible replacements on GitHub]
+        (https://github.com/HandBrake/HandBrake-docs/blob
+         /03682bdd741cea425c80b06818e4bdaec75bdc5e/source/docs/en
+         /latest/technical
+         /official-presets.markdown#windows-mobile-presets)
+    - Improved log output by silencing many lines at standard log
+      level
+    - Improved quality of Gmail presets slightly
+    - Added Playstation 2160p60 4K Surround preset (supports PS4
+      Pro)
+    - Added Discord and Discord Nitro presets
+  + Video
+    - Updated Intel Quick Sync Video to use Direct3D 11 API
+    - Updated minimum title scan duration to only apply to
+      disc-based sources like Blu-ray and DVD
+    - Improved detection of MPEG-1 video in program streams
+    - Improved interface to FFmpeg avfilter and color handling
+    - Improved Nvidia NVENC constant quality encoding slightly by
+      not setting qmin and qmax
+    - Replaced pp7 Deblock filter with FFmpeg Deblock filter
+    - Added support for reading Ultra HD Blu-ray discs (without
+      copy protection)
+    - Added support for reading AV1 via libdav1d
+    - Added encoding to WebM container format
+    - Added Chroma Smooth filter (CLI only)
+    - Added zero-copy path for Intel QSV encoding removed in a
+      previous release
+    - Added support for Intel QSV low power encoding (lowpower=1)
+    - Added support for AMD VCE encoding on Linux via Vulkan
+    - Added ability to select x265 encoder level and Fast Decode
+      tune
+  + Audio
+    - Updated audio resampling code to use FFmpeg swresample
+      instead of libsamplerate
+    - Added source audio bit rate to tracks list
+    - Added ability to select unknown language tracks
+    - Added automatic track name pass through
+  + Subtitles
+    - Added ability to import external SSA/ASS subtitles
+    - Added ability to select unknown language tracks
+    - Added automatic track name pass through
+  + Command line interface
+    - Added additional unit aliases to --start-at and --stop-at,
+      notably seconds and frames
+  + Build system
+    - HandBrake now builds with libnuma on Linux
+    - Fixed Python bytestrings causing newlines to be ignored in
+      build output
+    - Fixed Xcode ignoring make jobs parameter and utilizing all
+      CPU cores (macOS only)
+    - Updated configure to enable most hardware encoders by default
+      where appropriate by platform
+    - Updated all scripts for compatibility with Python 3
+    - Updated mac-toolchain-build script with newer tool versions
+      many improvements
+    - Updated mingw-w64-build script with mingw-w64 6.0.0, GCC 9.2,
+      and many improvements
+    - Improved compatibility with GCC 9 and recent Clang releases
+    - Improved compatibility with recent Xcode releases (macOS
+      only)
+    - Improved host/build semantics
+    - Improved namespace isolation
+    - Improved handling of all options passed to configure
+    - Improved configure help output
+    - Improved detection of missing executable dependencies during
+      configure
+    - Added support for building on NetBSD
+    - Added --harden configure parameter to enable buffer overflow
+      protections
+    - Added --sandbox configure parameter to enable sandbox build
+      target on macOS
+    - Added --enable-gtk4 configure parameter to build with GTK 4
+      instead of GTK 3
+    - Added summary of build options to configure output
+    - Miscellaneous bug fixes and improvements
+  + Third-party libraries
+    - Removed libraries
+      + libsamplerate (audio resampling)
+    - Updated libraries
+      + AMF 1.4.9 (AMD VCE encoding)
+      + bzip2 1.0.8 (general)
+      + FDK AAC 2.0.1 (AAC audio encoding, must compile from
+        source)
+      + FFmpeg 4.2.1 (decoding and filters)
+      + FreeType 2.10.1 (subtitles)
+      + Fribidi 1.0.7 (subtitles)
+      + HarfBuzz 2.6.4 (subtitles)
+      + Jansson 2.12 (JSON architecture)
+      + libbluray 1.1.2 (Blu-ray decoding)
+      + libdav1d 0.5.1 (AV1 decoding)
+      + libdvdnav 6.0.1 (DVD decoding)
+      + libdvdread 6.0.2 (DVD decoding)
+      + libiconv 1.16 (character encoding support)
+      + libmfx (Intel QSV support)
+      + libogg 1.3.4 (Xiph codecs support)
+      + libopus 1.3.1 (Opus audio encoding)
+      + libvorbis 1.3.6 (Vorbis audio encoding)
+      + libvpx 1.8.1 (VP8/VP9 video encoding)
+      + libxml2 2.9.9 (general)
+      + nv-codec-headers 9.0.18.1 (Nvidia NVENC encoding)
+      + x265 3.2.1 (H.265/HEVC video encoding)
+  + Linux
+    - Fixed slider control not showing complete values
+    - Updated translations (levels of completeness vary):
+      + Czech
+      + Chinese
+      + French
+      + German
+      + Italian
+      + Japanese
+      + Korean
+      + Norwegian
+      + Russian
+      + Spanish
+      + Thai
+    - Added translations (levels of completeness vary):
+      + Afrikaans
+      + Basque
+      + Croatian
+      + Dutch
+      + Polish
+      + Portuguese
+      + Romanian
+      + Slovak
+      + Swedish
+      + Turkish
+      + Ukrainian
+    - Added Intel QSV support to Flatpak (requires additional
+      plugin installation)
+    - Added ability to double-click to edit audio track settings
+    - Added options to open encode log and log directory to actions
+      menu on queue window
+    - Miscellaneous bug fixes and improvements
+  + Mac
+    - HandBrake now requires OS X 10.11 El Capitan or later
+    - HandBrake is now sandboxed and uses the macOS hardened
+      runtime
+    - Updated priority for low-priority threads on macOS to avoid
+      potential stalls in future macOS
+    - Updated translations:
+      + German
+    - Added translations:
+      + French
+      + Italian
+      + Russian
+    - Added preference to disable preview image on summary tab
+    - Miscellaneous bug fixes and improvements
+  + Windows
+    - Improved browse dialog recently used to fallback to parent
+      directory
+    - Improved preferences layout
+    - Improved auto naming collision behavior and file overwriting
+    - Added preference to test selected notification sound
+    - Added preference to perform when done action immmediately
+      without countdown
+    - Added preference to disable preview image on summary tab
+    - Added hardware.enabled option to portable.ini
+    - Added dark theme for Windows 10
+    - Added queue import/export removed in a previous release
+    - Added new low battery level and disk space safety measures
+      + Encoding jobs automatically pause when battery level is
+        low, system sleep is allowed, and jobs resume when power is
+        restored
+      + Encoding jobs automatically pause when disk space drops to
+        critical levels
+    - Added translations (levels of completeness vary):
+      + French
+      + German
+      + Chinese
+      + Korean
+      + Russian
+      + Spanish
+      + Turkish
+    - HandBrake now requires .NET Framework 4.7.1 or later
+      (installer offers download if missing)
+    - Miscellaneous bug fixes and improvements
+- Removed audio_resample-issue#2126.patch, fixed upstream
+- Fixed HandBrake-build-shared.patch and
+  HandBrake-no-builddate.patch
+- Added HandBrake-qsv.patch
+
+-------------------------------------------------------------------
 Mon Oct 14 12:43:29 UTC 2019 - manfred.h@gmx.net
 
 - Add patch audio_resample-issue#2126.patch to fix

handbrake.spec Changed

@@ -17,16 +17,20 @@
 #
 
 
+%if (0%{?sle_version} >= 150300 && 0%{?is_opensuse}) || 0%{?suse_version} > 1500
+%bcond_without  mfx
+%endif
+
 Name:           handbrake
 Summary:        Multithreaded Video Transcoder
-Version:        1.2.2
+Version:        1.3.0
 Release:        0
 Url:            http://handbrake.fr/
 Source0:        https://download.handbrake.fr/releases/%{version}/HandBrake-%{version}-source.tar.bz2
 Source1:        https://github.com/HandBrake/HandBrake/releases/download/%{version}/HandBrake-%{version}-source.tar.bz2.sig
 Patch0:         HandBrake-no-builddate.patch
 Patch1:         HandBrake-build-shared.patch
-Patch2:         audio_resample-issue#2126.patch
+Patch2:         HandBrake-qsv.patch
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 BuildRequires:  autoconf
@@ -39,23 +43,26 @@
 BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  make
+BuildRequires:  meson
 BuildRequires:  nasm
 BuildRequires:  python > 2.7.3
 BuildRequires:  subversion
 BuildRequires:  update-desktop-files
 BuildRequires:  wget
-BuildRequires:  yasm
 BuildRequires:  glibc-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dav1d)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dvdnav)
 BuildRequires:  pkgconfig(dvdread)
+BuildRequires:  pkgconfig(fdk-aac)
 BuildRequires:  pkgconfig(ffnvcodec)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
 BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libavcodec) >= 58
 BuildRequires:  pkgconfig(libavfilter) >= 7
@@ -63,8 +70,11 @@
 BuildRequires:  pkgconfig(libavresample) >= 4
 BuildRequires:  pkgconfig(libavutil) >= 56
 BuildRequires:  pkgconfig(libbluray) >= 1.0.2
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libmpeg2)
 BuildRequires:  pkgconfig(libswscale) >= 5
 BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(samplerate)
@@ -74,12 +84,16 @@
 BuildRequires:  pkgconfig(vpx) >= 1.4
 BuildRequires:  pkgconfig(x264)
 BuildRequires:  pkgconfig(x265)
-BuildRequires:  pkgconfig(jansson)
-%ifarch armv6l || armv6hl
+%if %{with mfx}
+BuildRequires:  pkgconfig(libmfx)
+BuildRequires:  pkgconfig(libva)
+%endif
+%ifnarch %{arm}
+BuildRequires:  libnuma-devel
+%else
 BuildRequires:  Mesa-libEGL1
 BuildRequires:  Mesa-libEGL-devel
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -130,11 +144,18 @@
     --prefix=%{_prefix} \
     --strip="/bin/true" \
     --optimize=speed \
-    --disable-fdk-aac \
+    --enable-fdk-aac \
+%if %{with mfx}
+    --enable-qsv \
+%endif
+%ifarch %{arm} \
+    --disable-numa \
+%endif
+    --enable-asm \
     --debug=max
 
 pushd build
-%__make libhb/project.h
+%__make libhb/handbrake/project.h
 %__make %{?_smp_mflags}
 popd

HandBrake-build-shared.patch Changed

@@ -1,60 +1,67 @@
---- make/include/main.defs.orig	2019-02-18 22:00:26.953265342 +0100
-+++ make/include/main.defs	2019-02-18 22:00:26.957265264 +0100
-@@ -28,6 +28,15 @@
-     MODULES += contrib/lame
+--- make/include/main.defs.orig	2019-12-30 19:59:28.789369050 +0100
++++ make/include/main.defs	2019-12-30 19:59:28.797368897 +0100
+@@ -28,32 +28,22 @@
      MODULES += contrib/x264
      MODULES += contrib/jansson
-+    MODULES += contrib/x265
-+    MODULES += contrib/x265_8bit
-+    MODULES += contrib/x265_10bit
-+    MODULES += contrib/x265_12bit
+     MODULES += contrib/libvpx
+-endif
+-
+-ifeq (1,$(FEATURE.flatpak))
+-    MODULES += contrib/jansson
+-    MODULES += contrib/x264
+-endif
+-
+-ifeq (1,$(FEATURE.fdk_aac))
+-    MODULES += contrib/fdk-aac
+-endif
+-
+-ifeq (1,$(FEATURE.x265))
+     MODULES += contrib/x265
+     MODULES += contrib/x265_8bit
+     MODULES += contrib/x265_10bit
+     MODULES += contrib/x265_12bit
++    MODULES += contrib/libdav1d
 +    MODULES += contrib/ffmpeg
-+    MODULES += contrib/libvpx
 +    MODULES += contrib/libdvdread
 +    MODULES += contrib/libdvdnav
 +    MODULES += contrib/libbluray
++    MODULES += contrib/fdk-aac
++    MODULES += contrib/libmfx
  endif
  
- ifeq (1,$(FEATURE.flatpak))
-@@ -41,19 +50,6 @@
-     MODULES += contrib/fdk-aac
- endif
- 
--ifeq (1,$(FEATURE.x265))
--    MODULES += contrib/x265
--    MODULES += contrib/x265_8bit
--    MODULES += contrib/x265_10bit
--    MODULES += contrib/x265_12bit
--endif
--
+-MODULES += contrib/libdav1d
 -MODULES += contrib/ffmpeg
--MODULES += contrib/libvpx
 -MODULES += contrib/libdvdread
 -MODULES += contrib/libdvdnav
 -MODULES += contrib/libbluray
 -
- ifneq (,$(filter $(BUILD.system),mingw))
- ifneq ($(HAS.pthread),1)
- ifneq ($(HAS.pthreadGC2),1)
---- gtk/configure.ac.orig	2019-02-18 22:01:27.464099477 +0100
-+++ gtk/configure.ac	2019-02-18 22:01:27.468099400 +0100
-@@ -179,7 +179,7 @@
+-ifeq (1,$(FEATURE.qsv))
+-    MODULES += contrib/libmfx
++ifeq (1,$(FEATURE.flatpak))
++    MODULES += contrib/jansson
++    MODULES += contrib/x264
+ endif
+ 
+ ifeq (1,$(FEATURE.vce))
+--- gtk/configure.ac.orig	2019-12-30 20:02:01.998446129 +0100
++++ gtk/configure.ac	2019-12-30 20:02:02.006445977 +0100
+@@ -199,7 +199,7 @@
  
  GHB_CFLAGS="$HBINC $GHB_CFLAGS"
  
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lx265 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
++HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lx265 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
  
- case $host in
-   *-*-mingw*)
---- test/module.defs.orig	2019-02-18 22:02:05.643363874 +0100
-+++ test/module.defs	2019-02-18 22:02:05.647363797 +0100
+ if test "x$use_fdk_aac" = "xyes" ; then
+     HB_LIBS="$HB_LIBS -lfdk-aac"
+--- test/module.defs.orig	2019-12-30 20:03:22.552921543 +0100
++++ test/module.defs	2019-12-30 20:03:22.564921316 +0100
 @@ -16,7 +16,7 @@
  TEST.GCC.l = \
          ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
          dvdread fribidi \
--        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-+        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
-         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma
+-        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
++        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
+         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
  
- ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))

HandBrake-no-builddate.patch Changed

@@ -1,6 +1,6 @@
---- make/configure.py.orig	2019-02-18 22:07:26.309185591 +0100
-+++ make/configure.py	2019-02-18 22:07:26.333185128 +0100
-@@ -859,7 +859,7 @@
+--- make/configure.py.orig	2019-12-30 20:08:16.583360794 +0100
++++ make/configure.py	2019-12-30 20:08:16.603360415 +0100
+@@ -967,7 +967,7 @@
  
              url_ctype = '_unstable'
              url_ntype = 'unstable'
@@ -9,7 +9,7 @@
              self.title = '%s %s (%s)' % (self.name,self.version,self.build)
          else:
              m = re.match('^([a-zA-Z]+)\.([0-9]+)$', self.suffix)
-@@ -878,7 +878,7 @@
+@@ -986,7 +986,7 @@
                  url_ctype = '_unstable'
                  url_ntype = 'unstable'
  
@@ -18,7 +18,7 @@
              self.title = '%s %s (%s)' % (self.name,self.version,self.build)
  
          self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
-@@ -1765,7 +1765,6 @@
+@@ -1897,7 +1897,6 @@
  
      ## create document object
      doc = ConfigDocument()
@@ -26,11 +26,11 @@
  
      ## add configure line for reconfigure purposes
      doc.addBlank()
-@@ -1838,7 +1837,6 @@
-     else:
-         doc.add( 'BUILD.cross.prefix', '' )
- 
--    doc.add( 'BUILD.date',   time.strftime('%c', now) ),
-     doc.add( 'BUILD.arch',   arch.mode.mode )
+@@ -1954,7 +1953,6 @@
+     doc.add( 'BUILD.title',   '%s %s' % (build_tuple.systemf,arch.mode.default) )
+     doc.add( 'BUILD.ncpu',    core.count )
+     doc.add( 'BUILD.jobs',    core.jobs )
+-    doc.add( 'BUILD.date',    time.strftime('%c', now) ),
  
      doc.addBlank()
+     doc.add( 'HOST.spec',    host_tuple.spec )

HandBrake-qsv.patch Added

audio_resample-issue#2126.patch Deleted

@@ -1,226 +0,0 @@
-commit 4ba75f97f31b0e6f64ebd4684d5f2aeeba494629
-Author: John Stebbins <jstebbins.hb@gmail.com>
-Date:   Thu May 30 08:45:13 2019 -0700
-
-    audio_resample: set input and output samplerate
-    
-    Fixes https://github.com/HandBrake/HandBrake/issues/2124
-
-diff -rup HandBrake-1.2.2.orig/libhb/audio_resample.c HandBrake-1.2.2/libhb/audio_resample.c
---- HandBrake-1.2.2.orig/libhb/audio_resample.c	2019-02-22 17:23:51.000000000 +0100
-+++ HandBrake-1.2.2/libhb/audio_resample.c	2019-10-14 14:32:45.006416242 +0200
-@@ -12,6 +12,7 @@
- #include "audio_resample.h"
- 
- hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt,
-+                                            int sample_rate,
-                                             int hb_amixdown, int normalize_mix)
- {
-     hb_audio_resample_t *resample = calloc(1, sizeof(hb_audio_resample_t));
-@@ -56,6 +57,7 @@ hb_audio_resample_t* hb_audio_resample_i
-     resample->out.channel_layout      = channel_layout;
-     resample->out.matrix_encoding     = matrix_encoding;
-     resample->out.sample_fmt          = sample_fmt;
-+    resample->out.sample_rate         = sample_rate;
-     if (normalize_mix)
-     {
-         resample->out.maxval = 1.0;
-@@ -68,6 +70,7 @@ hb_audio_resample_t* hb_audio_resample_i
- 
-     // set default input characteristics
-     resample->in.sample_fmt         = resample->out.sample_fmt;
-+    resample->in.sample_rate        = resample->out.sample_rate;
-     resample->in.channel_layout     = resample->out.channel_layout;
-     resample->in.lfe_mix_level      = HB_MIXLEV_ZERO;
-     resample->in.center_mix_level   = HB_MIXLEV_DEFAULT;
-@@ -145,6 +148,15 @@ void hb_audio_resample_set_sample_fmt(hb
-     }
- }
- 
-+void hb_audio_resample_set_sample_rate(hb_audio_resample_t *resample,
-+                                       int sample_rate)
-+{
-+    if (resample != NULL)
-+    {
-+        resample->in.sample_rate = sample_rate;
-+    }
-+}
-+
- int hb_audio_resample_update(hb_audio_resample_t *resample)
- {
-     if (resample == NULL)
-@@ -157,11 +169,13 @@ int hb_audio_resample_update(hb_audio_re
- 
-     resample->resample_needed =
-         (resample->out.sample_fmt != resample->in.sample_fmt ||
-+         resample->out.sample_rate != resample->in.sample_rate ||
-          resample->out.channel_layout != resample->in.channel_layout);
- 
-     resample_changed =
-         (resample->resample_needed &&
-          (resample->resample.sample_fmt != resample->in.sample_fmt ||
-+          resample->resample.sample_rate != resample->in.sample_rate ||
-           resample->resample.channel_layout != resample->in.channel_layout ||
-           resample->resample.lfe_mix_level != resample->in.lfe_mix_level ||
-           resample->resample.center_mix_level != resample->in.center_mix_level ||
-@@ -181,6 +195,8 @@ int hb_audio_resample_update(hb_audio_re
- 
-             av_opt_set_int(resample->swresample, "out_sample_fmt",
-                            resample->out.sample_fmt, 0);
-+            av_opt_set_int(resample->swresample, "out_sample_rate",
-+                           resample->out.sample_rate, 0);
-             av_opt_set_int(resample->swresample, "out_channel_layout",
-                            resample->out.channel_layout, 0);
-             av_opt_set_int(resample->swresample, "matrix_encoding",
-@@ -191,6 +207,8 @@ int hb_audio_resample_update(hb_audio_re
- 
-         av_opt_set_int(resample->swresample, "in_sample_fmt",
-                        resample->in.sample_fmt, 0);
-+        av_opt_set_int(resample->swresample, "in_sample_rate",
-+                       resample->in.sample_rate, 0);
-         av_opt_set_int(resample->swresample, "in_channel_layout",
-                        resample->in.channel_layout, 0);
-         av_opt_set_double(resample->swresample, "lfe_mix_level",
-@@ -212,6 +230,7 @@ int hb_audio_resample_update(hb_audio_re
-         }
- 
-         resample->resample.sample_fmt         = resample->in.sample_fmt;
-+        resample->resample.sample_rate        = resample->in.sample_rate;
-         resample->resample.channel_layout     = resample->in.channel_layout;
-         resample->resample.channels           =
-             av_get_channel_layout_nb_channels(resample->in.channel_layout);
-@@ -255,11 +274,13 @@ hb_buffer_t* hb_audio_resample(hb_audio_
- 
-     if (resample->resample_needed)
-     {
--        out_size = av_samples_get_buffer_size(NULL,
--                                              resample->out.channels, nsamples,
-+        out_samples = (nsamples + 1) * resample->out.sample_rate /
-+                                       resample->in.sample_rate;
-+        out_size = av_samples_get_buffer_size(NULL, resample->out.channels,
-+                                              out_samples,
-                                               resample->out.sample_fmt, 0);
-         out = hb_buffer_init(out_size);
--        out_samples = swr_convert(resample->swresample, &out->data, nsamples,
-+        out_samples = swr_convert(resample->swresample, &out->data, out_samples,
-                                                         samples,    nsamples);
- 
-         if (out_samples <= 0)
-diff -rup HandBrake-1.2.2.orig/libhb/audio_resample.h HandBrake-1.2.2/libhb/audio_resample.h
---- HandBrake-1.2.2.orig/libhb/audio_resample.h	2019-02-22 17:23:51.000000000 +0100
-+++ HandBrake-1.2.2/libhb/audio_resample.h	2019-10-14 14:32:45.006416242 +0200
-@@ -37,6 +37,7 @@ typedef struct
- 
-     struct
-     {
-+        int sample_rate;
-         uint64_t channel_layout;
-         double lfe_mix_level;
-         double center_mix_level;
-@@ -46,6 +47,7 @@ typedef struct
- 
-     struct
-     {
-+        int sample_rate;
-         int channels;
-         uint64_t channel_layout;
-         double lfe_mix_level;
-@@ -56,6 +58,7 @@ typedef struct
- 
-     struct
-     {
-+        int sample_rate;
-         int channels;
-         int sample_size;
-         uint64_t channel_layout;
-@@ -72,6 +75,7 @@ typedef struct
-  * as the output characteristics (no conversion needed).
-  */
- hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt,
-+                                            int sample_rate,
-                                             int hb_amixdown, int normalize_mix);
- 
- /* The following functions set the audio input characteristics.
-@@ -91,6 +95,9 @@ void                 hb_audio_resample_s
- void                 hb_audio_resample_set_sample_fmt(hb_audio_resample_t *resample,
-                                                       enum AVSampleFormat sample_fmt);
- 
-+void                 hb_audio_resample_set_sample_rate(hb_audio_resample_t *resample,
-+                                                       int sample_rate);
-+
- /* Update an hb_audio_resample_t.
-  *
-  * Must be called after using any of the above functions.
-diff -rup HandBrake-1.2.2.orig/libhb/decavcodec.c HandBrake-1.2.2/libhb/decavcodec.c
---- HandBrake-1.2.2.orig/libhb/decavcodec.c	2019-02-22 17:23:51.000000000 +0100
-+++ HandBrake-1.2.2/libhb/decavcodec.c	2019-10-14 14:32:45.006416242 +0200
-@@ -204,8 +204,13 @@ static int decavcodecaInit( hb_work_obje
-     /* Downmixing & sample_fmt conversion */
-     if (!(w->audio->config.out.codec & HB_ACODEC_PASS_FLAG))
-     {
-+        // Currently, samplerate conversion is performed in sync.c
-+        // So set output samplerate to input samplerate
-+        // This should someday get reworked to be part of an audio
-+        // filter pipleine.
-         pv->resample =
-             hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
-+                                   w->audio->config.in.samplerate,
-                                    w->audio->config.out.mixdown,
-                                    w->audio->config.out.normalize_mix_level);
-         if (pv->resample == NULL)
-@@ -2308,6 +2313,8 @@ static void decodeAudio(hb_work_private_
-             hb_audio_resample_set_channel_layout(pv->resample, channel_layout);
-             hb_audio_resample_set_sample_fmt(pv->resample,
-                                              pv->frame->format);
-+            hb_audio_resample_set_sample_rate(pv->resample,
-+                                             pv->frame->sample_rate);
-             if (hb_audio_resample_update(pv->resample))
-             {
-                 hb_log("decavcodec: hb_audio_resample_update() failed");
-Only in HandBrake-1.2.2/libhb: decavcodec.c.orig
-diff -rup HandBrake-1.2.2.orig/libhb/declpcm.c HandBrake-1.2.2/libhb/declpcm.c
---- HandBrake-1.2.2.orig/libhb/declpcm.c	2019-02-22 17:23:51.000000000 +0100
-+++ HandBrake-1.2.2/libhb/declpcm.c	2019-10-14 14:32:45.006416242 +0200
-@@ -166,8 +166,12 @@ static int declpcmInit( hb_work_object_t
-     pv->job = job;
- 
-     pv->next_pts = (int64_t)AV_NOPTS_VALUE;
-+    // Currently, samplerate conversion is performed in sync.c
-+    // So set output samplerate to input samplerate
-+    // This should someday get reworked to be part of an audio filter pipleine.
-     pv->resample =
-         hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
-+                               w->audio->config.in.samplerate,
-                                w->audio->config.out.mixdown,
-                                w->audio->config.out.normalize_mix_level);
-     if (pv->resample == NULL)
-@@ -333,6 +337,8 @@ static hb_buffer_t *Decode( hb_work_obje
- 
-     hb_audio_resample_set_channel_layout(pv->resample,
-                                          hdr2layout[pv->nchannels - 1]);
-+    hb_audio_resample_set_sample_rate(pv->resample,
-+                                      pv->samplerate);
-     if (hb_audio_resample_update(pv->resample))
-     {
-         hb_log("declpcm: hb_audio_resample_update() failed");
-diff -rup HandBrake-1.2.2.orig/libhb/encavcodecaudio.c HandBrake-1.2.2/libhb/encavcodecaudio.c
---- HandBrake-1.2.2.orig/libhb/encavcodecaudio.c	2019-02-22 17:23:51.000000000 +0100
-+++ HandBrake-1.2.2/libhb/encavcodecaudio.c	2019-10-14 14:32:45.006416242 +0200
-@@ -249,13 +249,13 @@ static int encavcodecaInit(hb_work_objec
-                        context->channel_layout, 0);
-         av_opt_set_int(pv->swresample, "out_channel_layout",
-                        context->channel_layout, 0);
-+        av_opt_set_int(pv->swresample, "in_sample_rate",
-+                       context->sample_rate, 0);
-+        av_opt_set_int(pv->swresample, "out_sample_rate",
-+                       context->sample_rate, 0);
-         if (hb_audio_dither_is_supported(audio->config.out.codec))
-         {
-             // dithering needs the sample rate
--            av_opt_set_int(pv->swresample, "in_sample_rate",
--                           context->sample_rate, 0);
--            av_opt_set_int(pv->swresample, "out_sample_rate",
--                           context->sample_rate, 0);
-             av_opt_set_int(pv->swresample, "dither_method",
-                            audio->config.out.dither_method, 0);
-         }

HandBrake-1.2.2-source.tar.bz2 Deleted

HandBrake-1.3.0-source.tar.bz2 Added

HandBrake-1.2.2-source.tar.bz2.sig -> HandBrake-1.3.0-source.tar.bz2.sig Changed

Build Results
RPM Lint

Refresh

Comments for request 4659 0

Request History

enzokiel created request almost 6 years ago

enzokiel accepted request almost 6 years ago