Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
multimedia/transcode/DESCR Normal file
View File

@@ -0,0 +1,9 @@
transcode is a command line video-stream processing tool.
It supports elementary video and audio frame transformations.
Some example modules are included to enable import of MPEG-1/2,
Digital Video, and other formats. It also includes export
modules for writing to AVI files with DivX, OpenDivX, XviD,
Digital Video or other codecs. Direct DVD transcoding is also
supported. A set of tools is available to extract and decode
the sources into raw video/audio streams for import and to
enable post-processing of AVI files.

70
multimedia/transcode/Makefile Normal file
View File

@@ -0,0 +1,70 @@
# $NetBSD: Makefile,v 1.87 2013/06/04 22:16:50 tron Exp $
DISTNAME= transcode-1.1.7
PKGREVISION= 7
CATEGORIES= multimedia
#MASTER_SITES= http://download.berlios.de/tcforge/
MASTER_SITES= http://bitbucket.org/france/transcode-tcforge/downloads/
EXTRACT_SUFX= .tar.bz2
FETCH_USING= curl
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcforge.berlios.de/
COMMENT= Command line video-stream processing tool
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= awk:run gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-xio
CONFIGURE_ARGS+= --enable-libmpeg2
CONFIGURE_ARGS+= --enable-libmpeg2convert
CONFIGURE_ARGS+= --enable-libpostproc
CONFIGURE_ARGS+= --enable-ogg
CONFIGURE_ARGS+= --enable-theora
CONFIGURE_ARGS+= --enable-vorbis
CONFIGURE_ARGS+= --enable-xvid
CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg}
CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q}
PTHREAD_AUTO_VARS= yes
PTHREAD_OPTS= require
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == "i386"
PLIST.i386= yes
.endif
PLIST_VARS+= i386 oss x11
.if ${OPSYS} != "Darwin"
CONFIGURE_ARGS+= --enable-oss
PLIST.oss= yes
PLIST.x11= yes
LIBS+= ${LIBOSSAUDIO}
.endif
.include "options.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../multimedia/ffmpeg/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
.include "../../multimedia/libmpeg2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
.if ${OPSYS} != "Darwin"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.endif
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

240
multimedia/transcode/PLIST Normal file
View File

