[10787] | 1 | Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ |
---|
| 2 | diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h |
---|
| 3 | --- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 |
---|
| 4 | +++ b/plugins/ffmpeg/ffmpeg.h 2013-07-15 15:05:19.307534593 +0200 |
---|
| 5 | @@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon |
---|
| 6 | |
---|
| 7 | |
---|
| 8 | #endif |
---|
| 9 | +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 |
---|
| 10 | +#define CODEC_FLAG2_STRICT_GOP 0x00000002 |
---|
| 11 | +#define CODEC_FLAG_QP_RD 0x08000000 |
---|
| 12 | +#define CODEC_FLAG_CBP_RD 0x04000000 |
---|
| 13 | diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c |
---|
| 14 | --- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 |
---|
| 15 | +++ b/plugins/ffmpeg/lqt_ffmpeg.c 2013-07-15 15:19:09.730831655 +0200 |
---|
| 16 | @@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1; |
---|
| 17 | PARAM_QSCALE, \ |
---|
| 18 | PARAM_QCOMPRESS, \ |
---|
| 19 | PARAM_QBLUR, \ |
---|
| 20 | - PARAM_QUANTIZER_NOISE_SHAPING, \ |
---|
| 21 | PARAM_TRELLIS |
---|
| 22 | |
---|
| 23 | -#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \ |
---|
| 24 | - ENCODE_PARAM_VIDEO_QUANTIZER_I, \ |
---|
| 25 | - PARAM_I_QUANT_FACTOR, \ |
---|
| 26 | - PARAM_I_QUANT_OFFSET |
---|
| 27 | - |
---|
| 28 | -#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \ |
---|
| 29 | - ENCODE_PARAM_VIDEO_QUANTIZER_IP, \ |
---|
| 30 | - PARAM_B_QUANT_FACTOR, \ |
---|
| 31 | - PARAM_B_QUANT_OFFSET |
---|
| 32 | - |
---|
| 33 | #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \ |
---|
| 34 | { \ |
---|
| 35 | .name = "frame_types", \ |
---|
| 36 | @@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod |
---|
| 37 | ENCODE_PARAM_VIDEO_FRAMETYPES_IPB, |
---|
| 38 | PARAM_FLAG_AC_PRED_MPEG4, |
---|
| 39 | ENCODE_PARAM_VIDEO_RATECONTROL, |
---|
| 40 | - ENCODE_PARAM_VIDEO_QUANTIZER_IPB, |
---|
| 41 | PARAM_FLAG_CBP_RD, |
---|
| 42 | ENCODE_PARAM_VIDEO_ME, |
---|
| 43 | PARAM_FLAG_GMC, |
---|
| 44 | @@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod |
---|
| 45 | static lqt_parameter_info_static_t encode_parameters_dx50[] = { |
---|
| 46 | ENCODE_PARAM_VIDEO_FRAMETYPES_IP, |
---|
| 47 | ENCODE_PARAM_VIDEO_RATECONTROL, |
---|
| 48 | - ENCODE_PARAM_VIDEO_QUANTIZER_IP, |
---|
| 49 | ENCODE_PARAM_VIDEO_ME, |
---|
| 50 | ENCODE_PARAM_VIDEO_ME_PRE, |
---|
| 51 | ENCODE_PARAM_VIDEO_MASKING, |
---|
| 52 | @@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod |
---|
| 53 | static lqt_parameter_info_static_t encode_parameters_h263[] = { |
---|
| 54 | ENCODE_PARAM_VIDEO_FRAMETYPES_IP, |
---|
| 55 | ENCODE_PARAM_VIDEO_RATECONTROL, |
---|
| 56 | - ENCODE_PARAM_VIDEO_QUANTIZER_IP, |
---|
| 57 | ENCODE_PARAM_VIDEO_ME, |
---|
| 58 | PARAM_FLAG_4MV, |
---|
| 59 | ENCODE_PARAM_VIDEO_ME_PRE, |
---|
| 60 | @@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod |
---|
| 61 | static lqt_parameter_info_static_t encode_parameters_h263p[] = { |
---|
| 62 | ENCODE_PARAM_VIDEO_FRAMETYPES_IP, |
---|
| 63 | ENCODE_PARAM_VIDEO_RATECONTROL, |
---|
| 64 | - ENCODE_PARAM_VIDEO_QUANTIZER_IP, |
---|
| 65 | ENCODE_PARAM_VIDEO_ME, |
---|
| 66 | PARAM_FLAG_4MV, |
---|
| 67 | ENCODE_PARAM_VIDEO_ME_PRE, |
---|
| 68 | @@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod |
---|
| 69 | static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = { |
---|
| 70 | ENCODE_PARAM_VIDEO_FRAMETYPES_IP, |
---|
| 71 | ENCODE_PARAM_VIDEO_RATECONTROL, |
---|
| 72 | - ENCODE_PARAM_VIDEO_QUANTIZER_IP, |
---|
| 73 | ENCODE_PARAM_VIDEO_ME, |
---|
| 74 | ENCODE_PARAM_VIDEO_ME_PRE, |
---|
| 75 | ENCODE_PARAM_VIDEO_MASKING, |
---|
| 76 | diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c |
---|
| 77 | --- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 |
---|
| 78 | +++ b/plugins/ffmpeg/params.c 2013-07-15 15:09:38.214189953 +0200 |
---|
| 79 | @@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon |
---|
| 80 | PARAM_INT("ff_max_b_frames",max_b_frames); |
---|
| 81 | PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); |
---|
| 82 | PARAM_INT("ff_b_frame_strategy",b_frame_strategy); |
---|
| 83 | +#if (LIBAVCODEC_VERSION_MAJOR < 55) |
---|
| 84 | PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); |
---|
| 85 | PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); |
---|
| 86 | +#endif |
---|
| 87 | PARAM_INT("ff_strict_std_compliance",strict_std_compliance); |
---|
| 88 | PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); |
---|
| 89 | PARAM_INT("ff_rc_min_rate",rc_min_rate); |
---|
| 90 | @@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon |
---|
| 91 | PARAM_QP2LAMBDA("ff_lmax", lmax); |
---|
| 92 | PARAM_INT("ff_noise_reduction",noise_reduction); |
---|
| 93 | PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); |
---|
| 94 | +#if #if (LIBAVCODEC_VERSION_MAJOR < 55) |
---|
| 95 | PARAM_INT("ff_inter_threshold",inter_threshold); |
---|
| 96 | PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); |
---|
| 97 | +#endif |
---|
| 98 | PARAM_INT("ff_thread_count",thread_count); |
---|
| 99 | PARAM_INT("ff_me_threshold",me_threshold); |
---|
| 100 | PARAM_INT("ff_mb_threshold",mb_threshold); |
---|
| 101 | diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h |
---|
| 102 | --- a/plugins/ffmpeg/params.h 2011-05-11 17:13:39.000000000 +0200 |
---|
| 103 | +++ b/plugins/ffmpeg/params.h 2013-07-15 15:09:04.860858069 +0200 |
---|
| 104 | @@ -177,6 +177,7 @@ the reference. Unused for constant quant |
---|
| 105 | .val_max = { .val_int = 1 }, \ |
---|
| 106 | } |
---|
| 107 | |
---|
| 108 | +#if (LIBAVCODEC_VERSION_MAJOR < 55) |
---|
| 109 | #define PARAM_LUMA_ELIM_THRESHOLD \ |
---|
| 110 | { \ |
---|
| 111 | .name = "ff_luma_elim_threshold", \ |
---|
| 112 | @@ -202,6 +203,7 @@ recommendation") \ |
---|
| 113 | chrominamce. Negative values also consider dc \ |
---|
| 114 | coefficient. 7 is JVT recommendation") \ |
---|
| 115 | } |
---|
| 116 | +#endif |
---|
| 117 | |
---|
| 118 | #define PARAM_STRICT_STANDARD_COMPLIANCE \ |
---|
| 119 | { \ |
---|
| 120 | @@ -739,6 +741,7 @@ with max and/or min bitrate, this must b |
---|
| 121 | |
---|
| 122 | /* Does nothing */ |
---|
| 123 | /** Frame types */ |
---|
| 124 | +#if (LIBAVCODEC_VERSION_MAJOR < 55) |
---|
| 125 | #define PARAM_INTER_THRESHOLD \ |
---|
| 126 | { \ |
---|
| 127 | .name = "ff_inter_threshold", \ |
---|
| 128 | @@ -759,6 +762,7 @@ with max and/or min bitrate, this must b |
---|
| 129 | .help_string = TRS("Choose quantization such that noise will be masked by " \ |
---|
| 130 | "similar-frequency content in the image") \ |
---|
| 131 | } |
---|
| 132 | +#endif |
---|
| 133 | |
---|
| 134 | /** Motion estimation */ |
---|
| 135 | #define PARAM_ME_THRESHOLD \ |
---|