Annotation of pkgsrc/multimedia/transcode/patches/patch-encode_encode_lavc.c, revision 1.3
1.3 ! markd 1: $NetBSD: patch-encode_encode_lavc.c,v 1.2 2015/11/21 17:14:26 adam Exp $
1.1 markd 2:
1.3 ! markd 3: Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
1.1 markd 4:
5: --- encode/encode_lavc.c.orig 2011-11-19 16:50:27.000000000 +0000
6: +++ encode/encode_lavc.c
1.3 ! markd 7: @@ -74,6 +74,16 @@ struct tclavcconfigdata_ {
1.2 adam 8: int lmin;
9: int lmax;
10: int me_method;
11: + int luma_elim_threshold;
12: + int chroma_elim_threshold;
13: + int quantizer_noise_shaping;
1.3 ! markd 14: + int inter_quant_bias;
! 15: + int intra_quant_bias;
! 16: + int scenechange_factor;
! 17: + int rc_strategy;
! 18: + float rc_initial_cplx;
! 19: + float rc_qsquish;
! 20: + float border_masking;
1.2 adam 21:
22: /* same as above for flags */
23: struct {
1.3 ! markd 24: @@ -114,6 +124,7 @@ struct tclavcprivatedata_ {
1.1 markd 25:
26: AVFrame ff_venc_frame;
27: AVCodecContext ff_vcontext;
1.2 adam 28: + AVDictionary * ff_opts;
1.1 markd 29:
30: AVCodec *ff_vcodec;
31:
1.3 ! markd 32: @@ -164,6 +175,7 @@ static const TCCodecID tc_lavc_codecs_ou
1.2 adam 33: TC_CODEC_ERROR
34: };
35:
36: +#if LIBAVCODEC_VERSION_MAJOR < 55
37: static const enum CodecID tc_lavc_internal_codecs[] = {
38: CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
39: CODEC_ID_H263I, CODEC_ID_H263P,
1.3 ! markd 40: @@ -176,6 +188,20 @@ static const enum CodecID tc_lavc_intern
1.2 adam 41: CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
42: CODEC_ID_NONE
43: };
44: +#else
45: +static const enum AVCodecID tc_lavc_internal_codecs[] = {
46: + AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
47: + AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
48: + AV_CODEC_ID_H264,
49: + AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
50: + AV_CODEC_ID_RV10,
51: + AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
52: + AV_CODEC_ID_DVVIDEO,
53: + AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
54: + AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
55: + AV_CODEC_ID_NONE
56: +};
57: +#endif
58:
59: static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
60:
1.3 ! markd 61: @@ -214,7 +240,7 @@ static void pre_encode_video_yuv420p(TCL
! 62: vframe_list_t *vframe)
! 63: {
! 64: avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
! 65: - PIX_FMT_YUV420P,
! 66: + AV_PIX_FMT_YUV420P,
! 67: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 68: }
! 69:
! 70: @@ -228,7 +254,7 @@ static void pre_encode_video_yuv420p_huf
! 71: IMG_YUV_DEFAULT,
! 72: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 73: avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
! 74: - PIX_FMT_YUV422P,
! 75: + AV_PIX_FMT_YUV422P,
! 76: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 77: ac_imgconvert(src, IMG_YUV_DEFAULT,
! 78: pd->ff_venc_frame.data, IMG_YUV422P,
! 79: @@ -244,7 +270,7 @@ static void pre_encode_video_yuv422p(TCL
! 80: IMG_YUV422P,
! 81: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 82: avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
! 83: - PIX_FMT_YUV420P,
! 84: + AV_PIX_FMT_YUV420P,
! 85: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 86: ac_imgconvert(src, IMG_YUV422P,
! 87: pd->ff_venc_frame.data, IMG_YUV420P,
! 88: @@ -256,7 +282,7 @@ static void pre_encode_video_yuv422p_huf
! 89: vframe_list_t *vframe)
! 90: {
! 91: avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
! 92: - PIX_FMT_YUV422P,
! 93: + AV_PIX_FMT_YUV422P,
! 94: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 95:
! 96: }
! 97: @@ -266,7 +292,7 @@ static void pre_encode_video_rgb24(TCLav
! 98: vframe_list_t *vframe)
! 99: {
! 100: avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
! 101: - PIX_FMT_YUV420P,
! 102: + AV_PIX_FMT_YUV420P,
! 103: pd->ff_vcontext.width, pd->ff_vcontext.height);
! 104: ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
! 105: pd->ff_venc_frame.data, IMG_YUV420P,
! 106: @@ -591,21 +617,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
! 107: case CODEC_YUV:
! 108: if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
! 109: pd->tc_pix_fmt = TC_CODEC_YUV422P;
! 110: - pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
! 111: + pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
! 112: pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
! 113: } else {
! 114: pd->tc_pix_fmt = TC_CODEC_YUV420P;
! 115: pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
! 116: - ? PIX_FMT_YUVJ420P
! 117: - : PIX_FMT_YUV420P;
! 118: + ? AV_PIX_FMT_YUVJ420P
! 119: + : AV_PIX_FMT_YUV420P;
! 120: pd->pre_encode_video = pre_encode_video_yuv420p;
! 121: }
! 122: break;
! 123: case CODEC_YUV422:
! 124: pd->tc_pix_fmt = TC_CODEC_YUV422P;
! 125: pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
! 126: - ? PIX_FMT_YUVJ422P
! 127: - : PIX_FMT_YUV422P;
! 128: + ? AV_PIX_FMT_YUVJ422P
! 129: + : AV_PIX_FMT_YUV422P;
! 130: if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
! 131: pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
! 132: } else {
! 133: @@ -615,10 +641,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
! 134: case CODEC_RGB:
! 135: pd->tc_pix_fmt = TC_CODEC_RGB;
! 136: pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
! 137: - ? PIX_FMT_YUV422P
! 138: + ? AV_PIX_FMT_YUV422P
! 139: : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
! 140: - ? PIX_FMT_YUVJ420P
! 141: - : PIX_FMT_YUV420P;
! 142: + ? AV_PIX_FMT_YUVJ420P
! 143: + : AV_PIX_FMT_YUV420P;
! 144: pd->pre_encode_video = pre_encode_video_rgb24;
! 145: break;
! 146: default:
! 147: @@ -665,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
! 148: switch (vob->divxmultipass) {
! 149: case 1:
! 150: CAN_DO_MULTIPASS(multipass_flag);
! 151: - pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
! 152: + pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
! 153: pd->stats_file = fopen(vob->divxlogfile, "w");
! 154: if (pd->stats_file == NULL) {
! 155: tc_log_error(MOD_NAME, "could not create 2pass log file"
! 156: @@ -675,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
! 157: break;
! 158: case 2:
! 159: CAN_DO_MULTIPASS(multipass_flag);
! 160: - pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
! 161: + pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
! 162: pd->stats_file = fopen(vob->divxlogfile, "r");
! 163: if (pd->stats_file == NULL){
! 164: tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
! 165: @@ -704,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
! 166: break;
! 167: case 3:
! 168: /* fixed qscale :p */
! 169: - pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
! 170: + pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
! 171: pd->ff_venc_frame.quality = vob->divxbitrate;
! 172: break;
! 173: }
! 174: @@ -937,7 +963,11 @@ static int tc_lavc_settings_from_vob(TCL
1.2 adam 175: static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
176: {
177: /* first of all reinitialize lavc data */
178: +#if LIBAVCODEC_VERSION_MAJOR < 55
179: avcodec_get_context_defaults(&pd->ff_vcontext);
180: +#else
181: + avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
182: +#endif
183:
184: pd->confdata.thread_count = 1;
185:
1.3 ! markd 186: @@ -947,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
! 187: pd->confdata.rc_buffer_size = 0;
! 188: pd->confdata.lmin = 2;
! 189: pd->confdata.lmax = 31;
! 190: - pd->confdata.me_method = ME_EPZS;
! 191: + pd->confdata.me_method = 0;
! 192:
! 193: memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
! 194: pd->confdata.turbo_setup = 0;
! 195: @@ -955,19 +985,17 @@ static void tc_lavc_config_defaults(TCLa
1.2 adam 196: /*
197: * context *transcode* (not libavcodec) defaults
198: */
199: - pd->ff_vcontext.mb_qmin = 2;
200: - pd->ff_vcontext.mb_qmax = 31;
201: pd->ff_vcontext.max_qdiff = 3;
202: pd->ff_vcontext.max_b_frames = 0;
203: pd->ff_vcontext.me_range = 0;
1.3 ! markd 204: pd->ff_vcontext.mb_decision = 0;
! 205: pd->ff_vcontext.scenechange_threshold = 0;
! 206: - pd->ff_vcontext.scenechange_factor = 1;
! 207: + pd->confdata.scenechange_factor = 1;
! 208: pd->ff_vcontext.b_frame_strategy = 0;
! 209: pd->ff_vcontext.b_sensitivity = 40;
! 210: pd->ff_vcontext.brd_scale = 0;
! 211: pd->ff_vcontext.bidir_refine = 0;
! 212: - pd->ff_vcontext.rc_strategy = 2;
! 213: + pd->confdata.rc_strategy = 2;
! 214: pd->ff_vcontext.b_quant_factor = 1.25;
! 215: pd->ff_vcontext.i_quant_factor = 0.8;
! 216: pd->ff_vcontext.b_quant_offset = 1.25;
! 217: @@ -975,10 +1003,10 @@ static void tc_lavc_config_defaults(TCLa
! 218: pd->ff_vcontext.qblur = 0.5;
! 219: pd->ff_vcontext.qcompress = 0.5;
1.2 adam 220: pd->ff_vcontext.mpeg_quant = 0;
1.3 ! markd 221: - pd->ff_vcontext.rc_initial_cplx = 0.0;
! 222: - pd->ff_vcontext.rc_qsquish = 1.0;
1.2 adam 223: - pd->ff_vcontext.luma_elim_threshold = 0;
224: - pd->ff_vcontext.chroma_elim_threshold = 0;
1.3 ! markd 225: + pd->confdata.rc_initial_cplx = 0.0;
! 226: + pd->confdata.rc_qsquish = 1.0;
1.2 adam 227: + pd->confdata.luma_elim_threshold = 0;
228: + pd->confdata.chroma_elim_threshold = 0;
229: pd->ff_vcontext.strict_std_compliance = 0;
230: pd->ff_vcontext.dct_algo = FF_DCT_AUTO;
231: pd->ff_vcontext.idct_algo = FF_IDCT_AUTO;
1.3 ! markd 232: @@ -987,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
! 233: pd->ff_vcontext.temporal_cplx_masking = 0.0;
! 234: pd->ff_vcontext.spatial_cplx_masking = 0.0;
! 235: pd->ff_vcontext.p_masking = 0.0;
! 236: - pd->ff_vcontext.border_masking = 0.0;
! 237: + pd->confdata.border_masking = 0.0;
! 238: pd->ff_vcontext.me_pre_cmp = 0;
! 239: pd->ff_vcontext.me_cmp = 0;
! 240: pd->ff_vcontext.me_sub_cmp = 0;
! 241: @@ -999,10 +1027,8 @@ static void tc_lavc_config_defaults(TCLa
! 242: pd->ff_vcontext.pre_me = 1;
! 243: pd->ff_vcontext.me_subpel_quality = 8;
! 244: pd->ff_vcontext.refs = 1;
! 245: - pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
! 246: - pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
1.2 adam 247: pd->ff_vcontext.noise_reduction = 0;
248: - pd->ff_vcontext.quantizer_noise_shaping = 0;
249: + pd->confdata.quantizer_noise_shaping = 0;
250: pd->ff_vcontext.flags = 0;
251: }
252:
1.3 ! markd 253: @@ -1023,27 +1049,22 @@ static void tc_lavc_config_defaults(TCLa
! 254: */
! 255: static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
! 256: {
! 257: + char buf[1024];
! 258: /* some translation... */
! 259: pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
! 260: pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
! 261: pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
! 262: pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
! 263: - pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
! 264: - pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
! 265: - pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
! 266: + snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
! 267: + av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
! 268: + snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
! 269: + av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
1.2 adam 270:
271: pd->ff_vcontext.flags = 0;
1.3 ! markd 272: - SET_FLAG(pd, mv0);
1.2 adam 273: - SET_FLAG(pd, cbp);
1.1 markd 274: SET_FLAG(pd, qpel);
275: - SET_FLAG(pd, alt);
276: - SET_FLAG(pd, vdpart);
1.3 ! markd 277: - SET_FLAG(pd, naq);
1.1 markd 278: SET_FLAG(pd, ilme);
279: SET_FLAG(pd, ildct);
280: SET_FLAG(pd, aic);
281: - SET_FLAG(pd, aiv);
282: - SET_FLAG(pd, umv);
283: SET_FLAG(pd, psnr);
284: SET_FLAG(pd, trell);
285: SET_FLAG(pd, gray);
1.3 ! markd 286: @@ -1061,9 +1082,49 @@ static void tc_lavc_dispatch_settings(TC
! 287: }
! 288: if (pd->interlacing.active) {
! 289: /* enforce interlacing */
! 290: - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
! 291: - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
! 292: + pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
! 293: + pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
1.1 markd 294: }
295: + if (pd->confdata.flags.alt) {
1.2 adam 296: + av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
1.1 markd 297: + }
298: + if (pd->confdata.flags.vdpart) {
1.2 adam 299: + av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
1.1 markd 300: + }
301: + if (pd->confdata.flags.umv) {
1.2 adam 302: + av_dict_set(&(pd->ff_opts), "umv", "1", 0);
1.1 markd 303: + }
304: + if (pd->confdata.flags.aiv) {
1.2 adam 305: + av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
1.1 markd 306: + }
1.2 adam 307: + if (pd->confdata.flags.cbp) {
308: + av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
309: + }
1.3 ! markd 310: + if (pd->confdata.flags.mv0) {
! 311: + av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
! 312: + }
! 313: + if (pd->confdata.flags.naq) {
! 314: + av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
! 315: + }
1.2 adam 316: +
317: +#define set_dict_opt(val, opt) \
318: + snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
319: + av_dict_set(&(pd->ff_opts), opt, buf, 0)
1.3 ! markd 320: +#define set_dict_float_opt(val, opt) \
! 321: + snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
! 322: + av_dict_set(&(pd->ff_opts), opt, buf, 0)
1.2 adam 323: +
324: + set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
325: + set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
326: + set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
1.3 ! markd 327: + set_dict_opt(inter_quant_bias, "pbias");
! 328: + set_dict_opt(intra_quant_bias, "ibias");
! 329: + set_dict_opt(me_method, "me_method");
! 330: + set_dict_opt(scenechange_factor, "sc_factor");
! 331: + set_dict_opt(rc_strategy, "rc_strategy");
! 332: + set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
! 333: + set_dict_float_opt(rc_qsquish, "qsquish");
! 334: + set_dict_float_opt(border_masking, "border_mask");
1.1 markd 335: }
336:
337: #undef SET_FLAG
1.3 ! markd 338: @@ -1116,17 +1177,15 @@ static int tc_lavc_read_config(TCLavcPri
1.2 adam 339: // handled by transcode core
340: // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
341: // handled by transcode core
342: - { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
343: - { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
344: { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
345: { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
346: { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
1.3 ! markd 347: - { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
! 348: + { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
! 349: { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
! 350: { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
! 351: { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
! 352: { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
! 353: - { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
! 354: + { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
! 355: { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
! 356: { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
! 357: { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
! 358: @@ -1137,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
! 359: { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
! 360: { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
! 361: { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
! 362: - { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
! 363: + { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
! 364: { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
! 365: { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
! 366: { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
! 367: @@ -1147,11 +1206,11 @@ static int tc_lavc_read_config(TCLavcPri
! 368: { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
! 369: // { "vrc_eq", }, // not yet supported
! 370: { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
! 371: - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
! 372: + { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
1.2 adam 373: // { "vrc_init_occupancy", }, // not yet supported
1.3 ! markd 374: - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
1.2 adam 375: - { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
376: - { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
1.3 ! markd 377: + { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
1.2 adam 378: + { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
379: + { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
380: { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
381: { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
382: { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
1.3 ! markd 383: @@ -1161,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
! 384: { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
! 385: { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
! 386: { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
! 387: - { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
! 388: + { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
! 389: { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
! 390: { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
! 391: { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
! 392: @@ -1174,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
! 393: { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
! 394: { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
! 395: { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
! 396: - { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
! 397: - { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
! 398: + { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
! 399: + { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
1.2 adam 400: { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
401: - { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
402: + { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
403: { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
404: { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
405:
1.3 ! markd 406: - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
1.2 adam 407: - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
1.3 ! markd 408: - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
! 409: - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
! 410: - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
! 411: - { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
! 412: - { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
! 413: - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
! 414: + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
1.2 adam 415: + { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
1.3 ! markd 416: + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
1.1 markd 417: + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
1.3 ! markd 418: + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
! 419: + { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
! 420: + { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
1.1 markd 421: + { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
422: #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
423: { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
424: #else
1.3 ! markd 425: - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
! 426: + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
1.1 markd 427: #endif
428: - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
429: - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
1.3 ! markd 430: - { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
1.1 markd 431: + { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
432: + { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
1.3 ! markd 433: + { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
1.1 markd 434: #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
435: { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
1.3 ! markd 436: #else
! 437: { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
! 438: #endif
! 439: - { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
! 440: - { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
! 441: - { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
! 442: + { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
! 443: + { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
! 444: + { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
! 445:
! 446: // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported
! 447: /* End of the config file */
! 448: @@ -1345,12 +1404,14 @@ static int tc_lavc_configure(TCModuleIns
1.2 adam 449:
450: pd = self->userdata;
451:
452: + pd->ff_opts = NULL;
453: +
454: pd->flush_flag = vob->encoder_flush;
455:
456: /* FIXME: move into core? */
1.3 ! markd 457: TC_INIT_LIBAVCODEC;
! 458:
! 459: - avcodec_get_frame_defaults(&pd->ff_venc_frame);
! 460: + av_frame_unref(&pd->ff_venc_frame);
! 461: /*
! 462: * auxiliary config data needs to be blanked too
! 463: * before any other operation
! 464: @@ -1387,7 +1448,7 @@ static int tc_lavc_configure(TCModuleIns
1.1 markd 465: pd->confdata.thread_count,
466: (pd->confdata.thread_count > 1) ?"s" :"");
467: }
468: - avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
469: + pd->ff_vcontext.thread_count = pd->confdata.thread_count;
470:
471: pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
472: if (pd->ff_vcodec == NULL) {
1.3 ! markd 473: @@ -1397,11 +1458,11 @@ static int tc_lavc_configure(TCModuleIns
1.1 markd 474: }
475:
476: TC_LOCK_LIBAVCODEC;
477: - ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
1.2 adam 478: + ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
1.1 markd 479: TC_UNLOCK_LIBAVCODEC;
480:
481: if (ret < 0) {
482: - tc_log_error(MOD_NAME, "avcodec_open() failed");
483: + tc_log_error(MOD_NAME, "avcodec_open2() failed");
484: goto failed;
485: }
486: /* finally, pass up the extradata, if any */
1.3 ! markd 487: @@ -1483,6 +1544,8 @@ static int tc_lavc_encode_video(TCModule
! 488: vframe_list_t *outframe)
! 489: {
! 490: TCLavcPrivateData *pd = NULL;
! 491: + AVPacket pkt;
! 492: + int ret, got_packet = 0;
! 493:
! 494: TC_MODULE_SELF_CHECK(self, "encode_video");
! 495:
! 496: @@ -1497,12 +1560,15 @@ static int tc_lavc_encode_video(TCModule
! 497:
! 498: pd->pre_encode_video(pd, inframe);
! 499:
! 500: + av_init_packet(&pkt);
! 501: + pkt.data = outframe->video_buf;
! 502: + pkt.size = inframe->video_size;
! 503: +
! 504: TC_LOCK_LIBAVCODEC;
! 505: - outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
! 506: - outframe->video_buf,
! 507: - inframe->video_size,
! 508: - &pd->ff_venc_frame);
! 509: + ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt,
! 510: + &pd->ff_venc_frame, &got_packet);
! 511: TC_UNLOCK_LIBAVCODEC;
! 512: + outframe->video_len = ret ? ret : pkt.size;
! 513:
! 514: if (outframe->video_len < 0) {
! 515: tc_log_warn(MOD_NAME, "encoder error: size (%i)",
CVSweb <webmaster@jp.NetBSD.org>