@@ -0,0 +1,240 @@
@comment $NetBSD: PLIST,v 1.17 2012/07/07 15:50:19 adam Exp $
bin/avifix
bin/aviindex
bin/avimerge
bin/avisplit
bin/avisync
bin/tccat
bin/tcdecode
bin/tcdemux
bin/tcextract
bin/tcmodinfo
bin/tcmp3cut
bin/tcprobe
bin/tcscan
bin/tcxmlcheck
bin/tcxpm2rgb
bin/tcyait
bin/transcode
${PLIST.a52}lib/transcode/a52_decore.la
lib/transcode/export_ac3.la
lib/transcode/export_divx5.la
${PLIST.dv}lib/transcode/export_dv.la
${PLIST.dv}lib/transcode/export_dvraw.la
lib/transcode/export_ffmpeg.la
${PLIST.imagemagick}lib/transcode/export_im.la
lib/transcode/export_jpg.la
lib/transcode/export_lame.la
lib/transcode/export_mp2.la
${PLIST.mjpegtools}lib/transcode/export_mp2enc.la
${PLIST.mjpegtools}lib/transcode/export_mpeg2enc.la
lib/transcode/export_null.la
lib/transcode/export_ogg.la
lib/transcode/export_pcm.la
lib/transcode/export_ppm.la
lib/transcode/export_pvn.la
lib/transcode/export_raw.la
lib/transcode/export_tcaud.la
lib/transcode/export_toolame.la
lib/transcode/export_wav.la
lib/transcode/export_xvid.so
lib/transcode/export_xvid4.la
${PLIST.mjpegtools}lib/transcode/export_yuv4mpeg.la
${PLIST.lzo}lib/transcode/export_lzo.la
lib/transcode/filter_29to23.la
lib/transcode/filter_32detect.la
lib/transcode/filter_32drop.la
lib/transcode/filter_aclip.la
lib/transcode/filter_ascii.la
lib/transcode/filter_astat.la
${PLIST.imagemagick}lib/transcode/filter_compare.la
lib/transcode/filter_control.la
lib/transcode/filter_cpaudio.la
lib/transcode/filter_decimate.la
lib/transcode/filter_denoise3d.la
lib/transcode/filter_detectclipping.la
lib/transcode/filter_detectsilence.la
lib/transcode/filter_divxkey.la
lib/transcode/filter_dnr.la
lib/transcode/filter_doublefps.la
lib/transcode/filter_extsub.la
lib/transcode/filter_extsub2.la
lib/transcode/filter_facemask.la
lib/transcode/filter_fieldanalysis.la
lib/transcode/filter_fields.la
lib/transcode/filter_fps.la
lib/transcode/filter_hqdn3d.la
lib/transcode/filter_invert.la
lib/transcode/filter_ivtc.la
lib/transcode/filter_levels.la
lib/transcode/filter_list.awk
${PLIST.imagemagick}lib/transcode/filter_logo.la
${PLIST.imagemagick}lib/transcode/filter_logoaway.la
lib/transcode/filter_lowpass.la
lib/transcode/filter_mask.la
lib/transcode/filter_modfps.la
lib/transcode/filter_msharpen.la
lib/transcode/filter_normalize.la
lib/transcode/filter_null.la
lib/transcode/filter_pp.la
${PLIST.dv}lib/transcode/filter_preview.la
${PLIST.x11}lib/transcode/filter_pv.la
lib/transcode/filter_resample.la
lib/transcode/filter_skip.la
lib/transcode/filter_slowmo.la
lib/transcode/filter_smartbob.la
lib/transcode/filter_smartdeinter.la
lib/transcode/filter_smartyuv.la
lib/transcode/filter_smooth.la
lib/transcode/filter_stabilize.la
${PLIST.x11}lib/transcode/filter_subtitler.la
lib/transcode/filter_testframe.la
${PLIST.freetype2}lib/transcode/filter_text.la
${PLIST.i386}lib/transcode/filter_tomsmocomp.la
lib/transcode/filter_transform.la
lib/transcode/filter_unsharp.la
lib/transcode/filter_whitebalance.la
lib/transcode/filter_xsharpen.la
lib/transcode/filter_yait.la
lib/transcode/filter_yuvdenoise.la
lib/transcode/filter_yuvmedian.la
lib/transcode/import_ac3.la
lib/transcode/import_avi.la
lib/transcode/import_bsdav.la
lib/transcode/import_dv.la
lib/transcode/import_dvd.la
lib/transcode/import_ffmpeg.la
lib/transcode/import_framegen.la
${PLIST.imagemagick}lib/transcode/import_im.la
${PLIST.imagemagick}lib/transcode/import_imlist.la
${PLIST.lzo}lib/transcode/import_lzo.la
lib/transcode/import_mp3.la
lib/transcode/import_mpeg2.la
lib/transcode/import_mplayer.la
lib/transcode/import_null.la
lib/transcode/import_ogg.la
${PLIST.oss}lib/transcode/import_oss.la
lib/transcode/import_pvn.la
lib/transcode/import_raw.la
lib/transcode/import_vag.la
lib/transcode/import_vnc.la
lib/transcode/import_vob.la
lib/transcode/import_x11.la
lib/transcode/import_xml.la
lib/transcode/import_xvid.la
${PLIST.mjpegtools}lib/transcode/import_yuv4mpeg.la
lib/transcode/parse_csv.awk
lib/transcode/xvid4.cfg
man/man1/avifix.1
man/man1/aviindex.1
man/man1/avimerge.1
man/man1/avisplit.1
man/man1/avisync.1
man/man1/tccat.1
man/man1/tcdecode.1
man/man1/tcdemux.1
man/man1/tcexport.1
man/man1/tcextract.1
man/man1/tcmodchain.1
man/man1/tcmodinfo.1
man/man1/tcprobe.1
man/man1/tcpvmexportd.1
man/man1/tcscan.1
man/man1/tcxmlcheck.1
man/man1/transcode.1
man/man1/transcode_export.1
man/man1/transcode_filter.1
man/man1/transcode_import.1
share/doc/transcode/ChangeLog
share/doc/transcode/DV-to-DVD-HOWTO.txt
share/doc/transcode/README.Inverse.Telecine.txt
share/doc/transcode/README.cluster
share/doc/transcode/README.dv
share/doc/transcode/README.filter.modfps
share/doc/transcode/README.rip
share/doc/transcode/README.sync
share/doc/transcode/README.vcd
share/doc/transcode/README.xvid-credits
share/doc/transcode/RELNOTES-0.6.13
share/doc/transcode/RELNOTES-1.1.0
share/doc/transcode/export_ffmpeg.txt
share/doc/transcode/export_mp2.txt
share/doc/transcode/faq
share/doc/transcode/filter-socket.txt
share/doc/transcode/filter_dnr.txt
share/doc/transcode/filter_logo.txt
share/doc/transcode/filter_logoaway.txt
share/doc/transcode/filter_text.txt
share/doc/transcode/filter_yuvdenoise.txt
share/doc/transcode/framerate.txt
share/doc/transcode/html/dv.html
share/doc/transcode/html/dvd.html
share/doc/transcode/html/export_divx.html
share/doc/transcode/html/export_divx4.php
share/doc/transcode/html/export_divx5.php
share/doc/transcode/html/export_fame.php
share/doc/transcode/html/export_ogg.php
share/doc/transcode/html/export_opendivx.php
share/doc/transcode/html/export_xvid.php
share/doc/transcode/html/import_avi.html
share/doc/transcode/html/import_dv.html
share/doc/transcode/html/import_dvd.html
share/doc/transcode/html/import_mp3.html
share/doc/transcode/html/import_mpeg2.html
share/doc/transcode/html/import_mpeg3.html
share/doc/transcode/html/import_null.html
share/doc/transcode/html/import_nuv.html
share/doc/transcode/html/import_ogg.php
share/doc/transcode/html/import_raw.html
share/doc/transcode/html/import_vob.html
share/doc/transcode/html/import_yuv4mpeg.html
share/doc/transcode/html/index.html
share/doc/transcode/html/intro.html
share/doc/transcode/html/mes0-00000.png
share/doc/transcode/html/mes4-00000.png
share/doc/transcode/html/mes5-00000.png
share/doc/transcode/html/mes6-00000.png
share/doc/transcode/html/mes7-00000.png
share/doc/transcode/html/misc.html
share/doc/transcode/html/modules.html
share/doc/transcode/html/mpeg.html
share/doc/transcode/html/new.png
share/doc/transcode/html/other.html
share/doc/transcode/html/post.html
share/doc/transcode/html/pre.html
share/doc/transcode/html/smart.html
share/doc/transcode/html/sorry.html
share/doc/transcode/html/sub0-00000.png
share/doc/transcode/html/sub1-00000.png
share/doc/transcode/html/sub2-00000.png
share/doc/transcode/html/sub3-00000.png
share/doc/transcode/html/subtitles.html
share/doc/transcode/html/table.php
share/doc/transcode/html/tc.png
share/doc/transcode/import-xml.txt
share/doc/transcode/import_nvrec.txt
share/doc/transcode/import_v4l2.txt
share/doc/transcode/import_x11.txt
share/doc/transcode/import_yuv.txt
share/doc/transcode/pvm3/export_pvm.txt
share/doc/transcode/pvm3/pvm_10x.cfg
share/doc/transcode/pvm3/pvm_11x.cfg
share/doc/transcode/pvm3/pvm_config.txt
share/doc/transcode/tech/OPTIMIZERS
share/doc/transcode/tech/architecture.txt
share/doc/transcode/tech/avi_comments.txt
share/doc/transcode/tech/clone.txt
share/doc/transcode/tech/export-API.txt
share/doc/transcode/tech/filter-API.txt
share/doc/transcode/tech/filter_template.c
share/doc/transcode/tech/html/index.html
share/doc/transcode/tech/html/tc_basic.css
share/doc/transcode/tech/html/tc_frame_buffer.html
share/doc/transcode/tech/html/tc_input_rotation.html
share/doc/transcode/tech/html/tc_libraries.html
share/doc/transcode/tech/html/tc_logo.png
share/doc/transcode/tech/ibp_support.txt
share/doc/transcode/tech/import-API.txt
share/doc/transcode/tech/libraries.txt
share/doc/transcode/tech/module-system-API.txt
share/doc/transcode/template.cfg.txt

