Browse Source

add ffmpeg2.0.patch

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10787 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 5 years ago
parent
commit
187195f928

+ 135 - 0
nonfree/self-build-libquicktime/ffmpeg2.0.patch

@@ -0,0 +1,135 @@
+Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ
+diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h
+--- a/plugins/ffmpeg/ffmpeg.h	2012-02-15 20:48:30.000000000 +0100
++++ b/plugins/ffmpeg/ffmpeg.h	2013-07-15 15:05:19.307534593 +0200
+@@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+ 
+ 
+ #endif
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++#define CODEC_FLAG2_STRICT_GOP 0x00000002
++#define CODEC_FLAG_QP_RD 0x08000000
++#define CODEC_FLAG_CBP_RD 0x04000000
+diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c
+--- a/plugins/ffmpeg/lqt_ffmpeg.c	2012-02-15 20:48:30.000000000 +0100
++++ b/plugins/ffmpeg/lqt_ffmpeg.c	2013-07-15 15:19:09.730831655 +0200
+@@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1;
+     PARAM_QSCALE, \
+     PARAM_QCOMPRESS, \
+     PARAM_QBLUR, \
+-    PARAM_QUANTIZER_NOISE_SHAPING, \
+     PARAM_TRELLIS
+ 
+-#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \
+-  ENCODE_PARAM_VIDEO_QUANTIZER_I, \
+-  PARAM_I_QUANT_FACTOR, \
+-  PARAM_I_QUANT_OFFSET
+-
+-#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \
+-  ENCODE_PARAM_VIDEO_QUANTIZER_IP, \
+-  PARAM_B_QUANT_FACTOR, \
+-  PARAM_B_QUANT_OFFSET
+-
+ #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \
+   { \
+     .name =      "frame_types", \
+@@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod
+   ENCODE_PARAM_VIDEO_FRAMETYPES_IPB,
+   PARAM_FLAG_AC_PRED_MPEG4,
+   ENCODE_PARAM_VIDEO_RATECONTROL,
+-  ENCODE_PARAM_VIDEO_QUANTIZER_IPB,
+   PARAM_FLAG_CBP_RD,
+   ENCODE_PARAM_VIDEO_ME,
+   PARAM_FLAG_GMC,
+@@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod
+ static lqt_parameter_info_static_t encode_parameters_dx50[] = {
+   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
+   ENCODE_PARAM_VIDEO_RATECONTROL,
+-  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
+   ENCODE_PARAM_VIDEO_ME,
+   ENCODE_PARAM_VIDEO_ME_PRE,
+   ENCODE_PARAM_VIDEO_MASKING,
+@@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod
+ static lqt_parameter_info_static_t encode_parameters_h263[] = {
+   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
+   ENCODE_PARAM_VIDEO_RATECONTROL,
+-  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
+   ENCODE_PARAM_VIDEO_ME,
+   PARAM_FLAG_4MV,
+   ENCODE_PARAM_VIDEO_ME_PRE,
+@@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod
+ static lqt_parameter_info_static_t encode_parameters_h263p[] = {
+   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
+   ENCODE_PARAM_VIDEO_RATECONTROL,
+-  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
+   ENCODE_PARAM_VIDEO_ME,
+   PARAM_FLAG_4MV,
+   ENCODE_PARAM_VIDEO_ME_PRE,
+@@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod
+ static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = {
+   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
+   ENCODE_PARAM_VIDEO_RATECONTROL,
+-  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
+   ENCODE_PARAM_VIDEO_ME,
+   ENCODE_PARAM_VIDEO_ME_PRE,
+   ENCODE_PARAM_VIDEO_MASKING,
+diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c
+--- a/plugins/ffmpeg/params.c	2012-03-07 15:10:41.000000000 +0100
++++ b/plugins/ffmpeg/params.c	2013-07-15 15:09:38.214189953 +0200
+@@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_max_b_frames",max_b_frames);
+   PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
+   PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
++#if (LIBAVCODEC_VERSION_MAJOR < 55)
+   PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
+   PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
++#endif
+   PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
+   PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
+   PARAM_INT("ff_rc_min_rate",rc_min_rate);
+@@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_QP2LAMBDA("ff_lmax", lmax);
+   PARAM_INT("ff_noise_reduction",noise_reduction);
+   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
++#if #if (LIBAVCODEC_VERSION_MAJOR < 55)
+   PARAM_INT("ff_inter_threshold",inter_threshold);
+   PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
++#endif
+   PARAM_INT("ff_thread_count",thread_count);
+   PARAM_INT("ff_me_threshold",me_threshold);
+   PARAM_INT("ff_mb_threshold",mb_threshold);
+diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h
+--- a/plugins/ffmpeg/params.h	2011-05-11 17:13:39.000000000 +0200
++++ b/plugins/ffmpeg/params.h	2013-07-15 15:09:04.860858069 +0200
+@@ -177,6 +177,7 @@ the reference. Unused for constant quant
+     .val_max =     { .val_int = 1 }, \
+   }
+ 
++#if (LIBAVCODEC_VERSION_MAJOR < 55)
+ #define PARAM_LUMA_ELIM_THRESHOLD \
+   { \
+     .name =        "ff_luma_elim_threshold", \
+@@ -202,6 +203,7 @@ recommendation") \
+ chrominamce. Negative values also consider dc \
+ coefficient. 7 is JVT recommendation") \
+   }
++#endif
+ 
+ #define PARAM_STRICT_STANDARD_COMPLIANCE \
+   { \
+@@ -739,6 +741,7 @@ with max and/or min bitrate, this must b
+ 
+ /* Does nothing */
+ /** Frame types */
++#if (LIBAVCODEC_VERSION_MAJOR < 55)
+ #define PARAM_INTER_THRESHOLD \
+   { \
+     .name =        "ff_inter_threshold", \
+@@ -759,6 +762,7 @@ with max and/or min bitrate, this must b
+     .help_string = TRS("Choose quantization such that noise will be masked by " \
+                        "similar-frequency content in the image")        \
+   }
++#endif
+ 
+ /** Motion estimation */
+ #define PARAM_ME_THRESHOLD \

+ 7 - 1
nonfree/self-build-libquicktime/libquicktime-vl.spec

@@ -1,9 +1,11 @@
 Name:            libquicktime
 Version:         1.2.4
-Release:         4%{?_dist_release}
+Release:         5%{?_dist_release}
 License:         LGPLv2+
 Group:           System Environment/Libraries
 Source0:         http://prdownloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
+Patch1:          ffmpeg2.0.patch
+
 URL:             http://libquicktime.sourceforge.net/
 Summary:         Library for reading and writing Quicktime files
 Summary(ja):     QuickTime ファイルを読み書きするためのライブラリ
@@ -97,6 +99,7 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .ffmpeg2.0
 
 %build
 %configure \
@@ -164,6 +167,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec %__rm -f {} \;
 
 
 %changelog
+* Tue Oct 25 2016 Toshiaki Ara <ara_t@384.jp> 1.2.4-5
+- add Patch1 for [BTS:0002886]
+
 * Wed Oct  2 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-4
 - added Obsoletes: %{name} < %{version} and so on.
 

+ 6 - 1
nonfree/self-build-libquicktime/self-build-libquicktime-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname libquicktime
 %define name	self-build-%{pkgname}
 %define version 1.2.4
-%define release	4%{?_dist_release}
+%define release	5%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/libquicktime/%{pkgname}-%{version}.tar.gz
 
@@ -11,6 +11,7 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
+Source1:	ffmpeg2.0.patch
 
 License:	LGPLv2+
 Group:		Restricted Software
@@ -137,6 +138,7 @@ libquicktime は quicktime4linux と互換性を持ったソースです。
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -152,6 +154,9 @@ libquicktime は quicktime4linux と互換性を持ったソースです。
 %{_datadir}/%{name}
 
 %changelog
+* Tue Oct 25 2016 Toshiaki Ara <ara_t@384.jp> 1.2.4-5
+- add Patch1 for [BTS:0002886]
+
 * Wed Oct  2 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.2.4-4
 - added Obsoletes: %{name} < %{version}-%{release}, 
   Obsoletes: %{pkgname} < %{version} and so on.