[FFmpeg-cvslog] avfilter/vf_maskedmerge: get rid of MaskedMergeContext from functions that do actual work
Paul B Mahol
git at videolan.org
Wed Sep 30 22:37:55 CEST 2015
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Sep 30 22:35:31 2015 +0200| [30ce6fd1069e6e65edae03da162871df896e5283] | committer: Paul B Mahol
avfilter/vf_maskedmerge: get rid of MaskedMergeContext from functions that do actual work
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30ce6fd1069e6e65edae03da162871df896e5283
---
libavfilter/vf_maskedmerge.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c
index 67f74be..41bd039 100644
--- a/libavfilter/vf_maskedmerge.c
+++ b/libavfilter/vf_maskedmerge.c
@@ -35,11 +35,11 @@ typedef struct MaskedMergeContext {
int max, half, depth;
FFFrameSync fs;
- void (*maskedmerge)(struct MaskedMergeContext *s,
- const uint8_t *bsrc, int blinesize,
+ void (*maskedmerge)(const uint8_t *bsrc, int blinesize,
const uint8_t *osrc, int olinesize,
const uint8_t *msrc, int mlinesize,
- uint8_t *dst, int dlinesize, int w, int h);
+ uint8_t *dst, int dlinesize, int w, int h,
+ int max, int half, int shift);
} MaskedMergeContext;
#define OFFSET(x) offsetof(MaskedMergeContext, x)
@@ -109,11 +109,12 @@ static int process_frame(FFFrameSync *fs)
continue;
}
- s->maskedmerge(s, base->data[p], base->linesize[p],
+ s->maskedmerge(base->data[p], base->linesize[p],
overlay->data[p], overlay->linesize[p],
mask->data[p], mask->linesize[p],
out->data[p], out->linesize[p],
- s->width[p], s->height[p]);
+ s->width[p], s->height[p],
+ s->max, s->half, s->depth);
}
}
out->pts = av_rescale_q(base->pts, s->fs.time_base, outlink->time_base);
@@ -121,11 +122,11 @@ static int process_frame(FFFrameSync *fs)
return ff_filter_frame(outlink, out);
}
-static void maskedmerge8(MaskedMergeContext *s,
- const uint8_t *bsrc, int blinesize,
+static void maskedmerge8(const uint8_t *bsrc, int blinesize,
const uint8_t *osrc, int olinesize,
const uint8_t *msrc, int mlinesize,
- uint8_t *dst, int dlinesize, int w, int h)
+ uint8_t *dst, int dlinesize, int w, int h,
+ int max, int half, int shift)
{
int x, y;
@@ -141,15 +142,12 @@ static void maskedmerge8(MaskedMergeContext *s,
}
}
-static void maskedmerge16(MaskedMergeContext *s,
- const uint8_t *bbsrc, int blinesize,
+static void maskedmerge16(const uint8_t *bbsrc, int blinesize,
const uint8_t *oosrc, int olinesize,
const uint8_t *mmsrc, int mlinesize,
- uint8_t *ddst, int dlinesize, int w, int h)
+ uint8_t *ddst, int dlinesize, int w, int h,
+ int max, int half, int shift)
{
- const int max = s->max;
- const int half = s->half;
- const int shift = s->depth;
const uint16_t *bsrc = (const uint16_t *)bbsrc;
const uint16_t *osrc = (const uint16_t *)oosrc;
const uint16_t *msrc = (const uint16_t *)mmsrc;
More information about the ffmpeg-cvslog
mailing list