| Message ID | CAB0OVGqty8HiPO+Wkiqa1zkibYLUtzSzMtE1trNMnYniT=MM5g@mail.gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel] lavfi/hflip: Support Bayer pixel formats | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
On 7/26/20, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote: > Hi! > > Attached patch fixes a part of ticket #8819. > > Please comment, Carl Eugen > Looks good, but variable name is unfortunate.
Am So., 26. Juli 2020 um 21:28 Uhr schrieb Paul B Mahol <onemda@gmail.com>: > > On 7/26/20, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote: > > Hi! > > > > Attached patch fixes a part of ticket #8819. > > > > Please comment, Carl Eugen > > > > Looks good, but variable name is unfortunate. New patch attached. Carl Eugen
Carl Eugen Hoyos wrote: >Am So., 26. Juli 2020 um 21:28 Uhr schrieb Paul B Mahol ><onemda@gmail.com>: >> >> On 7/26/20, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote: >> > Hi! >> > >> > Attached patch fixes a part of ticket #8819. >> > >> > Please comment, Carl Eugen >> > >> >> Looks good, but variable name is unfortunate. > >New patch attached. I am afraid, I still experience the same behaviour: - the original image (*) has an yellow tinting - hflip,vflip together gives the correct image texture but with a blue tinting - hflip and vplip individually give a light magenta colour and a pattern which I consider to be a Bayer phase error Thank you and best regards, Reto * the clip is number 3 at https://avpres.net/CineForm/ (I could not upload at ticket #8819 because it's 22.3 MB)
Am So., 26. Juli 2020 um 21:59 Uhr schrieb Carl Eugen Hoyos <ceffmpeg@gmail.com>: > > Am So., 26. Juli 2020 um 21:28 Uhr schrieb Paul B Mahol <onemda@gmail.com>: > > > > On 7/26/20, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote: > > > Hi! > > > > > > Attached patch fixes a part of ticket #8819. > > > > > > Please comment, Carl Eugen > > > > > > > Looks good, but variable name is unfortunate. > > New patch attached. Patch applied. Carl Eugen
diff --git a/libavfilter/hflip.h b/libavfilter/hflip.h index 204090dbb4..32356cde34 100644 --- a/libavfilter/hflip.h +++ b/libavfilter/hflip.h @@ -27,6 +27,7 @@ typedef struct FlipContext { const AVClass *class; int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes + int bayer; ///< 1 .. not a Bayer input format, 2 .. Bayer input format int planewidth[4]; ///< width of each plane int planeheight[4]; ///< height of each plane diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index b77afc77fc..77db218bda 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -138,6 +138,7 @@ static int config_props(AVFilterLink *inlink) s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, hsub); s->planeheight[0] = s->planeheight[3] = inlink->h; s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, vsub); + s->bayer = !!(pix_desc->flags & AV_PIX_FMT_FLAG_BAYER) + 1; nb_planes = av_pix_fmt_count_planes(inlink->format); @@ -149,6 +150,7 @@ int ff_hflip_init(FlipContext *s, int step[4], int nb_planes) int i; for (i = 0; i < nb_planes; i++) { + step[i] *= s->bayer; switch (step[i]) { case 1: s->flip_line[i] = hflip_byte_c; break; case 2: s->flip_line[i] = hflip_short_c; break; @@ -180,7 +182,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) int i, plane, step; for (plane = 0; plane < 4 && in->data[plane] && in->linesize[plane]; plane++) { - const int width = s->planewidth[plane]; + const int width = s->planewidth[plane] / s->bayer; const int height = s->planeheight[plane]; const int start = (height * job ) / nb_jobs; const int end = (height * (job+1)) / nb_jobs;