mbox series

[GIT,PULL,FOR,v5.13] V4L2 stateless VP8 de-staging

Message ID 7bcaf084-b0fd-8bf8-92df-0eee02d924a3@xs4all.nl (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL,FOR,v5.13] V4L2 stateless VP8 de-staging | expand

Pull-request

git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.13c

Message

Hans Verkuil March 4, 2021, 7:44 a.m. UTC 
De-staging the VP8 codec.

Many thanks to Ezequiel for working on this!

Regards,

	Hans

The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8:

  Linux 5.12-rc1 (2021-02-28 16:05:19 -0800)

are available in the Git repository at:

  git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.13c

for you to fetch changes up to 262278126d4e1a69ea29edf7bfeb1f7efb6bf815:

  media: uapi: move VP8 stateless controls out of staging (2021-03-04 08:34:50 +0100)

----------------------------------------------------------------
Tag branch

----------------------------------------------------------------
Ezequiel Garcia (8):
      media: uapi: vp8: Remove "header" from symbol names and macros
      media: uapi: vp8: Rename v4l2_vp8_loopfilter to v4l2_vp8_loop_filter
      media: uapi: vp8: Add proper kernel-doc documentation
      media: uapi: Move parsed VP8 pixel format out of staging
      media: uapi: Move the VP8 stateless control type out of staging
      media: controls: Log VP8 stateless control in .std_log
      media: vp8: Rename V4L2 VP8 specific macro to V4L2_VP8_
      media: uapi: move VP8 stateless controls out of staging

 Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst | 318 +++++++++++++++++++++++++++++++
 Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst           | 323 --------------------------------
 Documentation/userspace-api/media/v4l/pixfmt-compressed.rst         |  15 +-
 Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst        |   4 +
 Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst          |   6 +
 Documentation/userspace-api/media/videodev2.h.rst.exceptions        |   1 +
 drivers/media/v4l2-core/v4l2-ctrls.c                                |  39 ++--
 drivers/staging/media/hantro/hantro_drv.c                           |   2 +-
 drivers/staging/media/hantro/hantro_g1_vp8_dec.c                    |  55 +++---
 drivers/staging/media/hantro/hantro_hw.h                            |   2 +-
 drivers/staging/media/hantro/hantro_vp8.c                           |  10 +-
 drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c                |  55 +++---
 drivers/staging/media/sunxi/cedrus/cedrus.c                         |   2 +-
 drivers/staging/media/sunxi/cedrus/cedrus.h                         |   2 +-
 drivers/staging/media/sunxi/cedrus/cedrus_dec.c                     |   2 +-
 drivers/staging/media/sunxi/cedrus/cedrus_vp8.c                     | 113 +++++------
 include/media/v4l2-ctrls.h                                          |   5 +-
 include/media/vp8-ctrls.h                                           | 114 -----------
 include/uapi/linux/v4l2-controls.h                                  | 195 +++++++++++++++++++
 include/uapi/linux/videodev2.h                                      |   4 +
 20 files changed, 677 insertions(+), 590 deletions(-)
 delete mode 100644 include/media/vp8-ctrls.h

Comments

Jenkins March 4, 2021, 8:01 a.m. UTC | #1 
From: builder@linuxtv.org

Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/7bcaf084-b0fd-8bf8-92df-0eee02d924a3@xs4all.nl/
Build log: https://builder.linuxtv.org/job/patchwork/92769/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/7bcaf084-b0fd-8bf8-92df-0eee02d924a3@xs4all.nl

gpg: Signature made Thu 04 Mar 2021 07:42:47 AM UTC
gpg:                using RSA key AAA7FFBA4D2D77EF4CAEA1421326E0CD23ABDCE5
gpg: Good signature from "Hans Verkuil <hverkuil-cisco@xs4all.nl>" [unknown]
gpg:                 aka "Hans Verkuil <hverkuil@xs4all.nl>" [full]
gpg: Note: This key has expired!
Primary key fingerprint: 052C DE7B C215 053B 689F  1BCA BD2D 6148 6614 3B4C
     Subkey fingerprint: AAA7 FFBA 4D2D 77EF 4CAE  A142 1326 E0CD 23AB DCE5


