[PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY

linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME
@ 2016-01-19  7:07 Wu-Cheng Li
  2016-01-19  7:07 ` [PATCH v4 1/2] v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Wu-Cheng Li @ 2016-01-19  7:07 UTC (permalink / raw)
  To: pawel, mchehab, hverkuil, k.debski, crope, standby24x7, wuchengli,
	nicolas.dufresne, ricardo.ribalda, ao2, bparrot, kyungmin.park,
	jtp.park
  Cc: linux-media, linux-kernel, linux-api, linux-arm-kernel,
	tiffany.lin, djkurtz

v4 changes:
- Change the name to V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
- Add commit message to s5p-mfc patch.

Wu-Cheng Li (2):
  v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
  s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.

 Documentation/DocBook/media/v4l/controls.xml |  8 ++++++++
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 ++++++++++++
 drivers/media/v4l2-core/v4l2-ctrls.c         |  2 ++
 include/uapi/linux/v4l2-controls.h           |  1 +
 4 files changed, 23 insertions(+)

-- 
2.6.0.rc2.230.g3dd15c0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v4 1/2] v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
  2016-01-19  7:07 [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
@ 2016-01-19  7:07 ` Wu-Cheng Li
  2016-01-19  7:07 ` [PATCH v4 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
  2016-01-25  4:46 ` [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li (李務誠)
  2 siblings, 0 replies; 6+ messages in thread
From: Wu-Cheng Li @ 2016-01-19  7:07 UTC (permalink / raw)
  To: pawel, mchehab, hverkuil, k.debski, crope, standby24x7, wuchengli,
	nicolas.dufresne, ricardo.ribalda, ao2, bparrot, kyungmin.park,
	jtp.park
  Cc: linux-media, linux-kernel, linux-api, linux-arm-kernel,
	tiffany.lin, djkurtz

Some drivers also need a control like
V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE to force an encoder
key frame. Add a general V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME
so the new drivers and applications can use it.

Signed-off-by: Wu-Cheng Li <wuchengli@chromium.org>
---
 Documentation/DocBook/media/v4l/controls.xml | 8 ++++++++
 drivers/media/v4l2-core/v4l2-ctrls.c         | 2 ++
 include/uapi/linux/v4l2-controls.h           | 1 +
 3 files changed, 11 insertions(+)

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index f13a429..a62ea7b 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -2330,6 +2330,14 @@ vertical search range for motion estimation module in video encoder.</entry>
 	      </row>
 
 	      <row><entry></entry></row>
+	      <row id="v4l2-mpeg-video-force-key-frame">
+		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME</constant>&nbsp;</entry>
+		<entry>button</entry>
+	      </row><row><entry spanname="descr">Force a key frame for the next queued buffer. Applicable to encoders.
+This is a general, codec-agnostic keyframe control.</entry>
+	      </row>
+
+	      <row><entry></entry></row>
 	      <row>
 		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE</constant>&nbsp;</entry>
 		<entry>integer</entry>
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index c9d5537..bd1b7ad 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -747,6 +747,7 @@ const char *v4l2_ctrl_get_name(u32 id)
 	case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE:		return "Horizontal MV Search Range";
 	case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE:		return "Vertical MV Search Range";
 	case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER:		return "Repeat Sequence Header";
+	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:		return "Force Key Frame";
 
 	/* VPX controls */
 	case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS:		return "VPX Number of Partitions";
@@ -985,6 +986,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
 	case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE:
 		*type = V4L2_CTRL_TYPE_INTEGER;
 		break;
+	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
 	case V4L2_CID_PAN_RESET:
 	case V4L2_CID_TILT_RESET:
 	case V4L2_CID_FLASH_STROBE:
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 2d225bc..5b49df6 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -390,6 +390,7 @@ enum v4l2_mpeg_video_multi_slice_mode {
 #define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER		(V4L2_CID_MPEG_BASE+226)
 #define V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE		(V4L2_CID_MPEG_BASE+227)
 #define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE		(V4L2_CID_MPEG_BASE+228)
+#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME		(V4L2_CID_MPEG_BASE+229)
 
 #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP		(V4L2_CID_MPEG_BASE+300)
 #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP		(V4L2_CID_MPEG_BASE+301)
-- 
2.6.0.rc2.230.g3dd15c0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v4 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
  2016-01-19  7:07 [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
  2016-01-19  7:07 ` [PATCH v4 1/2] v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
@ 2016-01-19  7:07 ` Wu-Cheng Li
  2016-02-16 10:29   ` Sylwester Nawrocki
  2016-01-25  4:46 ` [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li (李務誠)
  2 siblings, 1 reply; 6+ messages in thread
From: Wu-Cheng Li @ 2016-01-19  7:07 UTC (permalink / raw)
  To: pawel, mchehab, hverkuil, k.debski, crope, standby24x7, wuchengli,
	nicolas.dufresne, ricardo.ribalda, ao2, bparrot, kyungmin.park,
	jtp.park
  Cc: linux-media, linux-kernel, linux-api, linux-arm-kernel,
	tiffany.lin, djkurtz

There is a new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME to
force an encoder key frame. It is the same as requesting
V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME.

Signed-off-by: Wu-Cheng Li <wuchengli@chromium.org>
---
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 0434f02..034b5c1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -212,6 +212,14 @@ static struct mfc_control controls[] = {
 		.menu_skip_mask = 0,
 	},
 	{
+		.id = V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
+		.type = V4L2_CTRL_TYPE_BUTTON,
+		.minimum = 0,
+		.maximum = 0,
+		.step = 0,
+		.default_value = 0,
+	},
+	{
 		.id = V4L2_CID_MPEG_VIDEO_VBV_SIZE,
 		.type = V4L2_CTRL_TYPE_INTEGER,
 		.minimum = 0,
@@ -1423,6 +1431,10 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:
 		ctx->force_frame_type = ctrl->val;
 		break;
+	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
+		ctx->force_frame_type =
+			V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME;
+		break;
 	case V4L2_CID_MPEG_VIDEO_VBV_SIZE:
 		p->vbv_size = ctrl->val;
 		break;
-- 
2.6.0.rc2.230.g3dd15c0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v4 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
  2016-01-19  7:07 ` [PATCH v4 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
@ 2016-02-16 10:29   ` Sylwester Nawrocki
  0 siblings, 0 replies; 6+ messages in thread
From: Sylwester Nawrocki @ 2016-02-16 10:29 UTC (permalink / raw)
  To: Wu-Cheng Li, hverkuil
  Cc: pawel, mchehab, k.debski, nicolas.dufresne, jtp.park, linux-media,
	linux-kernel, linux-api, linux-arm-kernel

On 19/01/16 08:07, Wu-Cheng Li wrote:
> There is a new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME to
> force an encoder key frame. It is the same as requesting
> V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME.
> 
> Signed-off-by: Wu-Cheng Li <wuchengli@chromium.org>

Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME
  2016-01-19  7:07 [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
  2016-01-19  7:07 ` [PATCH v4 1/2] v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
  2016-01-19  7:07 ` [PATCH v4 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
@ 2016-01-25  4:46 ` Wu-Cheng Li (李務誠)
  2016-01-25  8:57   ` Hans Verkuil
  2 siblings, 1 reply; 6+ messages in thread
From: Wu-Cheng Li (李務誠) @ 2016-01-25  4:46 UTC (permalink / raw)
  To: Wu-Cheng Li, Hans Verkuil
  Cc: pawel, mchehab, k.debski, Antti Palosaari, Masanari Iida,
	Nicolas Dufresne, Ricardo Ribalda Delgado, ao2, bparrot,
	Kyungmin Park, jtp.park, linux-media, linux-kernel, linux-api,
	linux-arm-kernel, Tiffany Lin, Daniel Kurtz

Hi Hans,
Can you look at the patch again? I've changed the name from
V4L2_CID_MPEG_VIDEO_FORCE_I_FRAME to
V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME. Thanks.

Wu-Cheng

On Tue, Jan 19, 2016 at 3:07 PM, Wu-Cheng Li <wuchengli@chromium.org> wrote:
> v4 changes:
> - Change the name to V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
> - Add commit message to s5p-mfc patch.
>
> Wu-Cheng Li (2):
>   v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
>   s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
>
>  Documentation/DocBook/media/v4l/controls.xml |  8 ++++++++
>  drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 ++++++++++++
>  drivers/media/v4l2-core/v4l2-ctrls.c         |  2 ++
>  include/uapi/linux/v4l2-controls.h           |  1 +
>  4 files changed, 23 insertions(+)
>
> --
> 2.6.0.rc2.230.g3dd15c0
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME
  2016-01-25  4:46 ` [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li (李務誠)
@ 2016-01-25  8:57   ` Hans Verkuil
  0 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2016-01-25  8:57 UTC (permalink / raw)
  To: Wu-Cheng Li (李務誠)
  Cc: pawel, mchehab, k.debski, Antti Palosaari, Masanari Iida,
	Nicolas Dufresne, Ricardo Ribalda Delgado, ao2, bparrot,
	Kyungmin Park, jtp.park, linux-media, linux-kernel, linux-api,
	linux-arm-kernel, Tiffany Lin, Daniel Kurtz

On 01/25/2016 05:46 AM, Wu-Cheng Li (李務誠) wrote:
> Hi Hans,
> Can you look at the patch again? I've changed the name from
> V4L2_CID_MPEG_VIDEO_FORCE_I_FRAME to
> V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME. Thanks.

Looks good to me. I'm planning to make a pull request for this once v4.5-rc1 is
merged into our media_tree repo.

Regards,

	Hans

> 
> Wu-Cheng
> 
> On Tue, Jan 19, 2016 at 3:07 PM, Wu-Cheng Li <wuchengli@chromium.org> wrote:
>> v4 changes:
>> - Change the name to V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
>> - Add commit message to s5p-mfc patch.
>>
>> Wu-Cheng Li (2):
>>   v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
>>   s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
>>
>>  Documentation/DocBook/media/v4l/controls.xml |  8 ++++++++
>>  drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 ++++++++++++
>>  drivers/media/v4l2-core/v4l2-ctrls.c         |  2 ++
>>  include/uapi/linux/v4l2-controls.h           |  1 +
>>  4 files changed, 23 insertions(+)
>>
>> --
>> 2.6.0.rc2.230.g3dd15c0
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-02-16 10:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-19  7:07 [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
2016-01-19  7:07 ` [PATCH v4 1/2] v4l: add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
2016-01-19  7:07 ` [PATCH v4 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li
2016-02-16 10:29   ` Sylwester Nawrocki
2016-01-25  4:46 ` [PATCH v4 0/2] new control V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME Wu-Cheng Li (李務誠)
2016-01-25  8:57   ` Hans Verkuil

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).