This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:

Subject: v4l-utils: sync with media_tree master
Author:  Hans Verkuil <hverkuil-ci...@xs4all.nl>
Date:    Fri Aug 9 10:01:04 2019 +0200

Update to the latest code.

Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>

 utils/common/codec-v4l2-fwht.c | 30 ++++++++++++++++++++++++++++--
 utils/keytable/parse.h         |  9 +--------
 2 files changed, 29 insertions(+), 10 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=2168ec6c18549944eafc99e99c844ecaa03da175
diff --git a/utils/common/codec-v4l2-fwht.c b/utils/common/codec-v4l2-fwht.c
index 01e7f09efc4e..3c93d9232c3c 100644
--- a/utils/common/codec-v4l2-fwht.c
+++ b/utils/common/codec-v4l2-fwht.c
@@ -29,11 +29,15 @@ static const struct v4l2_fwht_pixfmt_info 
v4l2_fwht_pixfmts[] = {
        { V4L2_PIX_FMT_HSV24,   3, 3, 1, 3, 3, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV},
        { V4L2_PIX_FMT_BGR32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
        { V4L2_PIX_FMT_XBGR32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+       { V4L2_PIX_FMT_ABGR32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
        { V4L2_PIX_FMT_RGB32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
        { V4L2_PIX_FMT_XRGB32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
-       { V4L2_PIX_FMT_HSV32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV},
        { V4L2_PIX_FMT_ARGB32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
-       { V4L2_PIX_FMT_ABGR32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
+       { V4L2_PIX_FMT_BGRX32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+       { V4L2_PIX_FMT_BGRA32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
+       { V4L2_PIX_FMT_RGBX32,  4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB},
+       { V4L2_PIX_FMT_RGBA32,  4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB},
+       { V4L2_PIX_FMT_HSV32,   4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV},
        { V4L2_PIX_FMT_GREY,    1, 1, 1, 1, 0, 1, 1, 1, 1, FWHT_FL_PIXENC_RGB},
 };
 
@@ -193,6 +197,28 @@ static int prepare_raw_frame(struct fwht_raw_frame *rf,
                rf->luma++;
                rf->alpha = rf->cr + 1;
                break;
+       case V4L2_PIX_FMT_BGRX32:
+               rf->cb = rf->luma + 1;
+               rf->cr = rf->cb + 2;
+               rf->luma += 2;
+               break;
+       case V4L2_PIX_FMT_BGRA32:
+               rf->alpha = rf->luma;
+               rf->cb = rf->luma + 1;
+               rf->cr = rf->cb + 2;
+               rf->luma += 2;
+               break;
+       case V4L2_PIX_FMT_RGBX32:
+               rf->cr = rf->luma;
+               rf->cb = rf->cr + 2;
+               rf->luma++;
+               break;
+       case V4L2_PIX_FMT_RGBA32:
+               rf->alpha = rf->luma + 3;
+               rf->cr = rf->luma;
+               rf->cb = rf->cr + 2;
+               rf->luma++;
+               break;
        default:
                return -EINVAL;
        }
diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h
index e08dfbc657fe..a78d86dcfddc 100644
--- a/utils/keytable/parse.h
+++ b/utils/keytable/parse.h
@@ -151,7 +151,6 @@ struct parse_event key_events[] = {
        {"KEY_SCALE", 120},
        {"KEY_KPCOMMA", 121},
        {"KEY_HANGEUL", 122},
-       {"KEY_HANGUEL", 122},
        {"KEY_HANJA", 123},
        {"KEY_YEN", 124},
        {"KEY_LEFTMETA", 125},
@@ -182,9 +181,7 @@ struct parse_event key_events[] = {
        {"KEY_WWW", 150},
        {"KEY_MSDOS", 151},
        {"KEY_COFFEE", 152},
-       {"KEY_SCREENLOCK", 152},
        {"KEY_ROTATE_DISPLAY", 153},
-       {"KEY_DIRECTION", 153},
        {"KEY_CYCLEWINDOWS", 154},
        {"KEY_MAIL", 155},
        {"KEY_BOOKMARKS", 156},
@@ -271,10 +268,8 @@ struct parse_event key_events[] = {
        {"KEY_VIDEO_PREV", 242},
        {"KEY_BRIGHTNESS_CYCLE", 243},
        {"KEY_BRIGHTNESS_AUTO", 244},
-       {"KEY_BRIGHTNESS_ZERO", 244},
        {"KEY_DISPLAY_OFF", 245},
        {"KEY_WWAN", 246},
-       {"KEY_WIMAX", 246},
        {"KEY_RFKILL", 247},
        {"KEY_MICMUTE", 248},
        {"BTN_MISC", 0x100},
@@ -368,11 +363,9 @@ struct parse_event key_events[] = {
        {"KEY_SUBTITLE", 0x172},
        {"KEY_ANGLE", 0x173},
        {"KEY_FULL_SCREEN", 0x174},
-       {"KEY_ZOOM", 0x174},
        {"KEY_MODE", 0x175},
        {"KEY_KEYBOARD", 0x176},
        {"KEY_ASPECT_RATIO", 0x177},
-       {"KEY_SCREEN", 0x177},
        {"KEY_PC", 0x178},
        {"KEY_TV", 0x179},
        {"KEY_TV2", 0x17a},
@@ -429,7 +422,6 @@ struct parse_event key_events[] = {
        {"KEY_ADDRESSBOOK", 0x1ad},
        {"KEY_MESSENGER", 0x1ae},
        {"KEY_DISPLAYTOGGLE", 0x1af},
-       {"KEY_BRIGHTNESS_TOGGLE", 0x1af},
        {"KEY_SPELLCHECK", 0x1b0},
        {"KEY_LOGOFF", 0x1b1},
        {"KEY_DOLLAR", 0x1b2},
@@ -590,6 +582,7 @@ struct parse_event key_events[] = {
        {"BTN_TRIGGER_HAPPY38", 0x2e5},
        {"BTN_TRIGGER_HAPPY39", 0x2e6},
        {"BTN_TRIGGER_HAPPY40", 0x2e7},
+       {"KEY_MAX", 0x2ff},
        { NULL, 0}
 };
 struct parse_event rel_events[] = {

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to