---
ffmpeg.c | 4 ++--
ffplay.c | 4 ++--
libavfilter/avfilter.c | 34 +++++++++++++++++-----------------
libavfilter/avfilter.h | 6 +++---
libavfilter/defaults.c | 16 ++++++++--------
libavfilter/vf_drawbox.c | 2 +-
libavfilter/vf_drawtext.c | 2 +-
libavfilter/vf_fade.c | 6 +++---
libavfilter/vf_hflip.c | 4 ++--
libavfilter/vf_negate.c | 4 ++--
libavfilter/vf_pad.c | 8 ++++----
libavfilter/vf_pixdesctest.c | 8 ++++----
libavfilter/vf_rotate.c | 18 +++++++++---------
libavfilter/vf_scale.c | 8 ++++----
libavfilter/vf_split.c | 2 +-
libavfilter/vf_transpose.c | 18 +++++++++---------
libavfilter/vf_unsharp.c | 4 ++--
17 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 104d57e..aec1f79 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -368,10 +368,10 @@ static int get_filtered_video_pic(AVFilterContext *ctx,
if(avfilter_request_frame(ctx->inputs[0]))
return -1;
- if(!(pic = ctx->inputs[0]->cur_pic))
+ if(!(pic = ctx->inputs[0]->cur_buf))
return -1;
*picref = pic;
- ctx->inputs[0]->cur_pic = NULL;
+ ctx->inputs[0]->cur_buf = NULL;
*pts = pic->pts;
diff --git a/ffplay.c b/ffplay.c
index 287e436..c89a8b3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1745,9 +1745,9 @@ static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
if(avfilter_request_frame(ctx->inputs[0]))
return -1;
- if(!(pic = ctx->inputs[0]->cur_pic))
+ if(!(pic = ctx->inputs[0]->cur_buf))
return -1;
- ctx->inputs[0]->cur_pic = NULL;
+ ctx->inputs[0]->cur_buf = NULL;
frame->opaque = pic;
*pts = pic->pts;
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 9b3acd0..98a7204 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -262,14 +262,14 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
link_dpad(link).min_perms, link_dpad(link).rej_perms);
*/
- link->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h);
- link->srcpic = picref;
- avfilter_copy_bufref_props(link->cur_pic, link->srcpic);
+ link->cur_buf = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h);
+ link->src_buf = picref;
+ avfilter_copy_bufref_props(link->cur_buf, link->src_buf);
}
else
- link->cur_pic = picref;
+ link->cur_buf = picref;
- start_frame(link, link->cur_pic);
+ start_frame(link, link->cur_buf);
}
void avfilter_end_frame(AVFilterLink *link)
@@ -283,9 +283,9 @@ void avfilter_end_frame(AVFilterLink *link)
/* unreference the source picture if we're feeding the destination filter
* a copied version dues to permission issues */
- if(link->srcpic) {
- avfilter_unref_buffer(link->srcpic);
- link->srcpic = NULL;
+ if(link->src_buf) {
+ avfilter_unref_buffer(link->src_buf);
+ link->src_buf = NULL;
}
}
@@ -299,29 +299,29 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
FF_DPRINTF_START(NULL, draw_slice); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir);
/* copy the slice if needed for permission reasons */
- if(link->srcpic) {
+ if(link->src_buf) {
vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
for(i = 0; i < 4; i ++) {
- if(link->srcpic->data[i]) {
- src[i] = link->srcpic-> data[i] +
- (y >> (i==0 ? 0 : vsub)) * link->srcpic-> linesize[i];
- dst[i] = link->cur_pic->data[i] +
- (y >> (i==0 ? 0 : vsub)) * link->cur_pic->linesize[i];
+ if(link->src_buf->data[i]) {
+ src[i] = link->src_buf-> data[i] +
+ (y >> (i==0 ? 0 : vsub)) * link->src_buf-> linesize[i];
+ dst[i] = link->cur_buf->data[i] +
+ (y >> (i==0 ? 0 : vsub)) * link->cur_buf->linesize[i];
} else
src[i] = dst[i] = NULL;
}
for(i = 0; i < 4; i ++) {
int planew =
- ff_get_plane_bytewidth(link->format, link->cur_pic->w, i);
+ ff_get_plane_bytewidth(link->format, link->cur_buf->w, i);
if(!src[i]) continue;
for(j = 0; j < h >> (i==0 ? 0 : vsub); j ++) {
memcpy(dst[i], src[i], planew);
- src[i] += link->srcpic ->linesize[i];
- dst[i] += link->cur_pic->linesize[i];
+ src[i] += link->src_buf ->linesize[i];
+ dst[i] += link->cur_buf->linesize[i];
}
}
}
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 80bf74f..96fca21 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -528,10 +528,10 @@ struct AVFilterLink
* for the destination. This should not be accessed directly by the
* filters.
*/
- AVFilterBufferRef *srcpic;
+ AVFilterBufferRef *src_buf;
- AVFilterBufferRef *cur_pic;
- AVFilterBufferRef *outpic;
+ AVFilterBufferRef *cur_buf;
+ AVFilterBufferRef *out_buf;
};
/**
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index 57d470f..d607c31 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -73,9 +73,9 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
out = link->dst->outputs[0];
if(out) {
- out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
- avfilter_copy_bufref_props(out->outpic, picref);
- avfilter_start_frame(out, avfilter_ref_buffer(out->outpic, ~0));
+ out->out_buf = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
+ avfilter_copy_bufref_props(out->out_buf, picref);
+ avfilter_start_frame(out, avfilter_ref_buffer(out->out_buf, ~0));
}
}
@@ -97,13 +97,13 @@ void avfilter_default_end_frame(AVFilterLink *link)
if(link->dst->output_count)
out = link->dst->outputs[0];
- avfilter_unref_buffer(link->cur_pic);
- link->cur_pic = NULL;
+ avfilter_unref_buffer(link->cur_buf);
+ link->cur_buf = NULL;
if(out) {
- if(out->outpic) {
- avfilter_unref_buffer(out->outpic);
- out->outpic = NULL;
+ if(out->out_buf) {
+ avfilter_unref_buffer(out->out_buf);
+ out->out_buf = NULL;
}
avfilter_end_frame(out);
}
diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index 164f869..717da63 100644
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -121,7 +121,7 @@ static void end_frame(AVFilterLink *link)
{
BoxContext *context = link->dst->priv;
AVFilterLink *output = link->dst->outputs[0];
- AVFilterBufferRef *pic = link->cur_pic;
+ AVFilterBufferRef *pic = link->cur_buf;
draw_box(pic,context,context->color);
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 5cfe391..97c610b 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -461,7 +461,7 @@ static void draw_text(AVFilterContext *ctx, AVFilterBufferRef *pic_ref, int widt
static void end_frame(AVFilterLink *link)
{
AVFilterLink *output = link->dst->outputs[0];
- AVFilterBufferRef *pic_ref = link->cur_pic;
+ AVFilterBufferRef *pic_ref = link->cur_buf;
draw_text(link->dst, pic_ref, pic_ref->w, pic_ref->h);
diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index 5166dfa..25a8d58 100644
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -111,7 +111,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterBufferRef *outpicref = avfilter_ref_buffer(picref, ~0);
- link->dst->outputs[0]->outpic = outpicref;
+ link->dst->outputs[0]->out_buf = outpicref;
avfilter_start_frame(link->dst->outputs[0], outpicref);
}
@@ -121,7 +121,7 @@ static void end_frame(AVFilterLink *link)
FadeContext *fade = link->dst->priv;
avfilter_end_frame(link->dst->outputs[0]);
- avfilter_unref_buffer(link->cur_pic);
+ avfilter_unref_buffer(link->cur_buf);
if (fade->frame_index >= fade->start_frame &&
fade->frame_index <= fade->stop_frame)
@@ -133,7 +133,7 @@ static void end_frame(AVFilterLink *link)
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
FadeContext *fade = link->dst->priv;
- AVFilterBufferRef *outpic = link->dst->outputs[0]->outpic;
+ AVFilterBufferRef *outpic = link->dst->outputs[0]->out_buf;
uint8_t *p;
int i, j, plane;
diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c
index 0ae9ec6..8810199 100644
--- a/libavfilter/vf_hflip.c
+++ b/libavfilter/vf_hflip.c
@@ -53,8 +53,8 @@ static int config_props(AVFilterLink *link)
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
FlipContext *flip = link->dst->priv;
- AVFilterBufferRef *in = link->cur_pic;
- AVFilterBufferRef *out = link->dst->outputs[0]->outpic;
+ AVFilterBufferRef *in = link->cur_buf;
+ AVFilterBufferRef *out = link->dst->outputs[0]->out_buf;
uint8_t *inrow, *outrow;
int i, j, plane;
diff --git a/libavfilter/vf_negate.c b/libavfilter/vf_negate.c
index c2b31de..b7e3135 100644
--- a/libavfilter/vf_negate.c
+++ b/libavfilter/vf_negate.c
@@ -67,8 +67,8 @@ static int config_props(AVFilterLink *link)
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
NegContext *neg = link->dst->priv;
- AVFilterBufferRef *in = link->cur_pic;
- AVFilterBufferRef *out = link->dst->outputs[0]->outpic;
+ AVFilterBufferRef *in = link->cur_buf;
+ AVFilterBufferRef *out = link->dst->outputs[0]->out_buf;
uint8_t *inrow, *outrow;
int i, j, plane;
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index e2208b3..24ff034 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -246,7 +246,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
AVFilterBufferRef *outpicref = avfilter_ref_buffer(inpicref, ~0);
int plane;
- inlink->dst->outputs[0]->outpic = outpicref;
+ inlink->dst->outputs[0]->out_buf = outpicref;
for (plane = 0; plane < 4 && outpicref->data[plane]; plane++) {
int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0;
@@ -262,7 +262,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
static void end_frame(AVFilterLink *link)
{
avfilter_end_frame(link->dst->outputs[0]);
- avfilter_unref_buffer(link->cur_pic);
+ avfilter_unref_buffer(link->cur_buf);
}
static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, int before_slice)
@@ -281,7 +281,7 @@ static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir,
}
if (bar_h) {
- draw_rectangle(link->dst->outputs[0]->outpic,
+ draw_rectangle(link->dst->outputs[0]->out_buf,
pad->line, pad->line_step, pad->hsub, pad->vsub,
0, bar_y, pad->w, bar_h);
avfilter_draw_slice(link->dst->outputs[0], bar_y, bar_h, slice_dir);
@@ -291,7 +291,7 @@ static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir,
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
PadContext *pad = link->dst->priv;
- AVFilterBufferRef *outpic = link->dst->outputs[0]->outpic;
+ AVFilterBufferRef *outpic = link->dst->outputs[0]->out_buf;
y += pad->y;
diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c
index bfea021..77139c5 100644
--- a/libavfilter/vf_pixdesctest.c
+++ b/libavfilter/vf_pixdesctest.c
@@ -55,9 +55,9 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
AVFilterBufferRef *outpicref;
int i;
- outlink->outpic = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
+ outlink->out_buf = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
outlink->w, outlink->h);
- outpicref = outlink->outpic;
+ outpicref = outlink->out_buf;
avfilter_copy_bufref_props(outpicref, picref);
for (i = 0; i < 4; i++) {
@@ -80,8 +80,8 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
{
PixdescTestContext *priv = inlink->dst->priv;
- AVFilterBufferRef *inpic = inlink->cur_pic;
- AVFilterBufferRef *outpic = inlink->dst->outputs[0]->outpic;
+ AVFilterBufferRef *inpic = inlink->cur_buf;
+ AVFilterBufferRef *outpic = inlink->dst->outputs[0]->out_buf;
int i, c, w = inlink->w;
for (c = 0; c < priv->pix_desc->nb_components; c++) {
diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c
index cdc4e5e..24990f1 100644
--- a/libavfilter/vf_rotate.c
+++ b/libavfilter/vf_rotate.c
@@ -112,8 +112,8 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
static void end_frame(AVFilterLink *link)
{
RotContext *rot = link->dst->priv;
- AVFilterBufferRef *in = link->cur_pic;
- AVFilterBufferRef *out = link->dst->outputs[0]->outpic;
+ AVFilterBufferRef *in = link->cur_buf;
+ AVFilterBufferRef *out = link->dst->outputs[0]->out_buf;
int i, j, plane;
/* luma plane */
@@ -167,18 +167,18 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterLink *out = link->dst->outputs[0];
- out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
- out->outpic->pts = picref->pts;
- out->outpic->pos = picref->pos;
+ out->out_buf = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
+ out->out_buf->pts = picref->pts;
+ out->out_buf->pos = picref->pos;
if(picref->pixel_aspect.num == 0) {
- out->outpic->pixel_aspect = picref->pixel_aspect;
+ out->out_buf->pixel_aspect = picref->pixel_aspect;
} else {
- out->outpic->pixel_aspect.num = picref->pixel_aspect.den;
- out->outpic->pixel_aspect.den = picref->pixel_aspect.num;
+ out->out_buf->pixel_aspect.num = picref->pixel_aspect.den;
+ out->out_buf->pixel_aspect.den = picref->pixel_aspect.num;
}
- avfilter_start_frame(out, avfilter_ref_buffer(out->outpic, ~0));
+ avfilter_start_frame(out, avfilter_ref_buffer(out->out_buf, ~0));
}
AVFilter avfilter_vf_rotate =
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 2762d51..0486841 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -154,7 +154,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
avfilter_copy_bufref_props(outpicref, picref);
- outlink->outpic = outpicref;
+ outlink->out_buf = outpicref;
av_reduce(&outpicref->pixel_aspect.num, &outpicref->pixel_aspect.den,
(int64_t)picref->pixel_aspect.num * outlink->h * link->w,
@@ -169,7 +169,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
ScaleContext *scale = link->dst->priv;
int out_h;
- AVFilterBufferRef *cur_pic = link->cur_pic;
+ AVFilterBufferRef *cur_pic = link->cur_buf;
const uint8_t *data[4];
if (scale->slice_y == 0 && slice_dir == -1)
@@ -183,8 +183,8 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
data[3] = cur_pic->data[3] + y * cur_pic->linesize[3];
out_h = sws_scale(scale->sws, data, cur_pic->linesize, y, h,
- link->dst->outputs[0]->outpic->data,
- link->dst->outputs[0]->outpic->linesize);
+ link->dst->outputs[0]->out_buf->data,
+ link->dst->outputs[0]->out_buf->linesize);
if (slice_dir == -1)
scale->slice_y -= out_h;
diff --git a/libavfilter/vf_split.c b/libavfilter/vf_split.c
index 798b713..635c928 100644
--- a/libavfilter/vf_split.c
+++ b/libavfilter/vf_split.c
@@ -34,7 +34,7 @@ static void end_frame(AVFilterLink *link)
avfilter_end_frame(link->dst->outputs[0]);
avfilter_end_frame(link->dst->outputs[1]);
- avfilter_unref_buffer(link->cur_pic);
+ avfilter_unref_buffer(link->cur_buf);
}
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 8e6f3a1..15046f8 100644
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -67,9 +67,9 @@ static int config_props_output(AVFilterLink *link)
static void end_frame(AVFilterLink *link)
{
TransContext *trans = link->dst->priv;
- AVFilterBufferRef *in = link->cur_pic;
- AVFilterBufferRef *out = link->dst->outputs[0]->outpic;
- AVFilterBufferRef *pic = link->cur_pic;
+ AVFilterBufferRef *in = link->cur_buf;
+ AVFilterBufferRef *out = link->dst->outputs[0]->out_buf;
+ AVFilterBufferRef *pic = link->cur_buf;
AVFilterLink *output = link->dst->outputs[0];
int i, j, plane;
@@ -98,17 +98,17 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterLink *out = link->dst->outputs[0];
- out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
- out->outpic->pts = picref->pts;
+ out->out_buf = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
+ out->out_buf->pts = picref->pts;
if(picref->pixel_aspect.num == 0) {
- out->outpic->pixel_aspect = picref->pixel_aspect;
+ out->out_buf->pixel_aspect = picref->pixel_aspect;
} else {
- out->outpic->pixel_aspect.num = picref->pixel_aspect.den;
- out->outpic->pixel_aspect.den = picref->pixel_aspect.num;
+ out->out_buf->pixel_aspect.num = picref->pixel_aspect.den;
+ out->out_buf->pixel_aspect.den = picref->pixel_aspect.num;
}
- avfilter_start_frame(out, avfilter_ref_buffer(out->outpic, ~0));
+ avfilter_start_frame(out, avfilter_ref_buffer(out->out_buf, ~0));
}
AVFilter avfilter_vf_transpose =
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index ba7e83b..fa62275 100644
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -195,8 +195,8 @@ static av_cold void uninit(AVFilterContext *ctx)
static void end_frame(AVFilterLink *link)
{
UnsharpContext *unsharp = link->dst->priv;
- AVFilterBufferRef *in = link->cur_pic;
- AVFilterBufferRef *out = link->dst->outputs[0]->outpic;
+ AVFilterBufferRef *in = link->cur_buf;
+ AVFilterBufferRef *out = link->dst->outputs[0]->out_buf;
unsharpen(out->data[0], in->data[0], out->linesize[0], in->linesize[0], link->w, link->h, &unsharp->luma);
unsharpen(out->data[1], in->data[1], out->linesize[1], in->linesize[1], CHROMA_WIDTH(link), CHROMA_HEIGHT(link), &unsharp->chroma);
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
