From: Dafna Hirschfeld <dafna3@gmail.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, helen.koike@collabora.com,
Dafna Hirschfeld <dafna3@gmail.com>
Subject: [PATCH v2 1/6] media: vicodec: bugfix - replace '=' with '|='
Date: Wed, 16 Jan 2019 07:25:22 -0800 [thread overview]
Message-ID: <20190116152527.34411-2-dafna3@gmail.com> (raw)
In-Reply-To: <20190116152527.34411-1-dafna3@gmail.com>
In the fwht_encode_frame, 'encoding = encode_plane'
should be replaced with 'encoding |= encode_plane'
so existing flags won't be overwrriten.
Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
drivers/media/platform/vicodec/codec-fwht.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c
index 5630f1dc45e6..a6fd0477633b 100644
--- a/drivers/media/platform/vicodec/codec-fwht.c
+++ b/drivers/media/platform/vicodec/codec-fwht.c
@@ -787,10 +787,10 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm,
if (frm->components_num == 4) {
rlco_max = rlco + size / 2 - 256;
- encoding = encode_plane(frm->alpha, ref_frm->alpha, &rlco,
- rlco_max, cf, frm->height, frm->width,
- frm->luma_alpha_step,
- is_intra, next_is_intra);
+ encoding |= encode_plane(frm->alpha, ref_frm->alpha, &rlco,
+ rlco_max, cf, frm->height, frm->width,
+ frm->luma_alpha_step,
+ is_intra, next_is_intra);
if (encoding & FWHT_FRAME_UNENCODED)
encoding |= FWHT_ALPHA_UNENCODED;
encoding &= ~FWHT_FRAME_UNENCODED;
--
2.17.1
next prev parent reply other threads:[~2019-01-16 15:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 15:25 [PATCH v2 0/6] Adding support to resolution change and apdding Dafna Hirschfeld
2019-01-16 15:25 ` Dafna Hirschfeld [this message]
2019-01-16 15:25 ` [PATCH v2 2/6] media: vicodec: Add num_planes field to v4l2_fwht_pixfmt_info Dafna Hirschfeld
2019-01-16 15:25 ` [PATCH v2 3/6] media: vicodec: add support for CROP and COMPOSE selection Dafna Hirschfeld
2019-01-16 15:25 ` [PATCH v2 4/6] media: vicodec: Add pixel encoding flags to fwht header Dafna Hirschfeld
2019-01-17 10:57 ` Hans Verkuil
2019-01-16 15:25 ` [PATCH v2 5/6] media: vicodec: Separate fwht header from the frame data Dafna Hirschfeld
2019-01-17 10:29 ` Hans Verkuil
2019-01-16 15:25 ` [PATCH v2 6/6] media: vicodec: Add support for resolution change event Dafna Hirschfeld
2019-01-17 11:41 ` Hans Verkuil
2019-01-17 11:51 ` Hans Verkuil
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=20190116152527.34411-2-dafna3@gmail.com \
--to=dafna3@gmail.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).