| Message ID | 5356eed6-6bf0-49ab-32e1-7e632c3e4328@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,FOR,v5.2] cedrus: add H.264 support | expand |
Hi Hans, Em Fri, 12 Apr 2019 14:07:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> escreveu: > The following changes since commit 1c3ec30bb23023d738b538e64ac3028902d53692: > > media: index.rst: exclude Indexes section from latex/pdf output (2019-03-30 09:42:35 -0400) > > are available in the Git repository at: > > git://linuxtv.org/hverkuil/media_tree.git tags/br-cedrus-h264 > > for you to fetch changes up to 496ab402ea2cb3b0ebba3d0e699e0454b611c820: > > media: cedrus: Add H264 decoding support (2019-04-12 13:32:21 +0200) Could you please rebase this one on the top of the media tree? It came with some conflicts. Perhaps some of the patches here were (partially?) applied already, as when I tried to fix the conflict, it complained that some switch would have a duplicated case. Regards, Mauro Thanks, Mauro
The following changes since commit 1c3ec30bb23023d738b538e64ac3028902d53692: media: index.rst: exclude Indexes section from latex/pdf output (2019-03-30 09:42:35 -0400) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-cedrus-h264 for you to fetch changes up to 496ab402ea2cb3b0ebba3d0e699e0454b611c820: media: cedrus: Add H264 decoding support (2019-04-12 13:32:21 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Maxime Ripard (3): media: pixfmt: Add H264 Slice format media: pixfmt: Add H264_SLICE_RAW format documentation media: cedrus: Add H264 decoding support Pawel Osciak (1): media: uapi: Add H264 low-level decoder API compound controls. Documentation/media/uapi/v4l/biblio.rst | 9 + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 569 +++++++++++++++++++++++++++++++++++++++++++++++++++ Documentation/media/uapi/v4l/pixfmt-compressed.rst | 25 +++ Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 30 +++ Documentation/media/videodev2.h.rst.exceptions | 5 + drivers/media/v4l2-core/v4l2-ctrls.c | 42 ++++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + drivers/staging/media/sunxi/cedrus/Makefile | 3 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 31 +++ drivers/staging/media/sunxi/cedrus/cedrus.h | 38 +++- drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 13 ++ drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 574 ++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 4 + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 91 +++++++++ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 9 + include/media/h264-ctrls.h | 197 ++++++++++++++++++ include/media/v4l2-ctrls.h | 13 +- 17 files changed, 1651 insertions(+), 3 deletions(-) create mode 100644 drivers/staging/media/sunxi/cedrus/cedrus_h264.c create mode 100644 include/media/h264-ctrls.h