ayae/extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial import

Browse Source
This commit is contained in:
Astound
2025-06-22 20:39:04 -05:00
commit f8a70886f0
3428 changed files with 302546 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
transcode/PKGBUILD Normal file
View File

@@ -0,0 +1,105 @@
# Maintainer: Jesus E. <heckyel@riseup.net>
pkgname=transcode
pkgver=1.1.7
_debver=$pkgver
_debrel=9
pkgrel=2
pkgdesc="A video/DVD ripper and encoder for the terminal/console"
arch=('i686' 'x86_64')
license=('GPL-2')
depends=('gawk' 'lzo' 'libdvdread' 'ffmpeg' 'mjpegtools' 'sdl' 'libmpeg2' 'libxaw' 'a52dec' 'libsndio' 'libquicktime')
makedepends=('nasm' 'x264' 'quilt')
source=("https://repo.hyperbola.info:50000/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
"https://repo.hyperbola.info:50000/sources/${pkgname}/${pkgname}_${_debver}-${_debrel}.debian.tar.xz"{,.sig}
"transcode-ffmpeg3.patch"
"transcode-ffmpeg4.patch"
"transcode-swresample.patch"
"transcode-sndio.patch")
sha512sums=('d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f'
'SKIP'
'4f52627e01e4ae172006fa55f8f2aab6b1ae457d0b12ad966fe942ee220bfebb32864bc32d727db6e490a8fdf0e6e2dcad7016cfb9eedc3c5b3391fb18ab67b6'
'SKIP'
'0491de7cb189f4e634ad6fbb45051fd883bbf5787a89dbe93c633b2b48e96c031da0686a6fd9f61d621133a0a93410d8d73a96ad18f519ad7788aceb8a35fb2d'
'b13a60193444d28ae8103eee677c0b8a1f52d0517e73de166319f221ab50f05eb045427aa6e963a759722476e8f8304f714c8666d3ffbf37825bcaf1348f803f'
'af04f4c52508144dcbad3ea5fb8d9f00a94248bce6a0b76fb20bb9f9999dcfb7f3ad696a3fe4d2d17cbe014fbfa86d7ddd3feedefcf912bd4e952b5848f32581'
'f5d55516b6ca2d2c0cffd2c87c2df377b5dae94385894f5b103894821d618ee9cd6374cb2be779014675b956a672c24908cb1278db7b854d1581014fe0942f74')
validpgpkeys=('C92BAA713B8D53D3CAE63FC9E6974752F9704456') # André Silva
prepare() {
cd $pkgname-$pkgver
if [[ ${pkgver%.*} = ${_debver%.*} ]]; then
# Debian patches
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
mv "$srcdir"/debian .
# Doesn't apply
rm -v debian/patches/01_filter_pv.c.diff || true
rm -v debian/patches/03_libav-api-fixes.diff || true
rm -v debian/patches/04_ffmpeg_options.patch || true
rm -v debian/patches/05-libav9-gentoo.patch || true
rm -v debian/patches/06_libav9-jmm.patch || true
rm -v debian/patches/07_libav9-preset.patch || true
rm -v debian/patches/08_libav9-opt.patch || true
rm -v debian/patches/09_libav9-arch.patch || true
rm -v debian/patches/11_libav10.patch || true
rm -v debian/patches/12_underlinkage.patch || true
quilt push -av
fi
patch -p1 -i ${srcdir}/transcode-ffmpeg3.patch
patch -p1 -i ${srcdir}/transcode-ffmpeg4.patch
patch -p1 -i ${srcdir}/transcode-sndio.patch
sed -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' -i filter/subtitler/load_font.c
patch -p1 -i ${srcdir}/transcode-swresample.patch
autoreconf -vi
}
build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
--disable-sse \
--disable-sse2 \
--disable-altivec \
--disable-imagemagick \
--enable-mmx \
--enable-lame \
--enable-ogg \
--enable-vorbis \
--enable-theora \
--enable-libdv \
--enable-libxml2 \
--enable-v4l \
--enable-libjpeg \
--enable-lzo \
--enable-mjpegtools \
--enable-sdl \
--enable-freetype2 \
--enable-a52 \
--enable-libpostproc \
--enable-xvid \
--enable-x264 \
--enable-alsa \
--enable-sndio \
--enable-libmpeg2 \
--enable-libmpeg2convert \
--enable-libquicktime
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
}

