1 Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
2 ===================================================================
3 --- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
4 +++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
5 @@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t
6
7 #if DECODE_AUDIO3 || DECODE_AUDIO4
8 codec->pkt.data = codec->chunk_buffer;
9 - codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
10 + codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
11
12 #if DECODE_AUDIO4
13 frame_bytes = avcodec_decode_audio4(codec->avctx, &f,
14 @@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t
15 (codec->sample_buffer_end - codec->sample_buffer_start)],
16 &bytes_decoded,
17 codec->chunk_buffer,
18 - packet_size + FF_INPUT_BUFFER_PADDING_SIZE);
19 + packet_size + AV_INPUT_BUFFER_PADDING_SIZE);
20 if(frame_bytes < 0)
21 {
22 lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");
23 @@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi
24 return 0;
25 }
26
27 - if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE)
28 + if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE)
29 {
30 - codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE;
31 + codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE;
32 codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc);
33 }
34 memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,
35 - mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
36 + mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
37 num_samples = mph.samples_per_frame;
38 codec->bytes_in_chunk_buffer = mph.frame_bytes;
39 }
40 @@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi
41 {
42
43
44 - /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size
45 + /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size
46 because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */
47
48 /* Some really broken mp3 files have the header bytes split across 2 chunks */
49 @@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi
50
51 #if DECODE_AUDIO3 || DECODE_AUDIO4
52 codec->pkt.data = &codec->chunk_buffer[bytes_used];
53 - codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
54 + codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE;
55
56 #if DECODE_AUDIO4
57
58 @@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi
59 (codec->sample_buffer_end - codec->sample_buffer_start)],
60 &bytes_decoded,
61 &codec->chunk_buffer[bytes_used],
62 - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);
63 + codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);
64 #endif
65 if(frame_bytes < 0)
66 {
67 @@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi
68 }
69 }
70
71 - /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
72 + /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */
73
74 if(codec->bytes_in_chunk_buffer < 0)
75 codec->bytes_in_chunk_buffer = 0;
76 Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
77 ===================================================================
78 --- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
79 +++ libquicktime-1.2.4/plugins/ffmpeg/params.c
80 @@ -124,16 +124,6 @@ typedef struct
81 }
82
83
84 -enum_t me_method[] =
85 - {
86 - { "Zero", ME_ZERO },
87 - { "Phods", ME_PHODS },
88 - { "Log", ME_LOG },
89 - { "X1", ME_X1 },
90 - { "Epzs", ME_EPZS },
91 - { "Full", ME_FULL }
92 - };
93 -
94 enum_t prediction_method[] =
95 {
96 { "Left", FF_PRED_LEFT },
97 @@ -163,15 +153,6 @@ enum_t mb_decision[] =
98 { "Rate distoration", FF_MB_DECISION_RD }
99 };
100
101 -enum_t coder_type[] =
102 - {
103 - { "VLC", FF_CODER_TYPE_VLC },
104 - { "Arithmetic", FF_CODER_TYPE_AC },
105 - { "Raw", FF_CODER_TYPE_RAW },
106 - { "RLE", FF_CODER_TYPE_RLE },
107 - { "Deflate", FF_CODER_TYPE_DEFLATE },
108 - };
109 -
110 #define PARAM_ENUM(name, var, arr) \
111 if(!strcasecmp(key, name)) \
112 { \
113 @@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
114 PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000);
115 PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000);
116 PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000);
117 - PARAM_ENUM("ff_me_method",me_method,me_method);
118 + PARAM_DICT_INT("ff_me_method","motion-est");
119 PARAM_INT("ff_gop_size",gop_size);
120 PARAM_FLOAT("ff_qcompress",qcompress);
121 PARAM_FLOAT("ff_qblur",qblur);
122 @@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
123 PARAM_INT("ff_rc_min_rate",rc_min_rate);
124 PARAM_INT("ff_rc_max_rate",rc_max_rate);
125 PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000);
126 - PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity);
127 PARAM_FLOAT("ff_i_quant_factor",i_quant_factor);
128 PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset);
129 - PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx);
130 + PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx");
131 PARAM_FLOAT("ff_lumi_masking",lumi_masking);
132 PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking);
133 PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking);
134 @@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
135 PARAM_INT("ff_me_range",me_range);
136 PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision);
137 PARAM_INT("ff_scenechange_threshold",scenechange_threshold);
138 - PARAM_QP2LAMBDA("ff_lmin", lmin);
139 - PARAM_QP2LAMBDA("ff_lmax", lmax);
140 + PARAM_DICT_INT("ff_lmin", "lmin");
141 + PARAM_DICT_INT("ff_lmax", "lmax");
142 PARAM_INT("ff_noise_reduction",noise_reduction);
143 PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
144
145 @@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
146 #endif
147
148 PARAM_INT("ff_thread_count",thread_count);
149 - PARAM_INT("ff_me_threshold",me_threshold);
150 - PARAM_INT("ff_mb_threshold",mb_threshold);
151 PARAM_INT("ff_nsse_weight",nsse_weight);
152 - PARAM_FLOAT("ff_border_masking",border_masking);
153 + PARAM_DICT_INT("ff_border_masking","border_mask");
154 PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin);
155 PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax);
156 PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
157 PARAM_INT("ff_bidir_refine",bidir_refine);
158 PARAM_INT("ff_brd_scale",brd_scale);
159 - PARAM_INT("ff_scenechange_factor",scenechange_factor);
160 - PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
161 - PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
162 - PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
163 - PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
164 - PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
165 + PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE);
166 + PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV);
167 + PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL);
168 + PARAM_DICT_FLAG("ff_flag_gmc","gmc");
169 + PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags");
170 // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
171 - PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
172 - PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
173 - PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
174 + PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY);
175 + PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq");
176 // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
177 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
178 PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT);
179 #else
180 PARAM_INT("ff_trellis",trellis);
181 #endif
182 - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
183 - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
184 + PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT);
185 + PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED);
186 // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
187
188 #if LIBAVCODEC_VERSION_MAJOR >= 55
189 @@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
190 PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
191 PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
192 #else
193 - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
194 - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
195 - PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
196 + PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD);
197 + PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD);
198 + PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP);
199 #endif
200
201 #if LIBAVCODEC_VERSION_MAJOR >= 54
202 @@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
203 PARAM_DICT_FLAG("ff_flag_obmc","obmc");
204 PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices");
205 #else
206 - PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV);
207 - PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC);
208 - PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT);
209 + PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV);
210 + PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC);
211 + PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT);
212 #endif
213
214 - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
215 - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
216 - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
217 - PARAM_ENUM("ff_coder_type",coder_type,coder_type);
218 + PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER);
219 + PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP);
220 + PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST);
221 + PARAM_DICT_INT("ff_coder_type","coder");
222
223 }
224 Index: libquicktime-1.2.4/plugins/ffmpeg/params.h
225 ===================================================================
226 --- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h
227 +++ libquicktime-1.2.4/plugins/ffmpeg/params.h
228 @@ -149,7 +149,7 @@ the reference. Unused for constant quant
229 .type = LQT_PARAMETER_INT, \
230 .val_default = { .val_int = 0 }, \
231 .val_min = { .val_int = 0 }, \
232 - .val_max = { .val_int = FF_MAX_B_FRAMES }, \
233 + .val_max = { .val_int = 16 }, \
234 .help_string = TRS("Maximum number of B-frames between non B-frames") \
235 }
236
237 Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
238 ===================================================================
239 --- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
240 +++ libquicktime-1.2.4/plugins/ffmpeg/video.c
241 @@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick
242 if(extradata)
243 {
244 codec->extradata =
245 - calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
246 + calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
247 memcpy(codec->extradata, extradata, extradata_size);
248 codec->avctx->extradata_size = extradata_size;
249 codec->avctx->extradata = codec->extradata;
250 @@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t
251 codec->avctx->qmin = 1;
252 codec->avctx->qmax = 3;
253 codec->avctx->rtp_payload_size = 1; // ??
254 - codec->avctx->rc_buffer_aggressivity = 0.25;
255 - codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
256 + av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0);
257 + codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY;
258
259 #if (LIBAVCODEC_VERSION_MAJOR < 54)
260 codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT;
261 @@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick
262 // codec->avctx->time_base.den = 1;
263 // codec->avctx->time_base.num = lqt_video_time_scale(file, track);
264
265 - if(codec->avctx->flags & CODEC_FLAG_QSCALE)
266 + if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
267 codec->avctx->global_quality = codec->qscale;
268
269 codec->avctx->width = width;
270 @@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick
271 {
272 if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
273 {
274 - codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
275 + codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
276 codec->write_global_header = 1;
277 }
278
279 @@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick
280 {
281 lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding");
282 codec->avctx->flags |=
283 - (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN);
284 + (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN);
285 }
286 #endif
287 }
288 @@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick
289 {
290 if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
291 {
292 - codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
293 + codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
294 codec->write_global_header = 1;
295 }
296 }
297 @@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick
298 {
299 if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
300 {
301 - codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT;
302 + codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
303 }
304 }
305 else if(codec->is_imx)
306 @@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick
307 if(codec->pass == 1)
308 {
309 codec->stats_file = fopen(codec->stats_filename, "w");
310 - codec->avctx->flags |= CODEC_FLAG_PASS1;
311 + codec->avctx->flags |= AV_CODEC_FLAG_PASS1;
312 }
313 else if(codec->pass == codec->total_passes)
314 {
315 @@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick
316 fclose(codec->stats_file);
317 codec->stats_file = (FILE*)0;
318
319 - codec->avctx->flags |= CODEC_FLAG_PASS2;
320 + codec->avctx->flags |= AV_CODEC_FLAG_PASS2;
321 }
322 }
323 /* Open codec */
324 @@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick
325 }
326
327 codec->frame->pts = vtrack->timestamp;
328 - if(codec->avctx->flags & CODEC_FLAG_QSCALE)
329 + if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)
330 codec->frame->quality = codec->qscale;
331 #ifdef DO_INTERLACE
332 if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
333 @@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick
334 else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
335 {
336 int advanced = 0;
337 - if(codec->avctx->max_b_frames ||
338 - (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
339 + if(codec->avctx->max_b_frames)
340 advanced = 1;
341
342 setup_header_mpeg4(file, track, codec->avctx->extradata,
|
