On Sat, 2008-09-20 at 20:39 +0200, Richard wrote:
> Anyone has an idea if that's something that can be easily fixed?
With the following attached patch transcode should compile again.
Anyway, the changes are untested (that's one of the reasons why this
patch isn't in CVS yet).
Bests,
--
Francesco Romani // Ikitt
Index: encode/encode_lavc.c
===================================================================
RCS file: /cvstc/transcode/encode/encode_lavc.c,v
retrieving revision 1.24
diff -u -r1.24 encode_lavc.c
--- encode/encode_lavc.c 9 Aug 2008 09:56:31 -0000 1.24
+++ encode/encode_lavc.c 21 Sep 2008 11:12:38 -0000
@@ -1094,9 +1094,6 @@
SET_FLAG(pd, closedgop);
/* FIXME: coherency check */
- if (pd->ff_vcontext.rtp_payload_size > 0) {
- pd->ff_vcontext.rtp_mode = 1;
- }
if (pd->confdata.flags.closedgop) {
pd->ff_vcontext.scenechange_threshold = 1000000;
}
@@ -1230,11 +1227,10 @@
{ "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 },
- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
{ "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 },
{ "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
- { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+ { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
{ "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 },
Index: encode/encode_x264.c
===================================================================
RCS file: /cvstc/transcode/encode/encode_x264.c,v
retrieving revision 1.31
diff -u -r1.31 encode_x264.c
--- encode/encode_x264.c 9 Aug 2008 09:56:31 -0000 1.31
+++ encode/encode_x264.c 21 Sep 2008 11:12:39 -0000
@@ -149,7 +149,7 @@
/* How many B-frames between 2 reference pictures */
OPT_RANGE(i_bframe, "bframes", 0, 16)
/* Use adaptive B-frame encoding */
- OPT_FLAG (b_bframe_adaptive, "b_adapt")
+ OPT_FLAG (i_bframe_adaptive, "b_adapt")
/* How often B-frames are used */
OPT_RANGE(i_bframe_bias, "b_bias", -90, 100)
/* Keep some B-frames as references */
@@ -257,7 +257,7 @@
OPT_FLOAT(rc.f_pb_factor, "pb_ratio")
/* Rate control equation for 2-pass encoding (like FFmpeg) */
- OPT_STR (rc.psz_rc_eq, "rc_eq")
+ /*OPT_STR (rc.psz_rc_eq, "rc_eq") disapperead between R60 and R64 */
/* Complexity blurring before QP compression */
OPT_RANGF(rc.f_complexity_blur, "cplx_blur", 0.0, 999.0)
/* QP curve compression: 0.0 = constant bitrate, 1.0 = constant quality */
Index: export/export_ffmpeg.c
===================================================================
RCS file: /cvstc/transcode/export/export_ffmpeg.c,v
retrieving revision 1.88
diff -u -r1.88 export_ffmpeg.c
--- export/export_ffmpeg.c 10 Aug 2008 08:32:44 -0000 1.88
+++ export/export_ffmpeg.c 21 Sep 2008 11:12:40 -0000
@@ -665,8 +665,6 @@
lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
- if (lavc_param_packet_size)
- lavc_venc_context->rtp_mode = 1;
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;
@@ -882,11 +880,11 @@
lavc_venc_context->mb_cmp = lavc_param_mb_cmp;
lavc_venc_context->ildct_cmp = lavc_param_ildct_cmp;
lavc_venc_context->dia_size = lavc_param_dia_size;
+ lavc_venc_context->trellis = lavc_param_trell;
lavc_venc_context->flags |= lavc_param_qpel;
lavc_venc_context->flags |= lavc_param_gmc;
lavc_venc_context->flags |= lavc_param_closedgop;
lavc_venc_context->flags |= lavc_param_trunc;
- lavc_venc_context->flags |= lavc_param_trell;
lavc_venc_context->flags |= lavc_param_aic;
lavc_venc_context->flags |= lavc_param_umv;
lavc_venc_context->flags |= lavc_param_v4mv;
Index: export/ffmpeg_cfg.c
===================================================================
RCS file: /cvstc/transcode/export/ffmpeg_cfg.c,v
retrieving revision 1.15
diff -u -r1.15 ffmpeg_cfg.c
--- export/ffmpeg_cfg.c 20 Apr 2006 05:02:33 -0000 1.15
+++ export/ffmpeg_cfg.c 21 Sep 2008 11:12:41 -0000
@@ -194,12 +194,11 @@
{"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},
- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
{"last_pred", &lavc_param_last_pred, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
{"preme", &lavc_param_pre_me, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
{"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},
- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
{"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
{"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
{"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
Index: import/decode_lavc.c
===================================================================
RCS file: /cvstc/transcode/import/decode_lavc.c,v
retrieving revision 1.36
diff -u -r1.36 decode_lavc.c
--- import/decode_lavc.c 27 Jan 2008 09:11:57 -0000 1.36
+++ import/decode_lavc.c 21 Sep 2008 11:12:41 -0000
@@ -170,9 +170,9 @@
lavc_dec_context->width = x_dim;
lavc_dec_context->height = y_dim;
- lavc_dec_context->error_resilience = 2;
+ lavc_dec_context->error_recognition = 2;
lavc_dec_context->error_concealment = 3;
- lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+ lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
Index: import/import_ffmpeg.c
===================================================================
RCS file: /cvstc/transcode/import/import_ffmpeg.c,v
retrieving revision 1.72
diff -u -r1.72 import_ffmpeg.c
--- import/import_ffmpeg.c 25 Mar 2008 19:54:47 -0000 1.72
+++ import/import_ffmpeg.c 21 Sep 2008 11:12:42 -0000
@@ -330,9 +330,9 @@
if (vob->decolor) {
vff_data.dec_context->flags |= CODEC_FLAG_GRAY;
}
- vff_data.dec_context->error_resilience = FF_ER_COMPLIANT;
+ vff_data.dec_context->error_recognition = FF_ER_COMPLIANT;
vff_data.dec_context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
- vff_data.dec_context->workaround_bugs = workarounds;
+ vff_data.dec_context->workaround_bugs = workarounds;
TC_LOCK_LIBAVCODEC;
ret = avcodec_open(vff_data.dec_context, vff_data.dec_codec);
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvstc/transcode/testsuite/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- testsuite/Makefile.am 20 Sep 2008 10:03:25 -0000 1.24
+++ testsuite/Makefile.am 21 Sep 2008 11:12:42 -0000
@@ -33,7 +33,6 @@
test-resize-values \
test-tclog \
test-tcglob \
- test-tclist \
test-tcmodule \
test-tcmoduleinfo \
test-tcstrdup
