aboutsummaryrefslogtreecommitdiffstats
path: root/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-12-03 12:13:49 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-12-03 12:13:49 +0100
commit24b88169ff86674aa18b5897cbd1e608a603fa79 (patch)
tree86629c36c665d076244508516cdef92fff160112 /utils/v4l2-ctl/v4l2-ctl-streaming.cpp
parent0aee9991e0c005f8af7b08e20bfee47855451b5c (diff)
v4l-utils: sync with media_tree master
The FWHT stateless codec API is now an official public API, so this required a few changes. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'utils/v4l2-ctl/v4l2-ctl-streaming.cpp')
-rw-r--r--utils/v4l2-ctl/v4l2-ctl-streaming.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
index d1d1f91a..a3580595 100644
--- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
@@ -9,7 +9,6 @@
#include "v4l2-ctl.h"
#include "v4l-stream.h"
#include <media-info.h>
-#include <fwht-ctrls.h>
extern "C" {
#include "v4l2-tpg.h"
@@ -819,7 +818,7 @@ static void set_fwht_stateless_params(struct v4l2_ctrl_fwht_params &fwht_params,
* it is better not to reference it so the error won't propagate
*/
if (!last_bf_ts)
- fwht_params.flags |= FWHT_FL_I_FRAME;
+ fwht_params.flags |= V4L2_FWHT_FL_I_FRAME;
}
static int alloc_fwht_req(int media_fd, unsigned index)
@@ -885,7 +884,7 @@ static int set_fwht_ext_ctrl(cv4l_fd &fd, const struct fwht_cframe_hdr *hdr,
set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
- control.id = V4L2_CID_MPEG_VIDEO_FWHT_PARAMS;
+ control.id = V4L2_CID_STATELESS_FWHT_PARAMS;
control.ptr = &fwht_params;
control.size = sizeof(fwht_params);
controls.which = V4L2_CTRL_WHICH_REQUEST_VAL;

Privacy Policy