Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

avidemux3.changes Changed

avidemux3.spec Changed

@@ -16,6 +16,8 @@
 #
 
 
+%define         ffmpeg_version 1.2.5
+
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
 Version:        2.6.7
@@ -24,6 +26,8 @@
 Source0:        avidemux_%{version}.tar.gz
 Source1:        avidemux3-qt4.desktop
 Source2:        avidemux3-gtk.desktop
+Source3:        ffmpeg-%{ffmpeg_version}.tar.bz2
+Source4:        xvba_support_from_xbmc_xvba.patch
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
@@ -199,6 +203,13 @@
 %prep
 %setup -q -n avidemux_%{version}
 find . -type f -exec dos2unix -q {} \;
+sed -i -e 's|set(FFMPEG_VERSION "1.2.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
+rm -f avidemux_core/ffmpeg_package/ffmpeg-1.2.1.tar.bz2
+cp %{S:3} avidemux_core/ffmpeg_package/
+pushd avidemux_core/ffmpeg_package/patches/xvba
+rm -f xvba_support_from_xbmc_xvba.patch
+cp %{S:4} .
+popd
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0

xvba_support_from_xbmc_xvba.patch Added

@@ -0,0 +1,854 @@
+diff --git a/configure b/configure
+index d557cac..ba1f392 100755
+--- a/configure
++++ b/configure
+@@ -144,6 +144,7 @@
+   --disable-vaapi          disable VAAPI code [autodetect]
+   --enable-vda             enable VDA code
+   --disable-vdpau          disable VDPAU code [autodetect]
++  --disable-xvba           disable XVBA code
+ 
+ Individual component options:
+   --disable-everything     disable all components listed below
+@@ -1216,6 +1217,7 @@
+     vaapi
+     vda
+     vdpau
++    xvba
+ "
+ 
+ LIBRARY_LIST="
+@@ -1845,6 +1847,7 @@
+ dxva2_deps="dxva2api_h"
+ vaapi_deps="va_va_h"
+ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
++xvba_deps="amd_amdxvba_h"
+ vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
+ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+ 
+@@ -1865,6 +1868,8 @@
+ h264_vdpau_decoder_select="h264_decoder"
+ h264_vdpau_hwaccel_deps="vdpau"
+ h264_vdpau_hwaccel_select="h264_decoder"
++h264_xvba_hwaccel_select="h264_decoder"
++h264_xvba_hwaccel_deps="xvba"
+ mpeg_vdpau_decoder_deps="vdpau"
+ mpeg_vdpau_decoder_select="mpegvideo_decoder"
+ mpeg1_vdpau_decoder_deps="vdpau"
+@@ -1877,6 +1882,8 @@
+ mpeg2_vaapi_hwaccel_deps="vaapi"
+ mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
+ mpeg2_vdpau_hwaccel_deps="vdpau"
++mpeg2_xvba_hwaccel_select="mpeg2video_decoder"
++mpeg2_xvba_hwaccel_deps="xvba"
+ mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
+ mpeg4_crystalhd_decoder_select="crystalhd"
+ mpeg4_vaapi_hwaccel_deps="vaapi"
+@@ -1895,11 +1902,14 @@
+ vc1_vdpau_decoder_select="vc1_decoder"
+ vc1_vdpau_hwaccel_deps="vdpau"
+ vc1_vdpau_hwaccel_select="vc1_decoder"
++vc1_xvba_hwaccel_select="vc1_decoder"
++vc1_xvba_hwaccel_deps="xvba"
+ wmv3_crystalhd_decoder_select="crystalhd"
+ wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
+ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
+ wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
+ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
++wmv3_xvba_hwaccel_select="vc1_xvba_hwaccel"
+ 
+ # parsers
+ h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
+@@ -3853,6 +3863,7 @@
+ check_header unistd.h
+ check_header vdpau/vdpau.h
+ check_header vdpau/vdpau_x11.h
++check_header amd/amdxvba.h
+ check_header VideoDecodeAcceleration/VDADecoder.h
+ check_header windows.h
+ check_header X11/extensions/XvMClib.h
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index dc065a5..c386923 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -12,6 +12,7 @@ HEADERS = avcodec.h                                                     \
+           vdpau.h                                                       \
+           version.h                                                     \
+           xvmc.h                                                        \
++          xvba.h                                                        \
+ 
+ OBJS = allcodecs.o                                                      \
+        audioconvert.o                                                   \
+@@ -73,6 +74,7 @@ OBJS-$(CONFIG_SHARED)                  += log2_tab.o
+ OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
+ OBJS-$(CONFIG_VAAPI)                   += vaapi.o
+ OBJS-$(CONFIG_VDPAU)                   += vdpau.o
++OBJS-$(CONFIG_XVBA)                    += xvba.o
+ OBJS-$(CONFIG_VIDEODSP)                += videodsp.o
+ OBJS-$(CONFIG_VP3DSP)                  += vp3dsp.o
+ 
+@@ -232,6 +234,7 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL)      += vaapi_h264.o
+ OBJS-$(CONFIG_H264_VDA_HWACCEL)        += vda_h264.o
+ OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
+ OBJS-$(CONFIG_H264_VDPAU_HWACCEL)      += vdpau_h264.o
++OBJS-$(CONFIG_H264_XVBA_HWACCEL)       += xvba_h264.o
+ OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
+ OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
+ OBJS-$(CONFIG_IAC_DECODER)             += imc.o
+@@ -295,6 +298,7 @@ OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
+ OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)     += dxva2_mpeg2.o
+ OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += vaapi_mpeg2.o
+ OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)     += vdpau_mpeg12.o
++OBJS-$(CONFIG_MPEG2_XVBA_HWACCEL)      += xvba_mpeg2.o
+ OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o
+ OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
+                                           timecode.o
+@@ -459,6 +463,7 @@ OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
+ OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)       += dxva2_vc1.o
+ OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vaapi_vc1.o
+ OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)       += vdpau_vc1.o
++OBJS-$(CONFIG_VC1_XVBA_HWACCEL)        += xvba_vc1.o
+ OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
+ OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
+ OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
+@@ -788,6 +793,7 @@ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
+ SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
+ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
+ SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
++SKIPHEADERS-$(CONFIG_XVBA)             += xvba_internal.h
+ SKIPHEADERS-$(CONFIG_VDA)              += vda.h
+ SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
+ SKIPHEADERS-$(HAVE_OS2THREADS)         += os2threads.h
+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
+index 584446f..7a8f61c 100644
+--- a/libavcodec/allcodecs.c
++++ b/libavcodec/allcodecs.c
+@@ -79,18 +79,22 @@ void avcodec_register_all(void)
+     REGISTER_HWACCEL(H264_VAAPI,        h264_vaapi);
+     REGISTER_HWACCEL(H264_VDA,          h264_vda);
+     REGISTER_HWACCEL(H264_VDPAU,        h264_vdpau);
++    REGISTER_HWACCEL(H264_XVBA,         h264_xvba);
+     REGISTER_HWACCEL(MPEG1_VDPAU,       mpeg1_vdpau);
+     REGISTER_HWACCEL(MPEG2_DXVA2,       mpeg2_dxva2);
+     REGISTER_HWACCEL(MPEG2_VAAPI,       mpeg2_vaapi);
+     REGISTER_HWACCEL(MPEG2_VDPAU,       mpeg2_vdpau);
++    REGISTER_HWACCEL(MPEG2_XVBA,        mpeg2_xvba);
+     REGISTER_HWACCEL(MPEG4_VAAPI,       mpeg4_vaapi);
+     REGISTER_HWACCEL(MPEG4_VDPAU,       mpeg4_vdpau);
+     REGISTER_HWACCEL(VC1_DXVA2,         vc1_dxva2);
+     REGISTER_HWACCEL(VC1_VAAPI,         vc1_vaapi);
+     REGISTER_HWACCEL(VC1_VDPAU,         vc1_vdpau);
++    REGISTER_HWACCEL(VC1_XVBA,          vc1_xvba);
+     REGISTER_HWACCEL(WMV3_DXVA2,        wmv3_dxva2);
+     REGISTER_HWACCEL(WMV3_VAAPI,        wmv3_vaapi);
+     REGISTER_HWACCEL(WMV3_VDPAU,        wmv3_vdpau);
++    REGISTER_HWACCEL(WMV3_XVBA,         wmv3_xvba);
+ 
+     /* video codecs */
+     REGISTER_ENCODER(A64MULTI,          a64multi);
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c
+index 3a83b4b..96b6c30 100644
+--- a/libavcodec/h264.c
++++ b/libavcodec/h264.c
+@@ -81,6 +81,9 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = {
+ #if CONFIG_H264_VDPAU_HWACCEL
+     AV_PIX_FMT_VDPAU,
+ #endif
++#if CONFIG_H264_XVBA_HWACCEL
++    AV_PIX_FMT_XVBA_VLD,
++#endif
+     AV_PIX_FMT_YUV420P,
+     AV_PIX_FMT_NONE
+ };
+diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
+index 2130c74..4d611f9 100644
+--- a/libavcodec/vc1dec.c
++++ b/libavcodec/vc1dec.c
+@@ -5807,6 +5807,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
+ #if CONFIG_VDPAU
+     AV_PIX_FMT_VDPAU,
+ #endif
++#if CONFIG_XVBA
++    AV_PIX_FMT_XVBA_VLD,
++#endif
+     AV_PIX_FMT_YUV420P,
+     AV_PIX_FMT_NONE
+ };
+diff --git a/libavcodec/xvba.c b/libavcodec/xvba.c
+new file mode 100644
+index 0000000..c6ff2fe
+--- /dev/null
++++ b/libavcodec/xvba.c
+@@ -0,0 +1,77 @@
++/*
++ * HW decode acceleration for MPEG-2, H.264 and VC-1
++ *
++ * Copyright (C) 2005-2011 Team XBMC
++ *
++ * This file is part of FFmpeg.
++ *
++ * FFmpeg is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * FFmpeg is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *

ffmpeg-1.2.5.tar.bz2 Added