diff mbox

[FFmpeg-devel] avcodec/cfhd: add back alpha processing removed in 9cefb9e7ec

Message ID 20190628174216.28197-1-onemda@gmail.com
State Accepted
Commit 2edb2627597d99fcad7f6932e7c45f6169250db5
Headers show

Commit Message

Paul B Mahol June 28, 2019, 5:42 p.m. UTC
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavcodec/cfhd.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Carl Eugen Hoyos June 28, 2019, 6:25 p.m. UTC | #1
Am Fr., 28. Juni 2019 um 19:48 Uhr schrieb Paul B Mahol <onemda@gmail.com>:
>
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavcodec/cfhd.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
> index 846d334b9b..49a5a2c30a 100644
> --- a/libavcodec/cfhd.c
> +++ b/libavcodec/cfhd.c
> @@ -884,6 +884,8 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
>              high = s->plane[plane].l_h[7];
>              for (i = 0; i < lowpass_height * 2; i++) {
>                  horiz_filter_clip(dst, low, high, lowpass_width, s->bpc);
> +                if (avctx->pix_fmt == AV_PIX_FMT_GBRAP12 && act_plane == 3)
> +                    process_alpha(dst, lowpass_width * 2);

Please mention ticket #6265 in the commit message.

Thank you!

Carl Eugen
Paul B Mahol June 28, 2019, 6:29 p.m. UTC | #2
On 6/28/19, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> Am Fr., 28. Juni 2019 um 19:48 Uhr schrieb Paul B Mahol <onemda@gmail.com>:
>>
>> Signed-off-by: Paul B Mahol <onemda@gmail.com>
>> ---
>>  libavcodec/cfhd.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
>> index 846d334b9b..49a5a2c30a 100644
>> --- a/libavcodec/cfhd.c
>> +++ b/libavcodec/cfhd.c
>> @@ -884,6 +884,8 @@ static int cfhd_decode(AVCodecContext *avctx, void
>> *data, int *got_frame,
>>              high = s->plane[plane].l_h[7];
>>              for (i = 0; i < lowpass_height * 2; i++) {
>>                  horiz_filter_clip(dst, low, high, lowpass_width, s->bpc);
>> +                if (avctx->pix_fmt == AV_PIX_FMT_GBRAP12 && act_plane ==
>> 3)
>> +                    process_alpha(dst, lowpass_width * 2);
>
> Please mention ticket #6265 in the commit message.

That ticket is closed, instead, #7886 is open.

>
> Thank you!
>
> Carl Eugen
> _______________________________________________
> 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".
Carl Eugen Hoyos June 28, 2019, 6:34 p.m. UTC | #3
Am Fr., 28. Juni 2019 um 20:29 Uhr schrieb Paul B Mahol <onemda@gmail.com>:
>
> On 6/28/19, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> > Am Fr., 28. Juni 2019 um 19:48 Uhr schrieb Paul B Mahol <onemda@gmail.com>:
> >>
> >> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> >> ---
> >>  libavcodec/cfhd.c | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
> >> index 846d334b9b..49a5a2c30a 100644
> >> --- a/libavcodec/cfhd.c
> >> +++ b/libavcodec/cfhd.c
> >> @@ -884,6 +884,8 @@ static int cfhd_decode(AVCodecContext *avctx, void
> >> *data, int *got_frame,
> >>              high = s->plane[plane].l_h[7];
> >>              for (i = 0; i < lowpass_height * 2; i++) {
> >>                  horiz_filter_clip(dst, low, high, lowpass_width, s->bpc);
> >> +                if (avctx->pix_fmt == AV_PIX_FMT_GBRAP12 && act_plane ==
> >> 3)
> >> +                    process_alpha(dst, lowpass_width * 2);
> >
> > Please mention ticket #6265 in the commit message.
>
> That ticket is closed, instead, #7886 is open.

Yes;-)
(The sample is here in a directory ticket6265...)

Carl Eugen
diff mbox

Patch

diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index 846d334b9b..49a5a2c30a 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -884,6 +884,8 @@  static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
             high = s->plane[plane].l_h[7];
             for (i = 0; i < lowpass_height * 2; i++) {
                 horiz_filter_clip(dst, low, high, lowpass_width, s->bpc);
+                if (avctx->pix_fmt == AV_PIX_FMT_GBRAP12 && act_plane == 3)
+                    process_alpha(dst, lowpass_width * 2);
                 low  += lowpass_width;
                 high += lowpass_width;
                 dst  += pic->linesize[act_plane] / 2;