...
|
...
|
@@ -307,22 +307,18 @@ static void process_chrominance(uint8_t *udst, uint8_t *vdst, const int dst_line
|
307
|
307
|
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
|
308
|
308
|
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
|
309
|
309
|
|
310
|
|
-static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpic)
|
|
310
|
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *inpic)
|
311
|
311
|
{
|
312
|
312
|
HueContext *hue = inlink->dst->priv;
|
313
|
313
|
AVFilterLink *outlink = inlink->dst->outputs[0];
|
314
|
|
- AVFilterBufferRef *buf_out;
|
|
314
|
+ AVFilterBufferRef *outpic;
|
315
|
315
|
|
316
|
|
- outlink->out_buf = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
|
317
|
|
- if (!outlink->out_buf)
|
318
|
|
- return AVERROR(ENOMEM);
|
319
|
|
-
|
320
|
|
- avfilter_copy_buffer_ref_props(outlink->out_buf, inpic);
|
321
|
|
- outlink->out_buf->video->w = outlink->w;
|
322
|
|
- outlink->out_buf->video->h = outlink->h;
|
323
|
|
- buf_out = avfilter_ref_buffer(outlink->out_buf, ~0);
|
324
|
|
- if (!buf_out)
|
|
316
|
+ outpic = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
|
|
317
|
+ if (!outpic) {
|
|
318
|
+ avfilter_unref_bufferp(&inpic);
|
325
|
319
|
return AVERROR(ENOMEM);
|
|
320
|
+ }
|
|
321
|
+ avfilter_copy_buffer_ref_props(outpic, inpic);
|
326
|
322
|
|
327
|
323
|
if (!hue->flat_syntax) {
|
328
|
324
|
hue->var_values[VAR_T] = TS2T(inpic->pts, inlink->time_base);
|
...
|
...
|
@@ -356,35 +352,17 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpic)
|
356
|
356
|
|
357
|
357
|
hue->var_values[VAR_N] += 1;
|
358
|
358
|
|
359
|
|
- return ff_start_frame(outlink, buf_out);
|
360
|
|
-}
|
361
|
|
-
|
362
|
|
-static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
|
363
|
|
-{
|
364
|
|
- HueContext *hue = inlink->dst->priv;
|
365
|
|
- AVFilterBufferRef *inpic = inlink->cur_buf;
|
366
|
|
- AVFilterBufferRef *outpic = inlink->dst->outputs[0]->out_buf;
|
367
|
|
- uint8_t *inrow[3], *outrow[3]; // 0 : Y, 1 : U, 2 : V
|
368
|
|
- int plane;
|
369
|
|
-
|
370
|
|
- inrow[0] = inpic->data[0] + y * inpic->linesize[0];
|
371
|
|
- outrow[0] = outpic->data[0] + y * outpic->linesize[0];
|
372
|
|
-
|
373
|
|
- for (plane = 1; plane < 3; plane++) {
|
374
|
|
- inrow[plane] = inpic->data[plane] + (y >> hue->vsub) * inpic->linesize[plane];
|
375
|
|
- outrow[plane] = outpic->data[plane] + (y >> hue->vsub) * outpic->linesize[plane];
|
376
|
|
- }
|
377
|
|
-
|
378
|
|
- av_image_copy_plane(outrow[0], outpic->linesize[0],
|
379
|
|
- inrow[0], inpic->linesize[0],
|
|
359
|
+ av_image_copy_plane(outpic->data[0], outpic->linesize[0],
|
|
360
|
+ inpic->data[0], inpic->linesize[0],
|
380
|
361
|
inlink->w, inlink->h);
|
381
|
362
|
|
382
|
|
- process_chrominance(outrow[1], outrow[2], outpic->linesize[1],
|
383
|
|
- inrow[1], inrow[2], inpic->linesize[1],
|
|
363
|
+ process_chrominance(outpic->data[1], outpic->data[2], outpic->linesize[1],
|
|
364
|
+ inpic->data[1], inpic->data[2], inpic->linesize[1],
|
384
|
365
|
inlink->w >> hue->hsub, inlink->h >> hue->vsub,
|
385
|
366
|
hue->hue_cos, hue->hue_sin);
|
386
|
367
|
|
387
|
|
- return ff_draw_slice(inlink->dst->outputs[0], y, h, slice_dir);
|
|
368
|
+ avfilter_unref_bufferp(&inpic);
|
|
369
|
+ return ff_filter_frame(outlink, outpic);
|
388
|
370
|
}
|
389
|
371
|
|
390
|
372
|
static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
|
...
|
...
|
@@ -400,8 +378,7 @@ static const AVFilterPad hue_inputs[] = {
|
400
|
400
|
{
|
401
|
401
|
.name = "default",
|
402
|
402
|
.type = AVMEDIA_TYPE_VIDEO,
|
403
|
|
- .start_frame = start_frame,
|
404
|
|
- .draw_slice = draw_slice,
|
|
403
|
+ .filter_frame = filter_frame,
|
405
|
404
|
.config_props = config_props,
|
406
|
405
|
.min_perms = AV_PERM_READ,
|
407
|
406
|
},
|