16
multimedia/transcode/distinfo Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: distinfo,v 1.22 2012/11/17 21:46:44 markd Exp $
SHA1 (transcode-1.1.7.tar.bz2) = e35df68b960eb56ef0a59a4cdbed1491be56aee6
RMD160 (transcode-1.1.7.tar.bz2) = faa854acbbfd52faaa216505176f94d756d77841
Size (transcode-1.1.7.tar.bz2) = 2183627 bytes
SHA1 (patch-ac) = 3a738bc76d427d28a1c03edfcef7dc227537bc3b
SHA1 (patch-aw) = a2a118bad9e3783f98e8cbfa62cff8771118ac17
SHA1 (patch-ax) = 4e767e6ab77e49bb375de55457e3956e1531c7bb
SHA1 (patch-ba) = 92f31ca0d49cee2883d278b443b1d616381fee2d
SHA1 (patch-encode_encode_lavc.c) = b93926d54f149fabfc35051c7bfb800efd3892cf
SHA1 (patch-export_export_ffmpeg.c) = 1559892fb1c13c3bd6be32ae9b5a1d04348139e9
SHA1 (patch-export_ffmpeg_cfg.c) = c48acb7c9163f45fc1aa02216e083594fee67331
SHA1 (patch-import_decode_lavc.c) = 2a3b9b9f0909794a9fba0f13901121dd48fc9f5f
SHA1 (patch-import_import_ffmpeg.c) = 2b1782d0d87de873f2d5e8397a8f3a1b618e21d4
SHA1 (patch-import_probe_ffmpeg.c) = c755ed421f7cae0d89555c9faffcdce8610178ea
SHA1 (patch-libtc_tcavcodec.h) = 9c8ea3ac1b8bc048becb92ae1e854911cfd6c3eb

