Ticket #7470: transcode-1.1.7-ffmpeg3.patch
File transcode-1.1.7-ffmpeg3.patch, 48.8 KB (added by , 8 years ago) |
---|
-
encode/encode_lavc.c
a b 74 74 int lmin; 75 75 int lmax; 76 76 int me_method; 77 int luma_elim_threshold; 78 int chroma_elim_threshold; 79 int quantizer_noise_shaping; 77 80 78 81 /* same as above for flags */ 79 82 struct { … … 114 117 115 118 AVFrame ff_venc_frame; 116 119 AVCodecContext ff_vcontext; 120 AVDictionary * ff_opts; 117 121 118 122 AVCodec *ff_vcodec; 119 123 … … 164 168 TC_CODEC_ERROR 165 169 }; 166 170 171 #if LIBAVCODEC_VERSION_MAJOR < 55 167 172 static const enum CodecID tc_lavc_internal_codecs[] = { 168 173 CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, 169 174 CODEC_ID_H263I, CODEC_ID_H263P, … … 176 181 CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, 177 182 CODEC_ID_NONE 178 183 }; 184 #else 185 static const enum AVCodecID tc_lavc_internal_codecs[] = { 186 AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, 187 AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, 188 AV_CODEC_ID_H264, 189 AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, 190 AV_CODEC_ID_RV10, 191 AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, 192 AV_CODEC_ID_DVVIDEO, 193 AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, 194 AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, 195 AV_CODEC_ID_NONE 196 }; 197 #endif 179 198 180 199 static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; 181 200 … … 214 233 vframe_list_t *vframe) 215 234 { 216 235 avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, 217 PIX_FMT_YUV420P,236 AV_PIX_FMT_YUV420P, 218 237 pd->ff_vcontext.width, pd->ff_vcontext.height); 219 238 } 220 239 … … 228 247 IMG_YUV_DEFAULT, 229 248 pd->ff_vcontext.width, pd->ff_vcontext.height); 230 249 avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, 231 PIX_FMT_YUV422P,250 AV_PIX_FMT_YUV422P, 232 251 pd->ff_vcontext.width, pd->ff_vcontext.height); 233 252 ac_imgconvert(src, IMG_YUV_DEFAULT, 234 253 pd->ff_venc_frame.data, IMG_YUV422P, … … 244 263 IMG_YUV422P, 245 264 pd->ff_vcontext.width, pd->ff_vcontext.height); 246 265 avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, 247 PIX_FMT_YUV420P,266 AV_PIX_FMT_YUV420P, 248 267 pd->ff_vcontext.width, pd->ff_vcontext.height); 249 268 ac_imgconvert(src, IMG_YUV422P, 250 269 pd->ff_venc_frame.data, IMG_YUV420P, … … 256 275 vframe_list_t *vframe) 257 276 { 258 277 avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, 259 PIX_FMT_YUV422P,278 AV_PIX_FMT_YUV422P, 260 279 pd->ff_vcontext.width, pd->ff_vcontext.height); 261 280 262 281 } … … 266 285 vframe_list_t *vframe) 267 286 { 268 287 avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, 269 PIX_FMT_YUV420P,288 AV_PIX_FMT_YUV420P, 270 289 pd->ff_vcontext.width, pd->ff_vcontext.height); 271 290 ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, 272 291 pd->ff_venc_frame.data, IMG_YUV420P, … … 591 610 case CODEC_YUV: 592 611 if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { 593 612 pd->tc_pix_fmt = TC_CODEC_YUV422P; 594 pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;613 pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; 595 614 pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; 596 615 } else { 597 616 pd->tc_pix_fmt = TC_CODEC_YUV420P; 598 617 pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 599 ? PIX_FMT_YUVJ420P600 : PIX_FMT_YUV420P;618 ? AV_PIX_FMT_YUVJ420P 619 : AV_PIX_FMT_YUV420P; 601 620 pd->pre_encode_video = pre_encode_video_yuv420p; 602 621 } 603 622 break; 604 623 case CODEC_YUV422: 605 624 pd->tc_pix_fmt = TC_CODEC_YUV422P; 606 625 pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 607 ? PIX_FMT_YUVJ422P608 : PIX_FMT_YUV422P;626 ? AV_PIX_FMT_YUVJ422P 627 : AV_PIX_FMT_YUV422P; 609 628 if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { 610 629 pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; 611 630 } else { … … 615 634 case CODEC_RGB: 616 635 pd->tc_pix_fmt = TC_CODEC_RGB; 617 636 pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) 618 ? PIX_FMT_YUV422P637 ? AV_PIX_FMT_YUV422P 619 638 : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 620 ? PIX_FMT_YUVJ420P621 : PIX_FMT_YUV420P;639 ? AV_PIX_FMT_YUVJ420P 640 : AV_PIX_FMT_YUV420P; 622 641 pd->pre_encode_video = pre_encode_video_rgb24; 623 642 break; 624 643 default: … … 937 956 static void tc_lavc_config_defaults(TCLavcPrivateData *pd) 938 957 { 939 958 /* first of all reinitialize lavc data */ 959 #if LIBAVCODEC_VERSION_MAJOR < 55 940 960 avcodec_get_context_defaults(&pd->ff_vcontext); 961 #else 962 avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); 963 #endif 941 964 942 965 pd->confdata.thread_count = 1; 943 966 … … 955 978 /* 956 979 * context *transcode* (not libavcodec) defaults 957 980 */ 958 pd->ff_vcontext.mb_qmin = 2;959 pd->ff_vcontext.mb_qmax = 31;960 981 pd->ff_vcontext.max_qdiff = 3; 961 982 pd->ff_vcontext.max_b_frames = 0; 962 983 pd->ff_vcontext.me_range = 0; … … 977 998 pd->ff_vcontext.mpeg_quant = 0; 978 999 pd->ff_vcontext.rc_initial_cplx = 0.0; 979 1000 pd->ff_vcontext.rc_qsquish = 1.0; 980 pd-> ff_vcontext.luma_elim_threshold = 0;981 pd-> ff_vcontext.chroma_elim_threshold = 0;1001 pd->confdata.luma_elim_threshold = 0; 1002 pd->confdata.chroma_elim_threshold = 0; 982 1003 pd->ff_vcontext.strict_std_compliance = 0; 983 1004 pd->ff_vcontext.dct_algo = FF_DCT_AUTO; 984 1005 pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; … … 1002 1023 pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; 1003 1024 pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; 1004 1025 pd->ff_vcontext.noise_reduction = 0; 1005 pd-> ff_vcontext.quantizer_noise_shaping = 0;1026 pd->confdata.quantizer_noise_shaping = 0; 1006 1027 pd->ff_vcontext.flags = 0; 1007 1028 } 1008 1029 … … 1033 1054 pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; 1034 1055 1035 1056 pd->ff_vcontext.flags = 0; 1036 SET_FLAG(pd, mv0);1037 SET_FLAG(pd, cbp);1038 1057 SET_FLAG(pd, qpel); 1039 SET_FLAG(pd, alt);1040 SET_FLAG(pd, vdpart);1041 SET_FLAG(pd, naq);1042 1058 SET_FLAG(pd, ilme); 1043 1059 SET_FLAG(pd, ildct); 1044 1060 SET_FLAG(pd, aic); 1045 SET_FLAG(pd, aiv);1046 SET_FLAG(pd, umv);1047 1061 SET_FLAG(pd, psnr); 1048 1062 SET_FLAG(pd, trell); 1049 1063 SET_FLAG(pd, gray); … … 1064 1078 pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; 1065 1079 pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; 1066 1080 } 1081 if (pd->confdata.flags.alt) { 1082 av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); 1083 } 1084 if (pd->confdata.flags.vdpart) { 1085 av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); 1086 } 1087 if (pd->confdata.flags.umv) { 1088 av_dict_set(&(pd->ff_opts), "umv", "1", 0); 1089 } 1090 if (pd->confdata.flags.aiv) { 1091 av_dict_set(&(pd->ff_opts), "aiv", "1", 0); 1092 } 1093 if (pd->confdata.flags.cbp) { 1094 av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); 1095 } 1096 if (pd->confdata.flags.mv0) { 1097 av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); 1098 } 1099 if (pd->confdata.flags.naq) { 1100 av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); 1101 } 1102 1103 char buf[1024]; 1104 #define set_dict_opt(val, opt) \ 1105 snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ 1106 av_dict_set(&(pd->ff_opts), opt, buf, 0) 1107 1108 set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); 1109 set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); 1110 set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); 1067 1111 } 1068 1112 1069 1113 #undef SET_FLAG … … 1116 1160 // handled by transcode core 1117 1161 // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, 1118 1162 // handled by transcode core 1119 { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },1120 { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },1121 1163 { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, 1122 1164 { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, 1123 1165 { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, 1124 { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},1166 { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, 1125 1167 { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, 1126 1168 { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, 1127 1169 { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, … … 1150 1192 { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, 1151 1193 // { "vrc_init_occupancy", }, // not yet supported 1152 1194 { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, 1153 { "vlelim", P CTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },1154 { "vcelim", P CTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },1195 { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, 1196 { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, 1155 1197 { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, 1156 1198 { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, 1157 1199 { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, … … 1177 1219 { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, 1178 1220 { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, 1179 1221 { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, 1180 { "qns", P CTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },1222 { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, 1181 1223 { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, 1182 1224 { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, 1183 1225 1184 { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},1185 { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},1226 { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1227 { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1186 1228 { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, 1187 { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},1229 { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1188 1230 { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, 1189 1231 { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, 1190 { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP},1191 { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},1232 { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1233 { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1192 1234 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) 1193 1235 { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, 1194 1236 #else 1195 1237 { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, 1196 1238 #endif 1197 { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV},1198 { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},1239 { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1240 { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, 1199 1241 { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, 1200 1242 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) 1201 1243 { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, … … 1345 1387 1346 1388 pd = self->userdata; 1347 1389 1390 pd->ff_opts = NULL; 1391 1348 1392 pd->flush_flag = vob->encoder_flush; 1349 1393 1350 1394 /* FIXME: move into core? */ 1351 1395 TC_INIT_LIBAVCODEC; 1352 1396 1353 av codec_get_frame_defaults(&pd->ff_venc_frame);1397 av_frame_unref(&pd->ff_venc_frame); 1354 1398 /* 1355 1399 * auxiliary config data needs to be blanked too 1356 1400 * before any other operation … … 1387 1431 pd->confdata.thread_count, 1388 1432 (pd->confdata.thread_count > 1) ?"s" :""); 1389 1433 } 1390 avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);1434 pd->ff_vcontext.thread_count = pd->confdata.thread_count; 1391 1435 1392 1436 pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); 1393 1437 if (pd->ff_vcodec == NULL) { … … 1397 1441 } 1398 1442 1399 1443 TC_LOCK_LIBAVCODEC; 1400 ret = avcodec_open (&pd->ff_vcontext, pd->ff_vcodec);1444 ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); 1401 1445 TC_UNLOCK_LIBAVCODEC; 1402 1446 1403 1447 if (ret < 0) { 1404 tc_log_error(MOD_NAME, "avcodec_open () failed");1448 tc_log_error(MOD_NAME, "avcodec_open2() failed"); 1405 1449 goto failed; 1406 1450 } 1407 1451 /* finally, pass up the extradata, if any */ … … 1483 1527 vframe_list_t *outframe) 1484 1528 { 1485 1529 TCLavcPrivateData *pd = NULL; 1530 AVPacket pkt; 1531 int ret, got_packet = 0; 1486 1532 1487 1533 TC_MODULE_SELF_CHECK(self, "encode_video"); 1488 1534 … … 1497 1543 1498 1544 pd->pre_encode_video(pd, inframe); 1499 1545 1546 av_init_packet(&pkt); 1547 pkt.data = outframe->video_buf; 1548 pkt.size = inframe->video_size; 1549 1500 1550 TC_LOCK_LIBAVCODEC; 1501 outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, 1502 outframe->video_buf, 1503 inframe->video_size, 1504 &pd->ff_venc_frame); 1551 ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, 1552 &pd->ff_venc_frame, &got_packet); 1505 1553 TC_UNLOCK_LIBAVCODEC; 1554 outframe->video_len = ret ? ret : pkt.size; 1506 1555 1507 1556 if (outframe->video_len < 0) { 1508 1557 tc_log_warn(MOD_NAME, "encoder error: size (%i)", -
export/aud_aux.c
a b 326 326 327 327 switch (o_codec) { 328 328 case 0x50: 329 codeid = CODEC_ID_MP2;329 codeid = AV_CODEC_ID_MP2; 330 330 break; 331 331 case 0x2000: 332 codeid = CODEC_ID_AC3;332 codeid = AV_CODEC_ID_AC3; 333 333 break; 334 334 default: 335 335 tc_warn("cannot init ffmpeg with %x", o_codec); … … 346 346 347 347 //-- set parameters (bitrate, channels and sample-rate) -- 348 348 //-------------------------------------------------------- 349 avcodec_get_context_defaults (&mpa_ctx);349 avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); 350 350 #if LIBAVCODEC_VERSION_MAJOR < 53 351 351 mpa_ctx.codec_type = CODEC_TYPE_AUDIO; 352 352 #else … … 359 359 //-- open codec -- 360 360 //---------------- 361 361 TC_LOCK_LIBAVCODEC; 362 ret = avcodec_open (&mpa_ctx, mpa_codec);362 ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); 363 363 TC_UNLOCK_LIBAVCODEC; 364 364 if (ret < 0) { 365 365 tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", 366 (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");366 (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3"); 367 367 return(TC_EXPORT_ERROR); 368 368 } 369 369 … … 846 846 #ifdef HAVE_FFMPEG 847 847 int in_size, out_size; 848 848 char *in_buf; 849 int got_packet; 850 AVPacket avpkt = { 0 }; 851 AVFrame *frame = av_frame_alloc(); 849 852 850 853 //-- input buffer and amount of bytes -- 851 854 in_size = aud_size; … … 866 869 867 870 ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed); 868 871 872 frame->nb_samples = mpa_ctx.frame_size; 873 avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)mpa_buf, mpa_bytes_pf, 1); 874 avpkt.data = output; 875 avpkt.size = OUTPUT_SIZE; 869 876 TC_LOCK_LIBAVCODEC; 870 out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, 871 OUTPUT_SIZE, (short *)mpa_buf); 877 out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); 872 878 TC_UNLOCK_LIBAVCODEC; 879 out_size = avpkt.size; 873 880 tc_audio_write(output, out_size, avifile); 874 881 875 882 in_size -= bytes_needed; … … 884 891 885 892 ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail); 886 893 mpa_buf_ptr += bytes_avail; 894 av_frame_free(&frame); 887 895 return (0); 888 896 } 889 897 } //bytes availabe from last call? … … 893 901 //---------------------------------------------------- 894 902 895 903 while (in_size >= mpa_bytes_pf) { 904 av_frame_unref(frame); 905 frame->nb_samples = mpa_ctx.frame_size; 906 avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)in_buf, mpa_bytes_pf, 1); 907 avpkt.data = output; 908 avpkt.size = OUTPUT_SIZE; 896 909 TC_LOCK_LIBAVCODEC; 897 out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, 898 OUTPUT_SIZE, (short *)in_buf); 910 out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); 899 911 TC_UNLOCK_LIBAVCODEC; 912 out_size = avpkt.size; 900 913 901 914 tc_audio_write(output, out_size, avifile); 902 915 … … 904 917 in_buf += mpa_bytes_pf; 905 918 } 906 919 920 av_frame_free(&frame); 921 907 922 //-- hold rest of bytes in mpa-buffer -- 908 923 //-------------------------------------- 909 924 if (in_size > 0) { -
export/export_ffmpeg.c
a b 122 122 static AVFrame *lavc_convert_frame = NULL; 123 123 124 124 static AVCodec *lavc_venc_codec = NULL; 125 static AVDictionary *lavc_venc_opts = NULL; 125 126 static AVFrame *lavc_venc_frame = NULL; 126 127 static AVCodecContext *lavc_venc_context; 127 128 static avi_t *avifile = NULL; … … 180 181 181 182 182 183 /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ 183 #include <libav codec/opt.h>184 #include <libavutil/opt.h> 184 185 #include <libavutil/avstring.h> 185 186 #include <libswscale/swscale.h> 186 187 … … 249 250 for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){ 250 251 /* GLUE: +if */ 251 252 if (type == AVMEDIA_TYPE_VIDEO) { 252 const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);253 if(o 2)254 ret = av_ set_string3(avcodec_opts[type], opt, arg, 1, &o);253 o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); 254 if(o) 255 ret = av_opt_set(avcodec_opts[type], opt, arg, 0); 255 256 /* GLUE: +if */ 256 257 } 257 258 } … … 266 267 if(opt[0] == 'a') 267 268 ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); 268 269 else */ if(opt[0] == 'v') 269 ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); 270 { 271 o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); 272 ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); 273 } 270 274 /* GLUE: disabling 271 275 else if(opt[0] == 's') 272 276 ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); … … 470 474 } 471 475 472 476 TC_LOCK_LIBAVCODEC; 473 avcodec_init();474 477 avcodec_register_all(); 475 478 TC_UNLOCK_LIBAVCODEC; 476 479 … … 486 489 codec->name, codec->fourCC, codec->comments); 487 490 } 488 491 489 lavc_venc_context = avcodec_alloc_context ();490 lavc_venc_frame = av codec_alloc_frame();492 lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); 493 lavc_venc_frame = av_frame_alloc(); 491 494 492 lavc_convert_frame= av codec_alloc_frame();493 size = avpicture_get_size( PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);495 lavc_convert_frame= av_frame_alloc(); 496 size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); 494 497 enc_buffer = tc_malloc(size); 495 498 496 499 if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { … … 634 637 lavc_param_rc_max_rate = 2516; 635 638 lavc_param_rc_buffer_size = 224 * 8; 636 639 lavc_param_rc_buffer_aggressivity = 99; 637 lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;640 lavc_param_scan_offset = 1; 638 641 639 642 break; 640 643 … … 674 677 675 678 lavc_param_rc_buffer_size = 224 * 8; 676 679 lavc_param_rc_buffer_aggressivity = 99; 677 lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;680 lavc_param_scan_offset = 1; 678 681 679 682 break; 680 683 … … 838 841 lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; 839 842 lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; 840 843 lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; 841 lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; 842 lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; 844 845 char buf[1024]; 846 #define set_dict_opt(val, opt) \ 847 snprintf(buf, sizeof(buf), "%i", val); \ 848 av_dict_set(&lavc_venc_opts, opt, buf, 0) 849 set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); 850 set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); 843 851 lavc_venc_context->rtp_payload_size = lavc_param_packet_size; 844 852 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) 845 853 if (lavc_param_packet_size) … … 870 878 lavc_venc_context->context_model = lavc_param_context; 871 879 lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; 872 880 lavc_venc_context->noise_reduction = lavc_param_noise_reduction; 873 lavc_venc_context->inter_threshold = lavc_param_inter_threshold;881 set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); 874 882 lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; 875 883 lavc_venc_context->skip_top = lavc_param_skip_top; 876 884 lavc_venc_context->skip_bottom = lavc_param_skip_bottom; … … 887 895 lavc_venc_context->thread_count); 888 896 } 889 897 890 avcodec_thread_init(lavc_venc_context, lavc_param_threads);898 lavc_venc_context->thread_count = lavc_param_threads; 891 899 892 900 if (lavc_param_intra_matrix) { 893 901 char *tmp; … … 1061 1069 lavc_venc_context->ildct_cmp = lavc_param_ildct_cmp; 1062 1070 lavc_venc_context->dia_size = lavc_param_dia_size; 1063 1071 lavc_venc_context->flags |= lavc_param_qpel; 1064 lavc_venc_context->flags |= lavc_param_gmc; 1072 if(lavc_param_gmc) 1073 av_dict_set(&lavc_venc_opts, "gmc", "1", 0); 1065 1074 lavc_venc_context->flags |= lavc_param_closedgop; 1066 1075 lavc_venc_context->flags |= lavc_param_trunc; 1067 1076 lavc_venc_context->flags |= lavc_param_aic; 1068 lavc_venc_context->flags |= lavc_param_umv;1069 1077 lavc_venc_context->flags |= lavc_param_v4mv; 1070 lavc_venc_context->flags |= lavc_param_data_partitioning; 1071 lavc_venc_context->flags |= lavc_param_cbp; 1072 lavc_venc_context->flags |= lavc_param_mv0; 1073 lavc_venc_context->flags |= lavc_param_qp_rd; 1074 lavc_venc_context->flags |= lavc_param_scan_offset; 1075 lavc_venc_context->flags |= lavc_param_ss; 1076 lavc_venc_context->flags |= lavc_param_alt; 1078 if(lavc_param_cbp) 1079 av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); 1080 if(lavc_param_mv0) 1081 av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0); 1082 if(lavc_param_qp_rd) 1083 av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); 1077 1084 lavc_venc_context->flags |= lavc_param_ilme; 1078 1085 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) 1079 1086 lavc_venc_context->flags |= lavc_param_trell; … … 1084 1091 if (lavc_param_gray) 1085 1092 lavc_venc_context->flags |= CODEC_FLAG_GRAY; 1086 1093 if (lavc_param_normalize_aqp) 1087 lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;1094 av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); 1088 1095 1089 1096 switch(vob->encode_fields) { 1090 1097 case TC_ENCODE_FIELDS_TOP_FIRST: … … 1112 1119 lavc_venc_context->prediction_method = lavc_param_prediction_method; 1113 1120 1114 1121 if(is_huffyuv) 1115 lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;1122 lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; 1116 1123 else 1117 1124 { 1118 1125 switch(pix_fmt) … … 1121 1128 case CODEC_RGB: 1122 1129 { 1123 1130 if(is_mjpeg) 1124 lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;1131 lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; 1125 1132 else 1126 lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;1133 lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; 1127 1134 break; 1128 1135 } 1129 1136 1130 1137 case CODEC_YUV422: 1131 1138 { 1132 1139 if(is_mjpeg) 1133 lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;1140 lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; 1134 1141 else 1135 lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;1142 lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; 1136 1143 break; 1137 1144 } 1138 1145 … … 1203 1210 1204 1211 lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; 1205 1212 1206 1207 1213 /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ 1208 if (lavc_param_video_preset ) {1214 if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { 1209 1215 avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; 1210 1216 video_codec_name = ffmpeg_codec_name(codec->name); 1211 1217 … … 1241 1247 } 1242 1248 } 1243 1249 1250 if (lavc_param_scan_offset) { 1251 av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); 1252 } 1253 1254 if (lavc_param_ss) { 1255 av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); 1256 } 1257 1258 if (lavc_param_alt) { 1259 av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); 1260 } 1261 1262 if (lavc_param_umv) { 1263 av_dict_set(&lavc_venc_opts, "umv", "1", 0); 1264 } 1265 1266 if (lavc_param_data_partitioning) { 1267 av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); 1268 } 1244 1269 1245 1270 //-- open codec -- 1246 1271 //---------------- 1247 1272 TC_LOCK_LIBAVCODEC; 1248 ret = avcodec_open (lavc_venc_context, lavc_venc_codec);1273 ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); 1249 1274 TC_UNLOCK_LIBAVCODEC; 1250 1275 if (ret < 0) { 1251 1276 tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); 1252 1277 return TC_EXPORT_ERROR; 1253 1278 } 1254 1279 1255 if ( lavc_venc_context->codec->encode == NULL) {1280 if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { 1256 1281 tc_log_warn(MOD_NAME, "could not open FFMPEG codec " 1257 "( lavc_venc_context->codec->encode == NULL)");1282 "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); 1258 1283 return TC_EXPORT_ERROR; 1259 1284 } 1260 1285 … … 1574 1599 1575 1600 int out_size; 1576 1601 const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; 1602 AVPacket pkt; 1603 int ret, got_packet = 0; 1577 1604 1578 1605 if (param->flag == TC_VIDEO) { 1579 1606 … … 1598 1625 YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, 1599 1626 lavc_venc_context->width, lavc_venc_context->height); 1600 1627 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, 1601 PIX_FMT_YUV422P, lavc_venc_context->width,1628 AV_PIX_FMT_YUV422P, lavc_venc_context->width, 1602 1629 lavc_venc_context->height); 1603 1630 /* FIXME: can't use tcv_convert (see decode_lavc.c) */ 1604 1631 ac_imgconvert(src, IMG_YUV_DEFAULT, … … 1628 1655 lavc_venc_context->width, 1629 1656 lavc_venc_context->height); 1630 1657 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, 1631 PIX_FMT_YUV420P, lavc_venc_context->width,1658 AV_PIX_FMT_YUV420P, lavc_venc_context->width, 1632 1659 lavc_venc_context->height); 1633 1660 ac_imgconvert(src, IMG_YUV422P, 1634 1661 lavc_venc_frame->data, IMG_YUV420P, … … 1639 1666 1640 1667 case CODEC_RGB: 1641 1668 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, 1642 PIX_FMT_YUV420P, lavc_venc_context->width,1669 AV_PIX_FMT_YUV420P, lavc_venc_context->width, 1643 1670 lavc_venc_context->height); 1644 1671 ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, 1645 1672 lavc_venc_frame->data, IMG_YUV420P, … … 1652 1679 return TC_EXPORT_ERROR; 1653 1680 } 1654 1681 1682 av_init_packet(&pkt); 1683 pkt.data = enc_buffer; 1684 pkt.size = size; 1655 1685 1656 1686 TC_LOCK_LIBAVCODEC; 1657 out_size = avcodec_encode_video(lavc_venc_context, 1658 enc_buffer, size, 1659 lavc_venc_frame); 1687 ret = avcodec_encode_video2(lavc_venc_context, &pkt, 1688 lavc_venc_frame, &got_packet); 1660 1689 TC_UNLOCK_LIBAVCODEC; 1661 1690 1691 out_size = ret ? ret : pkt.size; 1692 1662 1693 if (out_size < 0) { 1663 1694 tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); 1664 1695 return TC_EXPORT_ERROR; -
export/ffmpeg_cfg.c
a b 34 34 //int lavc_param_vqscale = 0; 35 35 //int lavc_param_vqmin = 2; 36 36 //int lavc_param_vqmax = 31; 37 int lavc_param_mb_qmin = 2;38 int lavc_param_mb_qmax = 31;39 37 int lavc_param_lmin = 2; 40 38 int lavc_param_lmax = 31; 41 39 int lavc_param_vqdiff = 3; … … 126 124 //int lavc_param_atag = 0; 127 125 //int lavc_param_abitrate = 224; 128 126 129 char *lavc_param_video_preset = " medium";127 char *lavc_param_video_preset = "none"; 130 128 char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; 131 129 132 130 TCConfigEntry lavcopts_conf[]={ … … 143 141 // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, 144 142 // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, 145 143 // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, 146 {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},147 {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},148 144 {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, 149 145 {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, 150 146 {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, 151 147 {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, 152 148 {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, 153 149 {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, 154 {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},150 {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, 155 151 // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, 156 152 {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, 157 153 {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, … … 160 156 {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, 161 157 {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, 162 158 {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, 163 {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},159 {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, 164 160 // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, 165 {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ PART},161 {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, 166 162 {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, 167 163 {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, 168 164 {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, … … 211 207 #else 212 208 {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, 213 209 #endif 214 {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},210 {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, 215 211 {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, 216 212 {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, 217 213 {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, 218 214 {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, 219 215 {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, 220 216 {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, 221 {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},222 {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},217 {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, 218 {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, 223 219 {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, 224 {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},220 {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, 225 221 {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, 226 {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},227 {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},228 {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},222 {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, 223 {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, 224 {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, 229 225 {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, 230 226 {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, 231 227 {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, 232 228 {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, 233 {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},229 {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, 234 230 {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, 235 231 {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, 236 232 {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, -
export/ffmpeg_cfg.h
a b 13 13 //extern int lavc_param_vqscale; 14 14 //extern int lavc_param_vqmin; 15 15 //extern int lavc_param_vqmax; 16 extern int lavc_param_mb_qmin;17 extern int lavc_param_mb_qmax;18 16 extern int lavc_param_lmin; 19 17 extern int lavc_param_lmax; 20 18 extern int lavc_param_vqdiff; -
filter/filter_pp.c
a b 38 38 39 39 /* FIXME: these use the filter ID as an index--the ID can grow 40 40 * arbitrarily large, so this needs to be fixed */ 41 static pp_mode _t*mode[100];42 static pp_context _t*context[100];41 static pp_mode *mode[100]; 42 static pp_context *context[100]; 43 43 static int width[100], height[100]; 44 44 static int pre[100]; 45 45 -
import/decode_lavc.c
a b 58 58 59 59 // fourCC to ID mapping taken from MPlayer's codecs.conf 60 60 static struct ffmpeg_codec ffmpeg_codecs[] = { 61 { CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",61 {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", 62 62 {"MP41", "DIV1", ""}}, 63 { CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",63 {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", 64 64 {"MP42", "DIV2", ""}}, 65 { CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",65 {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", 66 66 {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, 67 { CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",67 {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", 68 68 {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, 69 { CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",69 {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", 70 70 {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, 71 { CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",71 {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", 72 72 {"MPG1", ""}}, 73 { CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",73 {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", 74 74 {"DVSD", ""}}, 75 { CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",75 {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", 76 76 {"WMV1", ""}}, 77 { CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",77 {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", 78 78 {"WMV2", ""}}, 79 { CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",79 {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", 80 80 {"HFYU", ""}}, 81 { CODEC_ID_H263I, TC_CODEC_H263I, "h263i",81 {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", 82 82 {"I263", ""}}, 83 { CODEC_ID_H263P, TC_CODEC_H263P, "h263p",83 {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", 84 84 {"H263", "U263", "VIV1", ""}}, 85 { CODEC_ID_RV10, TC_CODEC_RV10, "rv10",85 {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", 86 86 {"RV10", "RV13", ""}}, 87 { CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",87 {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", 88 88 {"SVQ1", ""}}, 89 { CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",89 {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", 90 90 {"SVQ3", ""}}, 91 { CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",91 {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", 92 92 {"MPG2", ""}}, 93 93 {0, TC_CODEC_UNKNOWN, NULL, {""}}}; 94 94 … … 170 170 171 171 // Set these to the expected values so that ffmpeg's decoder can 172 172 // properly detect interlaced input. 173 lavc_dec_context = avcodec_alloc_context ();173 lavc_dec_context = avcodec_alloc_context3(NULL); 174 174 if (lavc_dec_context == NULL) { 175 175 tc_log_error(__FILE__, "Could not allocate enough memory."); 176 176 goto decoder_error; … … 181 181 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) 182 182 lavc_dec_context->error_resilience = 2; 183 183 #else 184 lavc_dec_context->err or_recognition = 2;184 lavc_dec_context->err_recognition = 2; 185 185 #endif 186 186 lavc_dec_context->error_concealment = 3; 187 187 lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; 188 188 189 if (avcodec_open (lavc_dec_context, lavc_dec_codec) < 0) {189 if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { 190 190 tc_log_error(__FILE__, "Could not initialize the '%s' codec.", 191 191 codec->name); 192 192 goto decoder_error; … … 290 290 291 291 // Convert avcodec image to the requested YUV or RGB format 292 292 switch (lavc_dec_context->pix_fmt) { 293 case PIX_FMT_YUVJ420P:294 case PIX_FMT_YUV420P:293 case AV_PIX_FMT_YUVJ420P: 294 case AV_PIX_FMT_YUV420P: 295 295 // Remove "dead space" at right edge of planes, if any 296 296 if (picture.linesize[0] != lavc_dec_context->width) { 297 297 int y; … … 315 315 pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, 316 316 lavc_dec_context->width, lavc_dec_context->height); 317 317 break; 318 case PIX_FMT_YUV411P:318 case AV_PIX_FMT_YUV411P: 319 319 if (picture.linesize[0] != lavc_dec_context->width) { 320 320 int y; 321 321 for (y = 0; y < lavc_dec_context->height; y++) { … … 334 334 pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, 335 335 lavc_dec_context->width, lavc_dec_context->height); 336 336 break; 337 case PIX_FMT_YUVJ422P:338 case PIX_FMT_YUV422P:337 case AV_PIX_FMT_YUVJ422P: 338 case AV_PIX_FMT_YUV422P: 339 339 if (picture.linesize[0] != lavc_dec_context->width) { 340 340 int y; 341 341 for (y = 0; y < lavc_dec_context->height; y++) { … … 354 354 pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, 355 355 lavc_dec_context->width, lavc_dec_context->height); 356 356 break; 357 case PIX_FMT_YUVJ444P:358 case PIX_FMT_YUV444P:357 case AV_PIX_FMT_YUVJ444P: 358 case AV_PIX_FMT_YUV444P: 359 359 if (picture.linesize[0] != lavc_dec_context->width) { 360 360 int y; 361 361 for (y = 0; y < lavc_dec_context->height; y++) { -
import/import_ffmpeg.c
a b 59 59 60 60 // fourCC to ID mapping taken from MPlayer's codecs.conf 61 61 static struct ffmpeg_codec ffmpeg_codecs[] = { 62 { CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",62 {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", 63 63 {"MP41", "DIV1", ""}}, 64 { CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",64 {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", 65 65 {"MP42", "DIV2", ""}}, 66 { CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",66 {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", 67 67 {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, 68 { CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",68 {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", 69 69 {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, 70 { CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",70 {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", 71 71 {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, 72 { CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",72 {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", 73 73 {"MPG1", ""}}, 74 { CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",74 {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", 75 75 {"DVSD", ""}}, 76 { CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",76 {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", 77 77 {"WMV1", ""}}, 78 { CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",78 {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", 79 79 {"WMV2", ""}}, 80 { CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",80 {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", 81 81 {"HFYU", ""}}, 82 { CODEC_ID_H263I, TC_CODEC_H263I, "h263i",82 {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", 83 83 {"I263", ""}}, 84 { CODEC_ID_H263P, TC_CODEC_H263P, "h263p",84 {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", 85 85 {"H263", "U263", "VIV1", ""}}, 86 { CODEC_ID_H264, TC_CODEC_H264, "h264",86 {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", 87 87 {"H264", "h264", "X264", "x264", "avc1", ""}}, 88 { CODEC_ID_RV10, TC_CODEC_RV10, "rv10",88 {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", 89 89 {"RV10", "RV13", ""}}, 90 { CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",90 {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", 91 91 {"SVQ1", ""}}, 92 { CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",92 {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", 93 93 {"SVQ3", ""}}, 94 { CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",94 {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", 95 95 {"MPG2", ""}}, 96 { CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",96 {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", 97 97 {"MPG2", ""}}, 98 { CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",98 {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", 99 99 {"ASV1", ""}}, 100 { CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",100 {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", 101 101 {"ASV2", ""}}, 102 { CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",102 {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", 103 103 {"FFV1", ""}}, 104 { CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",104 {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", 105 105 {"I420", "IYUV", ""}}, 106 { CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",106 {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", 107 107 {"Y42B", ""}}, 108 108 {0, TC_CODEC_UNKNOWN, NULL, {""}}}; 109 109 … … 302 302 303 303 // Set these to the expected values so that ffmpeg's decoder can 304 304 // properly detect interlaced input. 305 lavc_dec_context = avcodec_alloc_context ();305 lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); 306 306 if (lavc_dec_context == NULL) { 307 307 tc_log_error(MOD_NAME, "Could not allocate enough memory."); 308 308 return TC_IMPORT_ERROR; … … 314 314 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) 315 315 lavc_dec_context->error_resilience = 2; 316 316 #else 317 lavc_dec_context->err or_recognition = 2;317 lavc_dec_context->err_recognition = 2; 318 318 #endif 319 319 lavc_dec_context->error_concealment = 3; 320 320 lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; … … 324 324 // XXX: some codecs need extra data 325 325 switch (codec->id) 326 326 { 327 case CODEC_ID_MJPEG: extra_data_size = 28; break;328 case CODEC_ID_LJPEG: extra_data_size = 28; break;329 case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;330 case CODEC_ID_ASV1: extra_data_size = 8; break;331 case CODEC_ID_ASV2: extra_data_size = 8; break;332 case CODEC_ID_WMV1: extra_data_size = 4; break;333 case CODEC_ID_WMV2: extra_data_size = 4; break;327 case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; 328 case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; 329 case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; 330 case AV_CODEC_ID_ASV1: extra_data_size = 8; break; 331 case AV_CODEC_ID_ASV2: extra_data_size = 8; break; 332 case AV_CODEC_ID_WMV1: extra_data_size = 4; break; 333 case AV_CODEC_ID_WMV2: extra_data_size = 4; break; 334 334 default: extra_data_size = 0; break; 335 335 } 336 336 … … 344 344 } 345 345 346 346 TC_LOCK_LIBAVCODEC; 347 ret = avcodec_open (lavc_dec_context, lavc_dec_codec);347 ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); 348 348 TC_UNLOCK_LIBAVCODEC; 349 349 if (ret < 0) { 350 350 tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", … … 360 360 frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); 361 361 362 362 // we adapt the color space 363 if(codec->id == CODEC_ID_MJPEG) {363 if(codec->id == AV_CODEC_ID_MJPEG) { 364 364 enable_levels_filter(); 365 365 } 366 366 break; … … 434 434 } 435 435 436 436 // we adapt the color space 437 if(codec->id == CODEC_ID_MJPEG) {437 if(codec->id == AV_CODEC_ID_MJPEG) { 438 438 enable_levels_filter(); 439 439 } 440 440 … … 504 504 int bkey = 0; 505 505 506 506 // check for keyframes 507 if (codec->id == CODEC_ID_MSMPEG4V3) {507 if (codec->id == AV_CODEC_ID_MSMPEG4V3) { 508 508 if (divx3_is_key(buffer)) bkey = 1; 509 509 } 510 else if (codec->id == CODEC_ID_MPEG4) {510 else if (codec->id == AV_CODEC_ID_MPEG4) { 511 511 if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; 512 512 } 513 else if (codec->id == CODEC_ID_MJPEG) {513 else if (codec->id == AV_CODEC_ID_MJPEG) { 514 514 bkey = 1; 515 515 } 516 516 … … 580 580 581 581 // Convert avcodec image to our internal YUV or RGB format 582 582 switch (lavc_dec_context->pix_fmt) { 583 case PIX_FMT_YUVJ420P:584 case PIX_FMT_YUV420P:583 case AV_PIX_FMT_YUVJ420P: 584 case AV_PIX_FMT_YUV420P: 585 585 src_fmt = IMG_YUV420P; 586 586 YUV_INIT_PLANES(src_planes, frame, src_fmt, 587 587 lavc_dec_context->width, lavc_dec_context->height); … … 612 612 } 613 613 break; 614 614 615 case PIX_FMT_YUV411P:615 case AV_PIX_FMT_YUV411P: 616 616 src_fmt = IMG_YUV411P; 617 617 YUV_INIT_PLANES(src_planes, frame, src_fmt, 618 618 lavc_dec_context->width, lavc_dec_context->height); … … 640 640 } 641 641 break; 642 642 643 case PIX_FMT_YUVJ422P:644 case PIX_FMT_YUV422P:643 case AV_PIX_FMT_YUVJ422P: 644 case AV_PIX_FMT_YUV422P: 645 645 src_fmt = IMG_YUV422P; 646 646 YUV_INIT_PLANES(src_planes, frame, src_fmt, 647 647 lavc_dec_context->width, lavc_dec_context->height); … … 669 669 } 670 670 break; 671 671 672 case PIX_FMT_YUVJ444P:673 case PIX_FMT_YUV444P:672 case AV_PIX_FMT_YUVJ444P: 673 case AV_PIX_FMT_YUV444P: 674 674 src_fmt = IMG_YUV444P; 675 675 YUV_INIT_PLANES(src_planes, frame, src_fmt, 676 676 lavc_dec_context->width, lavc_dec_context->height); -
import/probe_ffmpeg.c
a b 99 99 100 100 TC_INIT_LIBAVCODEC; 101 101 102 ret = av _open_input_file(&lavf_dmx_context, ipipe->name,103 NULL, 0,NULL);102 ret = avformat_open_input(&lavf_dmx_context, ipipe->name, 103 NULL, NULL); 104 104 if (ret != 0) { 105 105 tc_log_error(__FILE__, "unable to open '%s'" 106 106 " (libavformat failure)", … … 109 109 return; 110 110 } 111 111 112 ret = av _find_stream_info(lavf_dmx_context);112 ret = avformat_find_stream_info(lavf_dmx_context, NULL); 113 113 if (ret < 0) { 114 114 tc_log_error(__FILE__, "unable to fetch informations from '%s'" 115 115 " (libavformat failure)", … … 120 120 121 121 translate_info(lavf_dmx_context, ipipe->probe_info); 122 122 123 #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) 124 avformat_close_input(&lavf_dmx_context); 125 #else 123 126 av_close_input_file(lavf_dmx_context); 127 #endif 124 128 return; 125 129 } 126 130 -
libtc/tcavcodec.h
a b 53 53 54 54 #define TC_INIT_LIBAVCODEC do { \ 55 55 TC_LOCK_LIBAVCODEC; \ 56 avcodec_init(); \57 56 avcodec_register_all(); \ 58 57 TC_UNLOCK_LIBAVCODEC; \ 59 58 } while (0)