[arch-commits] Commit in handbrake/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, December 28, 2016 @ 06:23:25
  Author: foutrelis
Revision: 203169

upgpkg: handbrake 1.0.0-3

Backport one more upstream commit so that VP8/9 jobs actually complete.

Added:
  handbrake/trunk/handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
Modified:
  handbrake/trunk/PKGBUILD

-------------------------------------------------+
 PKGBUILD                                        |    6 +++-
 handbrake-fix-2-pass-vp8-and-vp9-encoding.patch |   31 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-28 06:19:23 UTC (rev 203168)
+++ PKGBUILD	2016-12-28 06:23:25 UTC (rev 203169)
@@ -5,7 +5,7 @@
 
 pkgname=('handbrake' 'handbrake-cli')
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
@@ -16,9 +16,11 @@
              'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev')
 source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
         handbarke-fix-crash-during-2-pass-encode.patch
+        handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
         handbrake-fix-missing-x265-link-flag.patch)
 sha256sums=('15fb4593c70d75621212e4499f018c3c93d7ce39f1083bf527d4616ded0044c5'
             'aaa09e9b3dbad54024f02afe8ace5390b281c7cc6aae80cf26d43f773b2d19f7'
+            '1b6d800acde0cc2c7e6080f23f2ddd435257c5a2d853acdeb4e4a6fada856310'
             '05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4')
 
 prepare() {
@@ -26,6 +28,8 @@
 
   # https://github.com/HandBrake/HandBrake/commit/e159ab1662ba#commitcomment-20303756
   patch -Np1 -i ../handbarke-fix-crash-during-2-pass-encode.patch
+  # https://github.com/HandBrake/HandBrake/issues/449#issuecomment-269352579
+  patch -Np1 -i ../handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
 
   # https://bugs.gentoo.org/show_bug.cgi?id=552792
   patch -Np1 -i ../handbrake-fix-missing-x265-link-flag.patch

Added: handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
===================================================================
--- handbrake-fix-2-pass-vp8-and-vp9-encoding.patch	                        (rev 0)
+++ handbrake-fix-2-pass-vp8-and-vp9-encoding.patch	2016-12-28 06:23:25 UTC (rev 203169)
@@ -0,0 +1,31 @@
+From d64dba737d0136b58545be33c50db093df1880c1 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb at gmail.com>
+Date: Tue, 27 Dec 2016 08:57:06 -0800
+Subject: [PATCH] encavcodec: fix 2 pass vp8 and vp9 encoding
+
+libvpx only supplies the stats upon the final flush of the encoder.  So
+we must also write stats after final flush.
+---
+ libhb/encavcodec.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
+index 0543fe4..591aa4f 100644
+--- a/libhb/encavcodec.c
++++ b/libhb/encavcodec.c
+@@ -610,6 +610,15 @@ static void Flush( hb_work_object_t * w, hb_buffer_list_t * list )
+     hb_work_private_t * pv = w->private_data;
+ 
+     avcodec_send_frame(pv->context, NULL);
++
++    // Write stats
++    // vpx only writes stats at final flush
++    if (pv->job->pass_id == HB_PASS_ENCODE_1ST &&
++        pv->context->stats_out != NULL)
++    {
++        fprintf( pv->file, "%s", pv->context->stats_out );
++    }
++
+     get_packets(w, list);
+ }
+