87
multimedia/transcode/options.mk Normal file
View File

@@ -0,0 +1,87 @@
# $NetBSD: options.mk,v 1.8 2010/05/08 16:04:05 drochner Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.transcode
PKG_SUPPORTED_OPTIONS= a52 freetype2 mjpegtools lzo libxml2
PKG_SUPPORTED_OPTIONS+= dv imagemagick x264 faac
PKG_SUGGESTED_OPTIONS= a52 freetype2 mjpegtools libxml2
PKG_SUGGESTED_OPTIONS+= imagemagick x264
.include "../../mk/bsd.options.mk"
PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
.if !empty(PKG_OPTIONS:Ma52)
. include "../../audio/liba52/buildlink3.mk"
CONFIGURE_ARGS+= --enable-a52
CONFIGURE_ARGS+= --enable-a52-default-decoder
PLIST.a52= yes
.else
CONFIGURE_ARGS+= --disable-a52
.endif
.if !empty(PKG_OPTIONS:Mfreetype2)
. include "../../graphics/freetype2/buildlink3.mk"
CONFIGURE_ARGS+= --enable-freetype2
PLIST.freetype2= yes
.else
CONFIGURE_ARGS+= --disable-freetype2
.endif
.if !empty(PKG_OPTIONS:Mmjpegtools)
. include "../../multimedia/mjpegtools/buildlink3.mk"
PLIST.mjpegtools= yes
CONFIGURE_ARGS+= --enable-mjpegtools
.else
CONFIGURE_ARGS+= --disable-mjpegtools
.endif
.if !empty(PKG_OPTIONS:Mlzo)
. include "../../archivers/lzo/buildlink3.mk"
PLIST.lzo= yes
CONFIGURE_ARGS+= --enable-lzo
CONFIGURE_ARGS+= --with-lzo-prefix=${BUILDLINK_PREFIX.lzo}
.else
CONFIGURE_ARGS+= --disable-lzo
.endif
.if !empty(PKG_OPTIONS:Mlibxml2)
. include "../../textproc/libxml2/buildlink3.mk"
PLIST.libxml2= yes
CONFIGURE_ARGS+= --enable-libxml2
.else
CONFIGURE_ARGS+= --disable-libxml2
.endif
.if !empty(PKG_OPTIONS:Mdv)
. include "../../multimedia/libdv/buildlink3.mk"
PLIST.dv= yes
CONFIGURE_ARGS+= --enable-libdv
.else
CONFIGURE_ARGS+= --disable-libdv
.endif
.if !empty(PKG_OPTIONS:Mimagemagick)
. include "../../graphics/ImageMagick/buildlink3.mk"
PLIST.imagemagick= yes
CONFIGURE_ARGS+= --enable-imagemagick
.else
CONFIGURE_ARGS+= --disable-imagemagick
.endif
.if !empty(PKG_OPTIONS:Mx264)
. include "../../multimedia/x264-devel/buildlink3.mk"
PLIST.x264= yes
CONFIGURE_ARGS+= --enable-x264
.else
CONFIGURE_ARGS+=
CONFIGURE_ARGS+= --disable-x264
.endif
.if !empty(PKG_OPTIONS:Mfaac)
. include "../../audio/faac/buildlink3.mk"
CONFIGURE_ARGS+= --enable-faac
.else
CONFIGURE_ARGS+= --disable-faac
.endif