1241
transcode/transcode-ffmpeg3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

494
transcode/transcode-ffmpeg4.patch Normal file
View File

@@ -0,0 +1,494 @@
--- a/encode/encode_lavc.c
+++ b/encode/encode_lavc.c
@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
int luma_elim_threshold;
int chroma_elim_threshold;
int quantizer_noise_shaping;
+ int inter_quant_bias;
+ int intra_quant_bias;
+ int scenechange_factor;
+ int rc_strategy;
+ float rc_initial_cplx;
+ float rc_qsquish;
+ float border_masking;
/* same as above for flags */
struct {
@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
switch (vob->divxmultipass) {
case 1:
CAN_DO_MULTIPASS(multipass_flag);
- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
pd->stats_file = fopen(vob->divxlogfile, "w");
if (pd->stats_file == NULL) {
tc_log_error(MOD_NAME, "could not create 2pass log file"
@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
break;
case 2:
CAN_DO_MULTIPASS(multipass_flag);
- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
pd->stats_file = fopen(vob->divxlogfile, "r");
if (pd->stats_file == NULL){
tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
break;
case 3:
/* fixed qscale :p */
- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
pd->ff_venc_frame.quality = vob->divxbitrate;
break;
}
@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
pd->confdata.rc_buffer_size = 0;
pd->confdata.lmin = 2;
pd->confdata.lmax = 31;
- pd->confdata.me_method = ME_EPZS;
+ pd->confdata.me_method = 0;
memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
pd->confdata.turbo_setup = 0;
@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
pd->ff_vcontext.me_range = 0;
pd->ff_vcontext.mb_decision = 0;
pd->ff_vcontext.scenechange_threshold = 0;
- pd->ff_vcontext.scenechange_factor = 1;
+ pd->confdata.scenechange_factor = 1;
pd->ff_vcontext.b_frame_strategy = 0;
pd->ff_vcontext.b_sensitivity = 40;
pd->ff_vcontext.brd_scale = 0;
pd->ff_vcontext.bidir_refine = 0;
- pd->ff_vcontext.rc_strategy = 2;
+ pd->confdata.rc_strategy = 2;
pd->ff_vcontext.b_quant_factor = 1.25;
pd->ff_vcontext.i_quant_factor = 0.8;
pd->ff_vcontext.b_quant_offset = 1.25;
@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
pd->ff_vcontext.qblur = 0.5;
pd->ff_vcontext.qcompress = 0.5;
pd->ff_vcontext.mpeg_quant = 0;
- pd->ff_vcontext.rc_initial_cplx = 0.0;
- pd->ff_vcontext.rc_qsquish = 1.0;
+ pd->confdata.rc_initial_cplx = 0.0;
+ pd->confdata.rc_qsquish = 1.0;
pd->confdata.luma_elim_threshold = 0;
pd->confdata.chroma_elim_threshold = 0;
pd->ff_vcontext.strict_std_compliance = 0;
@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
pd->ff_vcontext.temporal_cplx_masking = 0.0;
pd->ff_vcontext.spatial_cplx_masking = 0.0;
pd->ff_vcontext.p_masking = 0.0;
- pd->ff_vcontext.border_masking = 0.0;
+ pd->confdata.border_masking = 0.0;
pd->ff_vcontext.me_pre_cmp = 0;
pd->ff_vcontext.me_cmp = 0;
pd->ff_vcontext.me_sub_cmp = 0;
@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
pd->ff_vcontext.pre_me = 1;
pd->ff_vcontext.me_subpel_quality = 8;
pd->ff_vcontext.refs = 1;
- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
pd->ff_vcontext.noise_reduction = 0;
pd->confdata.quantizer_noise_shaping = 0;
pd->ff_vcontext.flags = 0;
@@ -1044,14 +1049,16 @@ static void tc_lavc_config_defaults(TCLa
*/
static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
{
+ char buf[1024];
/* some translation... */
pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
+ av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
+ av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
pd->ff_vcontext.flags = 0;
SET_FLAG(pd, qpel);
@@ -1075,8 +1080,8 @@ static void tc_lavc_dispatch_settings(TC
}
if (pd->interlacing.active) {
/* enforce interlacing */
- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
}
if (pd->confdata.flags.alt) {
av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
@@ -1100,14 +1105,24 @@ static void tc_lavc_dispatch_settings(TC
av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
}
- char buf[1024];
#define set_dict_opt(val, opt) \
snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
av_dict_set(&(pd->ff_opts), opt, buf, 0)
+#define set_dict_float_opt(val, opt) \
+ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
+ av_dict_set(&(pd->ff_opts), opt, buf, 0)
set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
+ set_dict_opt(inter_quant_bias, "pbias");
+ set_dict_opt(intra_quant_bias, "ibias");
+ set_dict_opt(me_method, "me_method");
+ set_dict_opt(scenechange_factor, "sc_factor");
+ set_dict_opt(rc_strategy, "rc_strategy");
+ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
+ set_dict_float_opt(rc_qsquish, "qsquish");
+ set_dict_float_opt(border_masking, "border_mask");
}
#undef SET_FLAG
@@ -1168,7 +1189,7 @@ static int tc_lavc_read_config(TCLavcPri
{ "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
{ "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
{ "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
+ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
{ "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
{ "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
{ "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
@@ -1179,7 +1200,7 @@ static int tc_lavc_read_config(TCLavcPri
{ "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
{ "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
{ "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
+ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
{ "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
{ "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
{ "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
@@ -1189,9 +1210,9 @@ static int tc_lavc_read_config(TCLavcPri
{ "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
// { "vrc_eq", }, // not yet supported
{ "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
// { "vrc_init_occupancy", }, // not yet supported
- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
{ "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
{ "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
{ "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
@@ -1203,7 +1224,7 @@ static int tc_lavc_read_config(TCLavcPri
{ "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
{ "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
{ "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
{ "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
{ "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
{ "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
@@ -1216,37 +1237,37 @@ static int tc_lavc_read_config(TCLavcPri
{ "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
{ "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
{ "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
{ "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
{ "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
{ "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
{ "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
{ "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
{ "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
{ "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 },
+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
{ "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
{ "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 },
+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
#endif
{ "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 },
+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_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 },
#else
{ "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
#endif
- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
+ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
+ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
+ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
// { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported
/* End of the config file */
--- a/export/export_ffmpeg.c
+++ b/export/export_ffmpeg.c
@@ -831,14 +831,11 @@ MOD_init
lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
lavc_venc_context->max_qdiff = lavc_param_vqdiff;
lavc_venc_context->qcompress = lavc_param_vqcompress;
lavc_venc_context->qblur = lavc_param_vqblur;
lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames;
lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor;
- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
@@ -846,8 +843,23 @@ MOD_init
#define set_dict_opt(val, opt) \
snprintf(buf, sizeof(buf), "%i", val); \
av_dict_set(&lavc_venc_opts, opt, buf, 0)
+#define set_dict_float_opt(val, opt) \
+ snprintf(buf, sizeof(buf), "%f", val); \
+ av_dict_set(&lavc_venc_opts, opt, buf, 0)
set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
+ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
+ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
+ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
+ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
+ set_dict_opt(lavc_param_rc_eq, "rc_eq");
+ set_dict_opt(lavc_param_vme, "me_method");
+ set_dict_opt(lavc_param_ibias, "ibias");
+ set_dict_opt(lavc_param_pbias, "pbias");
+ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
+ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
if (lavc_param_packet_size)
@@ -856,15 +868,9 @@ MOD_init
lavc_venc_context->strict_std_compliance= lavc_param_strict;
lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor;
lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset;
- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish;
- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp;
- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq;
- lavc_venc_context->rc_eq = lavc_param_rc_eq;
lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000;
lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000;
lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024;
- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx;
lavc_venc_context->debug = lavc_param_debug;
lavc_venc_context->last_predictor_count= lavc_param_last_pred;
lavc_venc_context->pre_me = lavc_param_pre_me;
@@ -872,8 +878,6 @@ MOD_init
lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size;
lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality;
lavc_venc_context->me_range = lavc_param_me_range;
- lavc_venc_context->intra_quant_bias = lavc_param_ibias;
- lavc_venc_context->inter_quant_bias = lavc_param_pbias;
lavc_venc_context->coder_type = lavc_param_coder;
lavc_venc_context->context_model = lavc_param_context;
lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
@@ -1081,6 +1085,8 @@ MOD_init
av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0);
if(lavc_param_qp_rd)
av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
+ if (lavc_param_normalize_aqp)
+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
lavc_venc_context->flags |= lavc_param_ilme;
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_venc_context->flags |= lavc_param_trell;
@@ -1089,9 +1095,7 @@ MOD_init
#endif
if (lavc_param_gray)
- lavc_venc_context->flags |= CODEC_FLAG_GRAY;
- if (lavc_param_normalize_aqp)
- av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
+ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
switch(vob->encode_fields) {
case TC_ENCODE_FIELDS_TOP_FIRST:
@@ -1109,9 +1113,9 @@ MOD_init
}
lavc_venc_context->flags |= interlacing_active ?
- CODEC_FLAG_INTERLACED_DCT : 0;
+ AV_CODEC_FLAG_INTERLACED_DCT : 0;
lavc_venc_context->flags |= interlacing_active ?
- CODEC_FLAG_INTERLACED_ME : 0;
+ AV_CODEC_FLAG_INTERLACED_ME : 0;
lavc_venc_context->flags |= lavc_param_psnr;
do_psnr = lavc_param_psnr;
@@ -1158,7 +1162,7 @@ MOD_init
"encoding.");
return TC_EXPORT_ERROR;
}
- lavc_venc_context->flags |= CODEC_FLAG_PASS1;
+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
stats_file = fopen(vob->divxlogfile, "w");
if (stats_file == NULL){
tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
@@ -1172,7 +1176,7 @@ MOD_init
"encoding.");
return TC_EXPORT_ERROR;
}
- lavc_venc_context->flags |= CODEC_FLAG_PASS2;
+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
stats_file= fopen(vob->divxlogfile, "r");
if (stats_file==NULL){
tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
@@ -1203,12 +1207,11 @@ MOD_init
break;
case 3:
/* fixed qscale :p */
- lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
lavc_venc_frame->quality = vob->divxbitrate;
break;
}
- 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 && strcmp(lavc_param_video_preset, "none")) {
--- a/export/ffmpeg_cfg.c
+++ b/export/ffmpeg_cfg.c
@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
int lavc_param_pre_me= 1;
int lavc_param_me_subpel_quality= 8;
int lavc_param_me_range=0;
-int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
-int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
+int lavc_param_ibias=0;
+int lavc_param_pbias=0;
int lavc_param_coder=0;
int lavc_param_context=0;
char *lavc_param_intra_matrix = NULL;
@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
{"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
{"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
{"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
+ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
{"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
// {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
// {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
{"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
{"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_GRAY},
+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_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},
@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
{"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
{"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
{"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
+ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
{"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
{"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
{"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
{"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
{"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
{"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
+ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
#else
{"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
#endif
@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
{"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
{"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
#else
- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
#endif
{"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
{"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
@@ -222,13 +222,13 @@ TCConfigEntry lavcopts_conf[]={
{"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},
+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_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},
{"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
{"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
+ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
+ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
{"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
{"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
{"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
--- a/import/import_ffmpeg.c
+++ b/import/import_ffmpeg.c
@@ -310,7 +310,7 @@ do_avi:
lavc_dec_context->width = x_dim;
lavc_dec_context->height = y_dim;
- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
+ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_dec_context->error_resilience = 2;
#else
--- a/filter/filter_resample.c
+++ b/filter/filter_resample.c
@@ -37,6 +37,7 @@
#include "libtc/optstr.h"
#include "libtc/tcavcodec.h"
#include "libtc/tcmodule-plugin.h"
+#include <libavresample/avresample.h>
typedef struct {
@@ -45,7 +46,7 @@ typedef struct {
int bytes_per_sample;
- ReSampleContext *resample_ctx;
+ AVAudioResampleContext *resample_ctx;
} ResamplePrivateData;
static const char resample_help[] = ""
--- a/import/probe_ffmpeg.c
+++ b/import/probe_ffmpeg.c
@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
info->bitrate = st->codec->bit_rate / 1000;
info->width = st->codec->width;
info->height = st->codec->height;
- if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
- info->fps = av_q2d(st->r_frame_rate);
+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
+ info->fps = av_q2d(st->avg_frame_rate);
} else {
/* watch out here */
info->fps = 1.0/av_q2d(st->codec->time_base);

448
transcode/transcode-sndio.patch Normal file
View File

@@ -0,0 +1,448 @@
diff --git a/acinclude.m4 b/acinclude.m4
index d89f9f6..1759b50 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -284,6 +284,38 @@ fi
dnl -----------------------------------------------------------------------
+dnl TC_CHECK_SNDIO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for sndio headers
+dnl
+AC_DEFUN([TC_CHECK_SNDIO],
+[
+AC_MSG_CHECKING([whether sndio support is requested])
+AC_ARG_ENABLE(sndio,
+ AC_HELP_STRING([--enable-sndio],
+ [enable sndio support (no)]),
+ [case "${enableval}" in
+ yes) ;;
+ no) ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-sndio) ;;
+ esac],
+ [enable_sndio=no])
+AC_MSG_RESULT($enable_sndio)
+
+have_sndio="no"
+if test x"$enable_sndio" = x"yes" ; then
+ AC_CHECK_HEADERS([sndio.h], [have_sndio="yes"])
+
+ if test x"$have_sndio" = x"yes" ; then
+ have_sndio="yes"
+ ifelse([$1], , :, [$1])
+ else
+ AC_MSG_ERROR([sndio is requested, but cannot find headers])
+ fi
+fi
+])
+
+dnl -----------------------------------------------------------------------
+
dnl TC_CHECK_OSS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for OSS headers
dnl
diff --git a/configure.in b/configure.in
index 03178c3..65567ae 100644
--- a/configure.in
+++ b/configure.in
@@ -721,6 +721,12 @@ TC_CHECK_SUNAU(AC_DEFINE([HAVE_SUNAU], 1, [Have Sun style audio(4)]))
AM_CONDITIONAL(HAVE_SUNAU, test x"$have_sunau" = x"yes")
dnl
+dnl sndio
+dnl
+TC_CHECK_SNDIO(AC_DEFINE([HAVE_SNDIO], 1, [Have sndio(7) audio]))
+AM_CONDITIONAL(HAVE_SNDIO, test x"$have_sndio" = x"yes")
+
+dnl
dnl OSS
dnl
TC_CHECK_OSS(AC_DEFINE([HAVE_OSS], 1, [Have OSS audio]))
@@ -1406,6 +1412,7 @@ ALSA $have_alsa
OSS $have_oss
bktr $have_bktr
sunau $have_sunau
+sndio $have_sndio
optional module support
----------------------------------------
diff --git a/import/Makefile.am b/import/Makefile.am
index fa0218f..c1ac26c 100644
--- a/import/Makefile.am
+++ b/import/Makefile.am
@@ -59,6 +59,10 @@ if HAVE_SUNAU
IMPORT_SUNAU = import_sunau.la
endif
+if HAVE_SNDIO
+IMPORT_SNDIO = import_sndio.la
+endif
+
if HAVE_LIBXML2
IMPORT_XML = import_xml.la
endif
@@ -103,6 +107,7 @@ pkg_LTLIBRARIES = \
import_pvn.la \
import_raw.la \
$(IMPORT_SUNAU) \
+ $(IMPORT_SNDIO) \
import_vag.la \
import_vnc.la \
import_vob.la \
@@ -199,6 +204,10 @@ import_raw_la_LDFLAGS = -module -avoid-version
import_sunau_la_SOURCES = import_sunau.c
import_sunau_la_LDFLAGS = -module -avoid-version
+import_sndio_la_SOURCES = import_sndio.c
+import_sndio_la_LDFLAGS = -module -avoid-version
+import_sndio_la_LIBADD = -lsndio
+
import_vag_la_SOURCES = import_vag.c
import_vag_la_LDFLAGS = -module -avoid-version
diff --git b/import/import_sndio.c b/import/import_sndio.c
new file mode 100644
index 0000000..864455b
--- /dev/null
+++ b/import/import_sndio.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2009 Jacob Meuser <jakemsr@sdf.lonestar.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+
+#include "transcode.h"
+#include "libtc/optstr.h"
+
+#include "libtc/tcmodule-plugin.h"
+
+#define MOD_NAME "import_sndio.so"
+#define MOD_VERSION "v0.0.1 (2009-12-24)"
+#define MOD_CAP "capture audio using sndio"
+#define MOD_FEATURES \
+ TC_MODULE_FEATURE_AUDIO | TC_MODULE_FEATURE_DEMULTIPLEX
+#define MOD_FLAGS \
+ TC_MODULE_FLAG_RECONFIGURABLE
+
+#include <sndio.h>
+
+static int sndio_init(void *, const char *, int, int, int);
+static int sndio_grab(void *, size_t, char *, size_t *);
+static int sndio_stop(void *);
+
+struct tc_sndio_data {
+ struct sio_hdl *hdl;
+ struct sio_par par;
+};
+
+static const char tc_sndio_help[] =
+ "Overview:\n"
+ " Captures audio from sndio devices.\n"
+ "Options:\n"
+ " device=dev will use 'dev' as the sndio device\n"
+ " help prints this message\n";
+
+
+static int
+sndio_init(void *data, const char *dev, int rate, int bits, int chan)
+{
+ struct tc_sndio_data *d = data;
+
+ if (!strncmp(dev, "/dev/null", 9) ||
+ !strncmp(dev, "/dev/zero", 9) ||
+ !strncmp(dev, "default", 7) ||
+ !strncmp(dev, "", 1))
+ d->hdl = sio_open(NULL, SIO_REC, 0);
+ else
+ d->hdl = sio_open(dev, SIO_REC, 0);
+
+ if (!d->hdl) {
+ tc_log_error(MOD_NAME, "opening audio device failed");
+ return TC_ERROR;
+ }
+
+ sio_initpar(&d->par);
+ d->par.bits = bits;
+ d->par.sig = d->par.bits == 8 ? 0 : 1;
+ d->par.le = SIO_LE_NATIVE;
+ d->par.rchan = chan;
+ d->par.rate = rate;
+ d->par.xrun = SIO_SYNC;
+
+ if (!sio_setpar(d->hdl, &d->par) || !sio_getpar(d->hdl, &d->par)) {
+ tc_log_error(MOD_NAME, "setting audio parameters failed");
+ return TC_ERROR;
+ }
+
+ if (d->par.bits != bits || d->par.rchan != chan || d->par.rate != rate) {
+ tc_log_error(MOD_NAME, "could not set audio parameters as desired");
+ return TC_ERROR;
+ }
+
+ if (!sio_start(d->hdl)) {
+ tc_log_error(MOD_NAME, "could not start capture");
+ return TC_ERROR;
+ }
+
+ return TC_OK;
+}
+
+static int
+sndio_grab(void *data, size_t size, char *buffer, size_t *done)
+{
+ struct tc_sndio_data *d = data;
+ size_t bytes_read;
+ int ret;
+
+ if (!d->hdl) {
+ tc_log_error(MOD_NAME, "attempt to read NULL handle");
+ return TC_ERROR;
+ }
+
+ bytes_read = 0;
+ while (size > 0) {
+ ret = sio_read(d->hdl, buffer + bytes_read, size);
+ if (!ret) {
+ tc_log_error(MOD_NAME, "audio read failed");
+ return TC_ERROR;
+ }
+ bytes_read += ret;
+ size -= ret;
+ }
+ if (done != NULL)
+ *done = bytes_read;
+
+ return TC_OK;
+}
+
+static int
+sndio_stop(void *data)
+{
+ struct tc_sndio_data *d = data;
+
+ if (d->hdl)
+ sio_close(d->hdl);
+ d->hdl = NULL;
+
+ return TC_OK;
+}
+
+
+/* ------------------------------------------------------------
+ * NMS interface
+ * ------------------------------------------------------------*/
+
+static int
+tc_sndio_init(TCModuleInstance *self, uint32_t features)
+{
+ struct tc_sndio_data *d;
+
+ TC_MODULE_SELF_CHECK(self, "init");
+ TC_MODULE_INIT_CHECK(self, MOD_FEATURES, features);
+
+ d = tc_zalloc(sizeof(struct tc_sndio_data));
+ if (!d)
+ return TC_ERROR;
+ self->userdata = d;
+
+ return TC_OK;
+}
+
+static int
+tc_sndio_fini(TCModuleInstance *self)
+{
+ TC_MODULE_SELF_CHECK(self, "fini");
+
+ tc_free(self->userdata);
+ self->userdata = NULL;
+
+ return TC_OK;
+}
+
+static int
+tc_sndio_inspect(TCModuleInstance *self, const char *param, const char **value)
+{
+ TC_MODULE_SELF_CHECK(self, "inspect");
+
+ if (optstr_lookup(param, "help"))
+ *value = tc_sndio_help;
+
+ return TC_OK;
+}
+
+static int
+tc_sndio_configure(TCModuleInstance *self, const char *options, vob_t *vob)
+{
+ struct tc_sndio_data *d = NULL;
+ char device[1024];
+
+ TC_MODULE_SELF_CHECK(self, "configure");
+
+ d = self->userdata;
+
+ strlcpy(device, "default", 1024);
+ if (options)
+ optstr_get(options, "device", "%1023s", device);
+
+ return sndio_init(d, device, vob->a_rate, vob->a_bits, vob->a_chan);
+}
+
+static int
+tc_sndio_stop(TCModuleInstance *self)
+{
+ struct tc_sndio_data *d = NULL;
+
+ TC_MODULE_SELF_CHECK(self, "stop");
+
+ d = self->userdata;
+
+ return sndio_stop(d);
+}
+
+static int
+tc_sndio_demux(TCModuleInstance *self, vframe_list_t *vf, aframe_list_t *af)
+{
+ struct tc_sndio_data *d = NULL;
+ size_t done;
+
+ TC_MODULE_SELF_CHECK(self, "demultiplex");
+
+ d = self->userdata;
+
+ if (vf)
+ vf->video_len = 0;
+
+ if (af) {
+ if (sndio_grab(d, af->audio_size, af->audio_buf, &done) != TC_OK)
+ return TC_ERROR;
+ af->audio_len = done;
+ }
+
+ return TC_OK;
+}
+
+static const TCCodecID tc_sndio_codecs_in[] =
+ { TC_CODEC_ERROR };
+static const TCCodecID tc_sndio_codecs_out[] =
+ { TC_CODEC_PCM, TC_CODEC_ERROR };
+static const TCCodecID tc_sndio_formats_in[] =
+ { TC_FORMAT_RAW, TC_FORMAT_ERROR };
+static const TCCodecID tc_sndio_formats_out[] =
+ { TC_CODEC_ERROR };
+
+static const TCModuleInfo tc_sndio_info = {
+ .features = MOD_FEATURES,
+ .flags = MOD_FLAGS,
+ .name = MOD_NAME,
+ .version = MOD_VERSION,
+ .description = MOD_CAP,
+ .codecs_in = tc_sndio_codecs_in,
+ .codecs_out = tc_sndio_codecs_out,
+ .formats_in = tc_sndio_formats_in,
+ .formats_out = tc_sndio_formats_out
+};
+
+static const TCModuleClass tc_sndio_class = {
+ TC_MODULE_CLASS_HEAD(tc_sndio),
+ .init = tc_sndio_init,
+ .fini = tc_sndio_fini,
+ .configure = tc_sndio_configure,
+ .stop = tc_sndio_stop,
+ .inspect = tc_sndio_inspect,
+ .demultiplex = tc_sndio_demux
+};
+
+TC_MODULE_ENTRY_POINT(tc_sndio)
+
+
+/* ------------------------------------------------------------
+ * old interface
+ * ------------------------------------------------------------*/
+
+static int verbose_flag = TC_QUIET;
+static int capability_flag = TC_CAP_PCM;
+
+#define MOD_PRE sndio
+#define MOD_CODEC "(audio) pcm"
+
+#include "import_def.h"
+
+static struct tc_sndio_data data;
+
+MOD_open
+{
+ int ret = TC_OK;
+
+ switch (param->flag) {
+ case TC_VIDEO:
+ tc_log_warn(MOD_NAME, "unsupported request (open video)");
+ ret = TC_ERROR;
+ break;
+ case TC_AUDIO:
+ if (verbose_flag & TC_DEBUG)
+ tc_log_info(MOD_NAME, "sndio audio capture");
+ ret = sndio_init(&data, vob->audio_in_file, vob->a_rate,
+ vob->a_bits, vob->a_chan);
+ break;
+ default:
+ tc_log_warn(MOD_NAME, "unsupported request (open)");
+ ret = TC_ERROR;
+ break;
+ }
+
+ return ret;
+}
+
+MOD_decode
+{
+ int ret = TC_OK;
+
+ switch (param->flag) {
+ case TC_VIDEO:
+ tc_log_error(MOD_NAME, "unsupported request (decode video)");
+ ret = TC_ERROR;
+ break;
+ case TC_AUDIO:
+ ret = sndio_grab(&data, param->size, param->buffer, NULL);
+ break;
+ default:
+ tc_log_error(MOD_NAME, "unsupported request (decode)");
+ ret = TC_ERROR;
+ break;
+ }
+
+ return ret;
+}
+
+MOD_close
+{
+ int ret = TC_OK;
+
+ switch (param->flag) {
+ case TC_VIDEO:
+ tc_log_error(MOD_NAME, "unsupported request (close video)");
+ ret = TC_ERROR;
+ break;
+ case TC_AUDIO:
+ ret = sndio_stop(&data);
+ break;
+ default:
+ tc_log_error(MOD_NAME, "unsupported request (close)");
+ ret = TC_ERROR;
+ break;
+ }
+
+ return ret;
+}

20
transcode/transcode-swresample.patch Normal file
View File

@@ -0,0 +1,20 @@
--- transcode-1.1.7/filter/filter_resample.c.orig 2018-12-15 20:00:16.111657609 +0000
+++ transcode-1.1.7/filter/filter_resample.c 2018-12-15 20:01:13.141800445 +0000
@@ -37,7 +37,7 @@
#include "libtc/optstr.h"
#include "libtc/tcavcodec.h"
#include "libtc/tcmodule-plugin.h"
-#include <libavresample/avresample.h>
+#include <libswresample/swresample.h>
typedef struct {
@@ -46,7 +46,7 @@
int bytes_per_sample;
- AVAudioResampleContext *resample_ctx;
+ SwrContext *resample_ctx;
} ResamplePrivateData;
static const char resample_help[] = ""