From: Mark Reid <mindmark@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH v3 1/4] swscale/input: add rgbaf32 input support Date: Sun, 13 Nov 2022 17:50:37 -0800 Message-ID: <CA+anCRmx-hO38tJAmF84+6RbpZ9Vcm6tAMT4peP5TX7uEXLXqw@mail.gmail.com> (raw) In-Reply-To: <20221113212453.GF1814017@pb2> On Sun, Nov 13, 2022 at 1:25 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > On Wed, Nov 02, 2022 at 09:00:07PM -0700, mindmark@gmail.com wrote: > > From: Mark Reid <mindmark@gmail.com> > > > > --- > > libswscale/input.c | 172 +++++++++++++++++++++++++++++++++++++++++++++ > > libswscale/utils.c | 4 ++ > > 2 files changed, 176 insertions(+) > > > > diff --git a/libswscale/input.c b/libswscale/input.c > > index 7ff7bfaa01..4683284b0b 100644 > > --- a/libswscale/input.c > > +++ b/libswscale/input.c > > @@ -1284,6 +1284,136 @@ static void rgbaf16##endian_name##ToA_c(uint8_t > *_dst, const uint8_t *_src, cons > > rgbaf16_funcs_endian(le, 0) > > rgbaf16_funcs_endian(be, 1) > > > > +#define rdpx(src) (is_be ? av_int2float(AV_RB32(&src)): > av_int2float(AV_RL32(&src))) > > + > > +static av_always_inline void rgbaf32ToUV_half_endian(uint16_t *dstU, > uint16_t *dstV, int is_be, > > + const float *src, > int width, > > + int32_t *rgb2yuv, > int comp) > > +{ > > + int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = > rgb2yuv[BU_IDX]; > > + int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = > rgb2yuv[BV_IDX]; > > + int i; > > + for (i = 0; i < width; i++) { > > > + int r = (lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+0]), > 0.0f, 65535.0f)) + > > + lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+4]), > 0.0f, 65535.0f))) >> 1; > > + int g = (lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+1]), > 0.0f, 65535.0f)) + > > + lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+5]), > 0.0f, 65535.0f))) >> 1; > > + int b = (lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+2]), > 0.0f, 65535.0f)) + > > + lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+6]), > 0.0f, 65535.0f))) >> 1; > > + > > + dstU[i] = (ru*r + gu*g + bu*b + (0x10001<<(RGB2YUV_SHIFT-1))) > >> RGB2YUV_SHIFT; > > + dstV[i] = (rv*r + gv*g + bv*b + (0x10001<<(RGB2YUV_SHIFT-1))) > >> RGB2YUV_SHIFT; > > I would expect this sort of code to use 2 lrintf() and 2 av_clipf() not 6 > > ya it is a bit excessive, I'll just remove the _half conversions for now, they aren't strictly necessary as far as I can tell. > > > + } > > +} > > + > > +static av_always_inline void rgbaf32ToUV_endian(uint16_t *dstU, > uint16_t *dstV, int is_be, > > + const float *src, int > width, > > + int32_t *rgb2yuv, int > comp) > > +{ > > + int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = > rgb2yuv[BU_IDX]; > > + int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = > rgb2yuv[BV_IDX]; > > + int i; > > + for (i = 0; i < width; i++) { > > + int r = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+0]), 0.0f, > 65535.0f)); > > + int g = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+1]), 0.0f, > 65535.0f)); > > + int b = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+2]), 0.0f, > 65535.0f)); > > + > > + dstU[i] = (ru*r + gu*g + bu*b + (0x10001<<(RGB2YUV_SHIFT-1))) > >> RGB2YUV_SHIFT; > > + dstV[i] = (rv*r + gv*g + bv*b + (0x10001<<(RGB2YUV_SHIFT-1))) > >> RGB2YUV_SHIFT; > > + } > > +} > > + > > > +static av_always_inline void rgbaf32ToY_endian(uint16_t *dst, const > float *src, int is_be, > > + int width, int32_t > *rgb2yuv, int comp) > > +{ > > + int32_t ry = rgb2yuv[RY_IDX], gy = rgb2yuv[GY_IDX], by = > rgb2yuv[BY_IDX]; > > + int i; > > + for (i = 0; i < width; i++) { > > + int r = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+0]), 0.0f, > 65535.0f)); > > + int g = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+1]), 0.0f, > 65535.0f)); > > + int b = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+2]), 0.0f, > 65535.0f)); > > + > > > + dst[i] = (ry*r + gy*g + by*b + (0x2001<<(RGB2YUV_SHIFT-1))) >> > RGB2YUV_SHIFT; > > there is one output so there should be only need for one clip and one > float->int > This is matching the f32 planar version. I think I was paranoid about things being bitexact for tests and that's why it's currently being done this way. I'll see what happens if I introduce more float operations, could I perhaps do this in a later patch? some asm might have to change too. > thx > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Any man who breaks a law that conscience tells him is unjust and willingly > accepts the penalty by staying in jail in order to arouse the conscience > of > the community on the injustice of the law is at that moment expressing the > very highest respect for law. - Martin Luther King Jr > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-11-14 1:51 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-03 4:00 [FFmpeg-devel] [PATCH v3 0/4] swscale rgbaf32 input/output support mindmark 2022-11-03 4:00 ` [FFmpeg-devel] [PATCH v3 1/4] swscale/input: add rgbaf32 input support mindmark 2022-11-13 21:24 ` Michael Niedermayer 2022-11-14 1:50 ` Mark Reid [this message] 2022-11-14 21:07 ` Michael Niedermayer 2022-11-14 22:23 ` Mark Reid 2022-11-03 4:00 ` [FFmpeg-devel] [PATCH v3 2/4] avfilter/vf_hflip: add support for packed rgb float formats mindmark 2022-11-13 21:30 ` Michael Niedermayer 2022-11-03 4:00 ` [FFmpeg-devel] [PATCH v3 3/4] avfilter/vf_transpose: " mindmark 2022-11-03 4:00 ` [FFmpeg-devel] [PATCH v3 4/4] swscale/output: add rgbaf32 output support mindmark 2022-11-12 23:48 ` [FFmpeg-devel] [PATCH v3 0/4] swscale rgbaf32 input/output support Mark Reid
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CA+anCRmx-hO38tJAmF84+6RbpZ9Vcm6tAMT4peP5TX7uEXLXqw@mail.gmail.com \ --to=mindmark@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git