31
multimedia/transcode/patches/patch-ac Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-ac,v 1.6 2012/10/10 13:37:25 drochner Exp $
--- configure.orig 2011-11-19 16:50:37.000000000 +0000
+++ configure
@@ -5096,7 +5096,7 @@ case "${target_os}" in
$as_echo "#define OS_LINUX 1" >>confdefs.h
;;
- freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*)
+ freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*)
is_bsd=yes
$as_echo "#define OS_BSD 1" >>confdefs.h
@@ -19431,7 +19431,7 @@ case "$host" in
esac
# let user override
if test -n "$PTHREAD_LIBS" ; then
- pthread_libs="$PTHREAD_LIBS"
+ pthread_libs="$PTHREAD_LIBS $PTHREAD_LDFLAGS"
fi
if test -n "$PTHREAD_CFLAGS" ; then
pthread_cflags="$PTHREAD_CFLAGS"
@@ -29507,7 +29507,7 @@ if test "${enable_nuv+set}" = set; then
yes) if test yes != "$have_lzo"; then
as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5
fi
- if test true == "$have_x86_64cpu"; then
+ if test true = "$have_x86_64cpu"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5
$as_echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;}
elif test true != "$have_x86cpu"; then

30
multimedia/transcode/patches/patch-aw Normal file
View File