Build aborted due to a fatal error:
FAILED: patch patch patches/0001-media-uapi-vp8-Remove-header-from-symbol-names-and-m.patch doesn't apply:
Applying patch patches/0001-media-uapi-vp8-Remove-header-from-symbol-names-and-m.patch
patching file Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
Hunk #1 succeeded at 1780 (offset 31 lines).
Hunk #2 FAILED at 1760.
Hunk #3 FAILED at 1850.
Hunk #4 succeeded at 1904 (offset 41 lines).
Hunk #5 FAILED at 1906.
Hunk #6 succeeded at 1972 with fuzz 2 (offset 41 lines).
Hunk #7 FAILED at 1944.
Hunk #8 succeeded at 2035 with fuzz 2 (offset 49 lines).
Hunk #9 succeeded at 2048 (offset 49 lines).
Hunk #10 FAILED at 2010.
Hunk #11 FAILED at 2043.
6 out of 11 hunks FAILED -- rejects in file Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
patching file Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
Hunk #1 succeeded at 157 (offset 6 lines).
patching file drivers/media/v4l2-core/v4l2-ctrls.c
patching file drivers/staging/media/hantro/hantro_drv.c
patching file drivers/staging/media/hantro/hantro_g1_vp8_dec.c
patching file drivers/staging/media/hantro/hantro_hw.h
patching file drivers/staging/media/hantro/hantro_vp8.c
patching file drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
patching file drivers/staging/media/sunxi/cedrus/cedrus.c
patching file drivers/staging/media/sunxi/cedrus/cedrus.h
patching file drivers/staging/media/sunxi/cedrus/cedrus_dec.c
patching file drivers/staging/media/sunxi/cedrus/cedrus_vp8.c
patching file include/media/v4l2-ctrls.h
patching file include/media/vp8-ctrls.h
Patch patches/0001-media-uapi-vp8-Remove-header-from-symbol-names-and-m.patch does not apply (enforce with -f)
Mauro Carvalho Chehab March 5, 2021, 3:03 p.m. UTC | #2 
Em Thu, 4 Mar 2021 08:44:18 +0100
Hans Verkuil <hverkuil@xs4all.nl> escreveu:

> De-staging the VP8 codec.
> 
> Many thanks to Ezequiel for working on this!

There are more work to do:

./scripts/kernel-doc --none include/uapi/linux/v4l2-controls.h

	include/uapi/linux/v4l2-controls.h:1727: warning: bad line: 
	include/uapi/linux/v4l2-controls.h:1853: warning: expecting prototype for struct v4l2_vp8_frame. Prototype was for struct v4l2_ctrl_vp8_frame instead

And, after fixing those warnings, 3 new ones are produced:

	include/uapi/linux/v4l2-controls.h:1853: warning: Function parameter or member 'segment' not described in 'v4l2_ctrl_vp8_frame'
	include/uapi/linux/v4l2-controls.h:1853: warning: Function parameter or member 'entropy' not described in 'v4l2_ctrl_vp8_frame'
	include/uapi/linux/v4l2-controls.h:1853: warning: Function parameter or member 'coder_state' not described in 'v4l2_ctrl_vp8_frame'

Regards,
Mauro

> 
> Regards,
> 
> 	Hans
> 
> The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8:
> 
>   Linux 5.12-rc1 (2021-02-28 16:05:19 -0800)
> 
> are available in the Git repository at:
> 
>   git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.13c
> 
> for you to fetch changes up to 262278126d4e1a69ea29edf7bfeb1f7efb6bf815:
> 
>   media: uapi: move VP8 stateless controls out of staging (2021-03-04 08:34:50 +0100)
> 
> ----------------------------------------------------------------
> Tag branch
> 
> ----------------------------------------------------------------
> Ezequiel Garcia (8):
>       media: uapi: vp8: Remove "header" from symbol names and macros
>       media: uapi: vp8: Rename v4l2_vp8_loopfilter to v4l2_vp8_loop_filter
>       media: uapi: vp8: Add proper kernel-doc documentation
>       media: uapi: Move parsed VP8 pixel format out of staging
>       media: uapi: Move the VP8 stateless control type out of staging
>       media: controls: Log VP8 stateless control in .std_log
>       media: vp8: Rename V4L2 VP8 specific macro to V4L2_VP8_
>       media: uapi: move VP8 stateless controls out of staging
> 
>  Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst | 318 +++++++++++++++++++++++++++++++
>  Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst           | 323 --------------------------------
>  Documentation/userspace-api/media/v4l/pixfmt-compressed.rst         |  15 +-
>  Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst        |   4 +
>  Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst          |   6 +
>  Documentation/userspace-api/media/videodev2.h.rst.exceptions        |   1 +
>  drivers/media/v4l2-core/v4l2-ctrls.c                                |  39 ++--
>  drivers/staging/media/hantro/hantro_drv.c                           |   2 +-
>  drivers/staging/media/hantro/hantro_g1_vp8_dec.c                    |  55 +++---
>  drivers/staging/media/hantro/hantro_hw.h                            |   2 +-
>  drivers/staging/media/hantro/hantro_vp8.c                           |  10 +-
>  drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c                |  55 +++---
>  drivers/staging/media/sunxi/cedrus/cedrus.c                         |   2 +-
>  drivers/staging/media/sunxi/cedrus/cedrus.h                         |   2 +-
>  drivers/staging/media/sunxi/cedrus/cedrus_dec.c                     |   2 +-
>  drivers/staging/media/sunxi/cedrus/cedrus_vp8.c                     | 113 +++++------
>  include/media/v4l2-ctrls.h                                          |   5 +-
>  include/media/vp8-ctrls.h                                           | 114 -----------
>  include/uapi/linux/v4l2-controls.h                                  | 195 +++++++++++++++++++
>  include/uapi/linux/videodev2.h                                      |   4 +
>  20 files changed, 677 insertions(+), 590 deletions(-)
>  delete mode 100644 include/media/vp8-ctrls.h



Thanks,
Mauro