forked from tsukuba-linux/yasy
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathffmpeg.c.rej
566 lines (536 loc) · 19.1 KB
/
ffmpeg.c.rej
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
***************
*** 41,46 ****
#include "libavutil/avstring.h"
#include "libavformat/os_support.h"
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
#include <sys/resource.h>
--- 41,53 ----
#include "libavutil/avstring.h"
#include "libavformat/os_support.h"
+ #if CONFIG_AVFILTER
+ # include "libavfilter/avfilter.h"
+ # include "libavfilter/avfiltergraph.h"
+ # include "libavfilter/graphparser.h"
+ # include "libavfilter/vsrc_buffer.h"
+ #endif
+
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
#include <sys/resource.h>
***************
*** 142,147 ****
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
static int intra_only = 0;
static int audio_sample_rate = 44100;
--- 149,158 ----
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
+ #if CONFIG_AVFILTER
+ static char *vfilters = NULL;
+ AVFilterGraph *filt_graph_all = NULL;
+ #endif
static int intra_only = 0;
static int audio_sample_rate = 44100;
***************
*** 298,303 ****
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
} AVInputStream;
typedef struct AVInputFile {
--- 309,321 ----
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
+ #if CONFIG_AVFILTER
+ AVFilterContext *out_video_filter;
+ AVFilterContext *input_video_filter;
+ AVFrame *filter_frame;
+ int has_filter_frame;
+ AVFilterPicRef *picref;
+ #endif
} AVInputStream;
typedef struct AVInputFile {
***************
*** 313,318 ****
static struct termios oldtty;
#endif
static void term_exit(void)
{
#if HAVE_TERMIOS_H
--- 331,516 ----
static struct termios oldtty;
#endif
+ #if CONFIG_AVFILTER
+ typedef struct {
+ int pix_fmt;
+ } FilterOutPriv;
+
+
+ static int output_init(AVFilterContext *ctx, const char *args, void *opaque)
+ {
+ FilterOutPriv *priv = ctx->priv;
+
+ if(!opaque) return -1;
+
+ priv->pix_fmt = *((int *)opaque);
+
+ return 0;
+ }
+
+ static void output_end_frame(AVFilterLink *link)
+ {
+ }
+
+ static int output_query_formats(AVFilterContext *ctx)
+ {
+ FilterOutPriv *priv = ctx->priv;
+ enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE };
+
+ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
+ return 0;
+ }
+
+ static int get_filtered_video_pic(AVFilterContext *ctx,
+ AVFilterPicRef **picref, AVFrame *pic2,
+ uint64_t *pts)
+ {
+ AVFilterPicRef *pic;
+
+ if(avfilter_request_frame(ctx->inputs[0]))
+ return -1;
+ if(!(pic = ctx->inputs[0]->cur_pic))
+ return -1;
+ *picref = pic;
+ ctx->inputs[0]->cur_pic = NULL;
+
+ *pts = pic->pts;
+
+ memcpy(pic2->data, pic->data, sizeof(pic->data));
+ memcpy(pic2->linesize, pic->linesize, sizeof(pic->linesize));
+
+ return 1;
+ }
+
+ static AVFilter output_filter =
+ {
+ .name = "ffmpeg_output",
+
+ .priv_size = sizeof(FilterOutPriv),
+ .init = output_init,
+
+ .query_formats = output_query_formats,
+
+ .inputs = (AVFilterPad[]) {{ .name = "default",
+ .type = CODEC_TYPE_VIDEO,
+ .end_frame = output_end_frame,
+ .min_perms = AV_PERM_READ, },
+ { .name = NULL }},
+ .outputs = (AVFilterPad[]) {{ .name = NULL }},
+ };
+
+ static int configure_filters(AVInputStream *ist, AVOutputStream *ost)
+ {
+ AVFilterContext *curr_filter;
+ /** filter graph containing all filters including input & output */
+ AVCodecContext *codec = ost->st->codec;
+ AVCodecContext *icodec = ist->st->codec;
+ char args[255];
+
+ filt_graph_all = av_mallocz(sizeof(AVFilterGraph));
+
+ avfilter_register_all();
+
+ if(!(ist->input_video_filter = avfilter_open(avfilter_get_by_name("buffer"), "src")))
+ return -1;
+ if(!(ist->out_video_filter = avfilter_open(&output_filter, "out")))
+ return -1;
+
+ snprintf(args, 255, "%d:%d:%d", ist->st->codec->width,
+ ist->st->codec->height, ist->st->codec->pix_fmt);
+ if(avfilter_init_filter(ist->input_video_filter, args, NULL))
+ return -1;
+ if(avfilter_init_filter(ist->out_video_filter, NULL, &codec->pix_fmt))
+ return -1;
+
+ /* add input and output filters to the overall graph */
+ avfilter_graph_add_filter(filt_graph_all, ist->input_video_filter);
+ avfilter_graph_add_filter(filt_graph_all, ist->out_video_filter);
+
+ curr_filter = ist->input_video_filter;
+
+ if(ost->video_crop) {
+ char crop_args[255];
+ AVFilterContext *filt_crop;
+ snprintf(crop_args, 255, "%d:%d:%d:%d", ost->leftBand, ost->topBand,
+ codec->width - (frame_padleft + frame_padright),
+ codec->height - (frame_padtop + frame_padbottom));
+ filt_crop = avfilter_open(avfilter_get_by_name("crop"), NULL);
+ if (!filt_crop)
+ return -1;
+ if (avfilter_init_filter(filt_crop, crop_args, NULL))
+ return -1;
+ if (avfilter_link(curr_filter, 0, filt_crop, 0))
+ return -1;
+ curr_filter = filt_crop;
+ avfilter_graph_add_filter(filt_graph_all, curr_filter);
+ }
+
+ if((codec->width !=
+ icodec->width - (frame_leftBand + frame_rightBand) +
+ (frame_padleft + frame_padright)) ||
+ (codec->height != icodec->height - (frame_topBand + frame_bottomBand) +
+ (frame_padtop + frame_padbottom))) {
+ char crop_args[255];
+ AVFilterContext *filt_scale;
+ snprintf(crop_args, 255, "%d:%d:sws_flags=%d",
+ codec->width - (frame_padleft + frame_padright),
+ codec->height - (frame_padtop + frame_padbottom),
+ (int)av_get_int(sws_opts, "sws_flags", NULL));
+ filt_scale = avfilter_open(avfilter_get_by_name("scale"), NULL);
+ if (!filt_scale)
+ return -1;
+ if (avfilter_init_filter(filt_scale, crop_args, NULL))
+ return -1;
+ if (avfilter_link(curr_filter, 0, filt_scale, 0))
+ return -1;
+ curr_filter = filt_scale;
+ avfilter_graph_add_filter(filt_graph_all, curr_filter);
+ }
+
+ if(vfilters) {
+ AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut));
+ AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
+
+ outputs->name = av_strdup("in");
+ outputs->filter = curr_filter;
+ outputs->pad_idx = 0;
+ outputs->next = NULL;
+
+ inputs->name = av_strdup("out");
+ inputs->filter = ist->out_video_filter;
+ inputs->pad_idx = 0;
+ inputs->next = NULL;
+
+ if (avfilter_graph_parse(filt_graph_all, vfilters, inputs, outputs, NULL) < 0)
+ return -1;
+ av_freep(&vfilters);
+ } else {
+ if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0)
+ return -1;
+ }
+
+ {
+ char scale_sws_opts[128];
+ snprintf(scale_sws_opts, sizeof(scale_sws_opts), "sws_flags=%d", (int)av_get_int(sws_opts, "sws_flags", NULL));
+ filt_graph_all->scale_sws_opts = av_strdup(scale_sws_opts);
+ }
+
+ /* configure all the filter links */
+ if(avfilter_graph_check_validity(filt_graph_all, NULL))
+ return -1;
+ if(avfilter_graph_config_formats(filt_graph_all))
+ return -1;
+ if(avfilter_graph_config_links(filt_graph_all, NULL))
+ return -1;
+
+ codec->width = ist->out_video_filter->inputs[0]->w;
+ codec->height = ist->out_video_filter->inputs[0]->h;
+
+ return 0;
+ }
+ #endif /* CONFIG_AVFILTER */
+
static void term_exit(void)
{
#if HAVE_TERMIOS_H
***************
*** 453,458 ****
av_free(audio_out2);
av_free(samples);
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
--- 651,660 ----
av_free(audio_out2);
av_free(samples);
+ #if CONFIG_AVFILTER
+ avfilter_uninit();
+ #endif
+
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
***************
*** 867,873 ****
int *frame_size)
{
int nb_frames, i, ret;
int64_t topBand, bottomBand, leftBand, rightBand;
AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
AVFrame picture_crop_temp, picture_pad_temp;
AVCodecContext *enc, *dec;
--- 1069,1077 ----
int *frame_size)
{
int nb_frames, i, ret;
+ #if !CONFIG_AVFILTER
int64_t topBand, bottomBand, leftBand, rightBand;
+ #endif
AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
AVFrame picture_crop_temp, picture_pad_temp;
AVCodecContext *enc, *dec;
***************
*** 913,918 ****
if (nb_frames <= 0)
return;
if (ost->video_crop) {
if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
fprintf(stderr, "error cropping picture\n");
--- 1117,1125 ----
if (nb_frames <= 0)
return;
+ #if CONFIG_AVFILTER
+ formatted_picture = in_picture;
+ #else
if (ost->video_crop) {
if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
fprintf(stderr, "error cropping picture\n");
***************
*** 924,929 ****
} else {
formatted_picture = in_picture;
}
final_picture = formatted_picture;
padding_src = formatted_picture;
--- 1131,1137 ----
} else {
formatted_picture = in_picture;
}
+ #endif
final_picture = formatted_picture;
padding_src = formatted_picture;
***************
*** 941,946 ****
}
}
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
--- 1149,1155 ----
}
}
+ #if !CONFIG_AVFILTER
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
***************
*** 989,994 ****
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
--- 1198,1204 ----
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
+ #endif
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
***************
*** 1255,1260 ****
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
--- 1465,1474 ----
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
+ #if CONFIG_AVFILTER
+ int loop;
+ #endif
+
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
***************
*** 1377,1382 ****
&buffer_to_free);
}
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
--- 1591,1605 ----
&buffer_to_free);
}
+ #if CONFIG_AVFILTER
+ if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO && ist->input_video_filter) {
+ // add it to be filtered
+ av_vsrc_buffer_add_frame(ist->input_video_filter, &picture,
+ ist->pts,
+ ist->st->codec->sample_aspect_ratio);
+ }
+ #endif
+
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
***************
*** 1398,1407 ****
if (pts > now)
usleep(pts - now);
}
-
/* if output time reached then transcode raw format,
encode packets and output them */
if (start_time == 0 || ist->pts >= start_time)
for(i=0;i<nb_ostreams;i++) {
int frame_size;
--- 1621,1638 ----
if (pts > now)
usleep(pts - now);
}
+ #if CONFIG_AVFILTER
+ loop = ist->st->codec->codec_type != CODEC_TYPE_VIDEO ||
+ !ist->out_video_filter || avfilter_poll_frame(ist->out_video_filter->inputs[0]);
+ #endif
/* if output time reached then transcode raw format,
encode packets and output them */
if (start_time == 0 || ist->pts >= start_time)
+ #if CONFIG_AVFILTER
+ while(loop) {
+ if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO && ist->out_video_filter)
+ get_filtered_video_pic(ist->out_video_filter, &ist->picref, &picture, &ist->pts);
+ #endif
for(i=0;i<nb_ostreams;i++) {
int frame_size;
***************
*** 1418,1423 ****
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
do_video_out(os, ost, ist, &picture, &frame_size);
if (vstats_filename && frame_size)
do_video_stats(os, ost, frame_size);
--- 1649,1657 ----
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
+ #if CONFIG_AVFILTER
+ ost->st->codec->sample_aspect_ratio = ist->picref->pixel_aspect;
+ #endif
do_video_out(os, ost, ist, &picture, &frame_size);
if (vstats_filename && frame_size)
do_video_stats(os, ost, frame_size);
***************
*** 1483,1489 ****
av_free_packet(&opkt);
}
}
}
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
--- 1717,1733 ----
av_free_packet(&opkt);
}
}
+ #if CONFIG_AVFILTER
+ loop = (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) &&
+ ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]);
+ #endif
}
+
+ #if CONFIG_AVFILTER
+ if(ist->picref)
+ avfilter_unref_pic(ist->picref);
+ }
+ #endif
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
***************
*** 1937,1952 ****
av_exit(1);
}
ost->original_height = icodec->height;
ost->original_width = icodec->width;
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
ost->resample_width = icodec->width - (frame_leftBand + frame_rightBand);
ost->resample_pix_fmt= icodec->pix_fmt;
codec->bits_per_raw_sample= 0;
}
ost->encoding_needed = 1;
ist->decoding_needed = 1;
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
--- 2181,2207 ----
av_exit(1);
}
+ #if CONFIG_AVFILTER
+ ost->resample_height = icodec->height;
+ #else
ost->original_height = icodec->height;
ost->original_width = icodec->width;
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
ost->resample_width = icodec->width - (frame_leftBand + frame_rightBand);
ost->resample_pix_fmt= icodec->pix_fmt;
+ #endif
codec->bits_per_raw_sample= 0;
}
ost->encoding_needed = 1;
ist->decoding_needed = 1;
+
+ #if CONFIG_AVFILTER
+ if (configure_filters(ist, ost)) {
+ fprintf(stderr, "Error opening filters!\n");
+ exit(1);
+ }
+ #endif
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
***************
*** 2333,2338 ****
avcodec_close(ist->st->codec);
}
}
/* finished ! */
ret = 0;
--- 2588,2599 ----
avcodec_close(ist->st->codec);
}
}
+ #if CONFIG_AVFILTER
+ if (filt_graph_all) {
+ avfilter_graph_destroy(filt_graph_all);
+ av_freep(&filt_graph_all);
+ }
+ #endif
/* finished ! */
ret = 0;
***************
*** 3899,3904 ****
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
--- 4160,4168 ----
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
+ #if CONFIG_AVFILTER
+ { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
+ #endif
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },