Update of the x264 compatibility patch to be compatible with media-libs/x264-svn-20061014

(Portage version: 2.1.2_pre3-r1)

2 files changed, 76 insertions, 60 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 99a66a428afb..7098cb7ca8c8 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.62 2006/08/20 16:40:10 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.63 2006/10/14 23:54:33 aballier Exp $
+
+  14 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  files/libquicktime-new-x264.patch:
+  Update of the x264 compatibility patch to be compatible with
+  media-libs/x264-svn-20061014
 
 *libquicktime-0.9.9-r1 (20 Aug 2006)
 
diff --git a/media-libs/libquicktime/files/libquicktime-new-x264.patch b/media-libs/libquicktime/files/libquicktime-new-x264.patch
index f87de840811e..850e30931e3c 100644
--- a/media-libs/libquicktime/files/libquicktime-new-x264.patch
+++ b/media-libs/libquicktime/files/libquicktime-new-x264.patch
@@ -1,5 +1,68 @@
---- libquicktime-0.9.9/plugins/x264/x264.c	2006/06/25 13:10:30	1.7
-+++ libquicktime-0.9.9/plugins/x264/x264.c	2006/07/25 12:17:37	1.8
+diff -u -B -r libquicktime-0.9.9/plugins/x264/lqt_x264.c libquicktime-0.9.9_new/plugins/x264/lqt_x264.c
+--- libquicktime-0.9.9/plugins/x264/lqt_x264.c	2006-04-10 23:46:15.000000000 +0200
++++ libquicktime-0.9.9_new/plugins/x264/lqt_x264.c	2006-10-15 01:02:19.000000000 +0200
+@@ -74,6 +74,21 @@
+       type:      LQT_PARAMETER_SECTION
+     },
+     {
++      name:        "x264_i_rc_method",
++      real_name:   "Ratecontrol method",
++      type:        LQT_PARAMETER_STRINGLIST,
++      val_default: { val_string: "Constant quality" },
++      stringlist_options: (char*[]){ "Constant quality",
++                                     "Average bitrate",
++                                     "CRF based VBR",
++                                     (char*)0 },
++      help_string: "Ratecontrol method:\n\
++Constant quality: Specify a quantizer parameter below\n\
++Average bitrate: Specify a bitrate below\n\
++CRF based VBR: Specify a rate factor below\n\
++Selecting 2-pass encoding will force Average bitrate.",
++    },
++    {
+       name:        "x264_i_bitrate",
+       real_name:   "Bitrate",
+       type:        LQT_PARAMETER_INT,
+@@ -81,6 +96,16 @@
+       help_string: "Bitrate in kbit/s. 0 means VBR (recommended)"
+     },
+     {
++      name:        "x264_f_rf_constant",
++      real_name:   "Nominal Quantizer parameter",
++      type:        LQT_PARAMETER_FLOAT,
++      val_default: { val_float: 26.0 },
++      val_min:     { val_float: 0.0 },
++      val_max:     { val_float: 51.0 },
++      help_string: "This selects the nominal quantizer to use (1 to 51). Lower values result in " \
++    "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
++    },
++    {
+       name:        "x264_i_qp_constant",
+       real_name:   "Quantizer parameter",
+       type:        LQT_PARAMETER_INT,
+@@ -90,7 +115,9 @@
+       help_string: "This selects the quantizer to use (1 to 51). Lower values result in " \
+     "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
+     },
+-    {
++
++
++{
+       name:        "x264_i_qp_min",
+       real_name:   "Minimum quantizer parameter",
+       type:        LQT_PARAMETER_INT,
+diff -u -B -r libquicktime-0.9.9/plugins/x264/x264.c libquicktime-0.9.9_new/plugins/x264/x264.c
+--- libquicktime-0.9.9/plugins/x264/x264.c	2006-06-25 15:10:30.000000000 +0200
++++ libquicktime-0.9.9_new/plugins/x264/x264.c	2006-10-15 01:01:02.000000000 +0200
+@@ -91,7 +91,7 @@
+   fprintf(stderr, "    i_qp_step:          %d\n", params->rc.i_qp_step);
+   fprintf(stderr, "    b_cbr:              %d\n", params->rc.b_cbr);
+   fprintf(stderr, "    i_bitrate:          %d\n", params->rc.i_bitrate);
+-  fprintf(stderr, "    i_rf_constant:      %d\n", params->rc.i_rf_constant);
++  fprintf(stderr, "    f_rf_constant:      %d\n", params->rc.f_rf_constant);
+   fprintf(stderr, "    f_rate_tolerance:   %f\n", params->rc.f_rate_tolerance);
+   fprintf(stderr, "    i_vbv_max_bitrate:  %d\n", params->rc.i_vbv_max_bitrate);
+   fprintf(stderr, "    i_vbv_buffer_size:  %d\n", params->rc.i_vbv_buffer_size);
 @@ -437,7 +437,7 @@
    codec->stats_filename = malloc(strlen(stats_file)+1);
    strcpy(codec->stats_filename, stats_file);
@@ -17,20 +80,20 @@
 -    /* Open encoder */
  
 -    if(codec->pass == 1)
-+    if(codec->total_passes)
-       {
+-      {
 -      /* Strings will be made private by x264 */
 -      codec->params.rc.psz_stat_out = codec->stats_filename;
 -      codec->params.rc.b_stat_write = 1;
 -      }
 -    else if(codec->total_passes && (codec->pass == codec->total_passes))
--      {
++    if(codec->total_passes)
+       {
 -      /* Strings will be made private by x264 */
 -      codec->params.rc.psz_stat_in = codec->stats_filename;
 -      codec->params.rc.b_stat_read = 1;
 +      /* Force ABR */
 +      codec->params.rc.i_rc_method = X264_RC_ABR;
-+      codec->params.rc.i_rf_constant = 0;
++      codec->params.rc.f_rf_constant = 0.;
 +      if(codec->pass == 1)
 +        {
 +        /* Strings will be made private by x264 */
@@ -88,59 +151,7 @@
 +  INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
 +  
    INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant);
-+  INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
++  FLOATPARAM("x264_f_rf_constant", codec->params.rc.f_rf_constant);
    INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min);
    INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max);
    INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step);
---- libquicktime-0.9.9/plugins/x264/lqt_x264.c	2006/04/10 21:46:15	1.2
-+++ libquicktime-0.9.9/plugins/x264/lqt_x264.c	2006/07/25 12:17:37	1.3
-@@ -74,6 +74,21 @@
-       type:      LQT_PARAMETER_SECTION
-     },
-     {
-+      name:        "x264_i_rc_method",
-+      real_name:   "Ratecontrol method",
-+      type:        LQT_PARAMETER_STRINGLIST,
-+      val_default: { val_string: "Constant quality" },
-+      stringlist_options: (char*[]){ "Constant quality",
-+                                     "Average bitrate",
-+                                     "CRF based VBR",
-+                                     (char*)0 },
-+      help_string: "Ratecontrol method:\n\
-+Constant quality: Specify a quantizer parameter below\n\
-+Average bitrate: Specify a bitrate below\n\
-+CRF based VBR: Specify a rate factor below\n\
-+Selecting 2-pass encoding will force Average bitrate.",
-+    },
-+    {
-       name:        "x264_i_bitrate",
-       real_name:   "Bitrate",
-       type:        LQT_PARAMETER_INT,
-@@ -81,6 +96,16 @@
-       help_string: "Bitrate in kbit/s. 0 means VBR (recommended)"
-     },
-     {
-+      name:        "x264_i_rf_constant",
-+      real_name:   "Nominal Quantizer parameter",
-+      type:        LQT_PARAMETER_INT,
-+      val_default: { val_int: 26 },
-+      val_min:     { val_int: 0 },
-+      val_max:     { val_int: 51 },
-+      help_string: "This selects the nominal quantizer to use (1 to 51). Lower values result in " \
-+    "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
-+    },
-+    {
-       name:        "x264_i_qp_constant",
-       real_name:   "Quantizer parameter",
-       type:        LQT_PARAMETER_INT,
-@@ -90,7 +115,9 @@
-       help_string: "This selects the quantizer to use (1 to 51). Lower values result in " \
-     "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
-     },
--    {
-+
-+
-+{
-       name:        "x264_i_qp_min",
-       real_name:   "Minimum quantizer parameter",
-       type:        LQT_PARAMETER_INT,