@@ -0,0 +1,30 @@
$NetBSD: patch-aw,v 1.5 2009/07/07 16:38:29 drochner Exp $
--- ./import/nuv/import_nuv.c.orig 2009-02-21 22:01:57.000000000 +0100
+++ ./import/nuv/import_nuv.c
@@ -15,7 +15,9 @@
#include "aclib/ac.h"
#include "nuppelvideo.h"
#include "RTjpegN.h"
+#ifdef HAVE_LZO
#include "libtc/tc_lzo.h"
+#endif
#define MOD_NAME "import_nuv.so"
#define MOD_VERSION "v0.9 (2006-06-03)"
@@ -467,6 +469,7 @@ static int nuv_decode_video(TCModuleInst
in_framesize = inframe->video_size-5-sizeof(pd->cdata);
out_framesize = pd->width*pd->height + (pd->width/2)*(pd->height/2)*2;
+#ifdef HAVE_LZO
if (comptype == '2' || comptype == '3') {
/* Undo LZO compression */
uint8_t *decompressed_frame;
@@ -489,6 +492,7 @@ static int nuv_decode_video(TCModuleInst
/* Convert 2 -> 1, 3 -> 0 */
comptype ^= 3;
}
+#endif
switch (comptype) {

22
multimedia/transcode/patches/patch-ax Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-ax,v 1.4 2012/10/10 13:37:25 drochner Exp $
--- avilib/avidump.c.orig 2012-02-01 17:07:24.000000000 +0000
+++ avilib/avidump.c
@@ -320,7 +320,7 @@ static void dump_vals(int fd, int count,
{
uint32_t i,j,val32;
uint16_t val16;
- loff_t val64;
+ uint64_t val64;
char val8;
for (i = 0; names[i].type != EoLST; i++) {
@@ -605,7 +605,7 @@ static boolean ProcessChunk(int fd, off_
case indxtag: {
uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*);
- loff_t offset;
+ uint64_t offset;
uint32_t size, duration;
uint32_t u=0;
off_t indxend = datapos + chunks;

15
multimedia/transcode/patches/patch-ba Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ba,v 1.4 2012/10/10 13:37:25 drochner Exp $
--- filter/filter_pp.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ filter/filter_pp.c
@@ -38,8 +38,8 @@
/* FIXME: these use the filter ID as an index--the ID can grow
* arbitrarily large, so this needs to be fixed */
-static pp_mode_t *mode[100];
-static pp_context_t *context[100];
+static pp_mode *mode[100];
+static pp_context *context[100];
static int width[100], height[100];
static int pre[100];

94
multimedia/transcode/patches/patch-encode_encode_lavc.c Normal file
View File

@@ -0,0 +1,94 @@
$NetBSD: patch-encode_encode_lavc.c,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- encode/encode_lavc.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ encode/encode_lavc.c
@@ -114,6 +114,7 @@ struct tclavcprivatedata_ {
AVFrame ff_venc_frame;
AVCodecContext ff_vcontext;
+ AVDictionary ** ff_opts;
AVCodec *ff_vcodec;
@@ -1036,14 +1037,10 @@ static void tc_lavc_dispatch_settings(TC
SET_FLAG(pd, mv0);
SET_FLAG(pd, cbp);
SET_FLAG(pd, qpel);
- SET_FLAG(pd, alt);
- SET_FLAG(pd, vdpart);
SET_FLAG(pd, naq);
SET_FLAG(pd, ilme);
SET_FLAG(pd, ildct);
SET_FLAG(pd, aic);
- SET_FLAG(pd, aiv);
- SET_FLAG(pd, umv);
SET_FLAG(pd, psnr);
SET_FLAG(pd, trell);
SET_FLAG(pd, gray);
@@ -1064,6 +1061,18 @@ static void tc_lavc_dispatch_settings(TC
pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
}
+ if (pd->confdata.flags.alt) {
+ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
+ }
+ if (pd->confdata.flags.vdpart) {
+ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
+ }
+ if (pd->confdata.flags.umv) {
+ av_dict_set(pd->ff_opts, "umv", "1", 0);
+ }
+ if (pd->confdata.flags.aiv) {
+ av_dict_set(pd->ff_opts, "aiv", "1", 0);
+ }
}
#undef SET_FLAG
@@ -1184,18 +1193,18 @@ static int tc_lavc_read_config(TCLavcPri
{ "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
{ "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
{ "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
{ "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
{ "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
{ "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
{ "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
#else
{ "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
#endif
- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
{ "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
{ "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
@@ -1387,7 +1396,7 @@ static int tc_lavc_configure(TCModuleIns
pd->confdata.thread_count,
(pd->confdata.thread_count > 1) ?"s" :"");
}
- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
+ pd->ff_vcontext.thread_count = pd->confdata.thread_count;
pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
if (pd->ff_vcodec == NULL) {
@@ -1397,11 +1406,11 @@ static int tc_lavc_configure(TCModuleIns
}
TC_LOCK_LIBAVCODEC;
- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
TC_UNLOCK_LIBAVCODEC;
if (ret < 0) {
- tc_log_error(MOD_NAME, "avcodec_open() failed");
+ tc_log_error(MOD_NAME, "avcodec_open2() failed");
goto failed;
}
/* finally, pass up the extradata, if any */

125
multimedia/transcode/patches/patch-export_export_ffmpeg.c Normal file
View File

@@ -0,0 +1,125 @@
$NetBSD: patch-export_export_ffmpeg.c,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- export/export_ffmpeg.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ export/export_ffmpeg.c
@@ -122,6 +122,7 @@ static uint8_t *img_buffer =
static AVFrame *lavc_convert_frame = NULL;
static AVCodec *lavc_venc_codec = NULL;
+static AVDictionary **lavc_venc_opts = NULL;
static AVFrame *lavc_venc_frame = NULL;
static AVCodecContext *lavc_venc_context;
static avi_t *avifile = NULL;
@@ -180,7 +181,7 @@ static char *tc_strchrnul(const char *s,
/* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
-#include <libavcodec/opt.h>
+#include <libavutil/opt.h>
#include <libavutil/avstring.h>
#include <libswscale/swscale.h>
@@ -470,7 +471,6 @@ MOD_init
}
TC_LOCK_LIBAVCODEC;
- avcodec_init();
avcodec_register_all();
TC_UNLOCK_LIBAVCODEC;
@@ -634,7 +634,7 @@ MOD_init
lavc_param_rc_max_rate = 2516;
lavc_param_rc_buffer_size = 224 * 8;
lavc_param_rc_buffer_aggressivity = 99;
- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
+ lavc_param_scan_offset = 1;
break;
@@ -674,7 +674,7 @@ MOD_init
lavc_param_rc_buffer_size = 224 * 8;
lavc_param_rc_buffer_aggressivity = 99;
- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
+ lavc_param_scan_offset = 1;
break;
@@ -887,7 +887,7 @@ MOD_init
lavc_venc_context->thread_count);
}
- avcodec_thread_init(lavc_venc_context, lavc_param_threads);
+ lavc_venc_context->thread_count = lavc_param_threads;
if (lavc_param_intra_matrix) {
char *tmp;
@@ -1065,15 +1065,10 @@ MOD_init
lavc_venc_context->flags |= lavc_param_closedgop;
lavc_venc_context->flags |= lavc_param_trunc;
lavc_venc_context->flags |= lavc_param_aic;
- lavc_venc_context->flags |= lavc_param_umv;
lavc_venc_context->flags |= lavc_param_v4mv;
- lavc_venc_context->flags |= lavc_param_data_partitioning;
lavc_venc_context->flags |= lavc_param_cbp;
lavc_venc_context->flags |= lavc_param_mv0;
lavc_venc_context->flags |= lavc_param_qp_rd;
- lavc_venc_context->flags |= lavc_param_scan_offset;
- lavc_venc_context->flags |= lavc_param_ss;
- lavc_venc_context->flags |= lavc_param_alt;
lavc_venc_context->flags |= lavc_param_ilme;
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_venc_context->flags |= lavc_param_trell;
@@ -1203,7 +1198,6 @@ MOD_init
lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
-
/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
if (lavc_param_video_preset) {
avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
@@ -1241,20 +1235,39 @@ MOD_init
}
}
+ if (lavc_param_scan_offset) {
+ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
+ }
+
+ if (lavc_param_ss) {
+ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
+ }
+
+ if (lavc_param_alt) {
+ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
+ }
+
+ if (lavc_param_umv) {
+ av_dict_set(lavc_venc_opts, "umv", "1", 0);
+ }
+
+ if (lavc_param_data_partitioning) {
+ av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
+ }
//-- open codec --
//----------------
TC_LOCK_LIBAVCODEC;
- ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
TC_UNLOCK_LIBAVCODEC;
if (ret < 0) {
tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
return TC_EXPORT_ERROR;
}
- if (lavc_venc_context->codec->encode == NULL) {
+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
- "(lavc_venc_context->codec->encode == NULL)");
+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
return TC_EXPORT_ERROR;
}

40
multimedia/transcode/patches/patch-export_ffmpeg_cfg.c Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-export_ffmpeg_cfg.c,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- export/ffmpeg_cfg.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ export/ffmpeg_cfg.c
@@ -160,9 +160,9 @@ TCConfigEntry lavcopts_conf[]={
{"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
{"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
{"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
// {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
{"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
{"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
{"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
@@ -211,7 +211,7 @@ TCConfigEntry lavcopts_conf[]={
#else
{"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
#endif
- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
{"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
{"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
{"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
@@ -223,9 +223,9 @@ TCConfigEntry lavcopts_conf[]={
{"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
{"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
{"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
{"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
{"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
{"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},

15
multimedia/transcode/patches/patch-import_decode_lavc.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-import_decode_lavc.c,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- import/decode_lavc.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ import/decode_lavc.c
@@ -181,7 +181,7 @@ void decode_lavc(decode_t *decode)
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_dec_context->error_resilience = 2;
#else
- lavc_dec_context->error_recognition = 2;
+ lavc_dec_context->err_recognition = 2;
#endif
lavc_dec_context->error_concealment = 3;
lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;

15
multimedia/transcode/patches/patch-import_import_ffmpeg.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-import_import_ffmpeg.c,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- import/import_ffmpeg.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ import/import_ffmpeg.c
@@ -314,7 +314,7 @@ do_avi:
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_dec_context->error_resilience = 2;
#else
- lavc_dec_context->error_recognition = 2;
+ lavc_dec_context->err_recognition = 2;
#endif
lavc_dec_context->error_concealment = 3;
lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;

17
multimedia/transcode/patches/patch-import_probe_ffmpeg.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-import_probe_ffmpeg.c,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- import/probe_ffmpeg.c.orig 2011-11-19 16:50:27.000000000 +0000
+++ import/probe_ffmpeg.c
@@ -99,8 +99,8 @@ void probe_ffmpeg(info_t *ipipe)
TC_INIT_LIBAVCODEC;
- ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
- NULL, 0, NULL);
+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
+ NULL, NULL);
if (ret != 0) {
tc_log_error(__FILE__, "unable to open '%s'"
" (libavformat failure)",

14
multimedia/transcode/patches/patch-libtc_tcavcodec.h Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-libtc_tcavcodec.h,v 1.1 2012/11/17 21:46:44 markd Exp $
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
--- libtc/tcavcodec.h.orig 2011-11-19 16:50:27.000000000 +0000
+++ libtc/tcavcodec.h
@@ -53,7 +53,6 @@ extern pthread_mutex_t tc_libavcodec_mut
#define TC_INIT_LIBAVCODEC do { \
TC_LOCK_LIBAVCODEC; \
- avcodec_init(); \
avcodec_register_all(); \
TC_UNLOCK_LIBAVCODEC; \
} while (0)