From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: linux-media@vger.kernel.org
Cc: Ezequiel Garcia <ezequiel@collabora.com>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
Tomasz Figa <tfiga@chromium.org>,
Alexandre Courbot <acourbot@chromium.org>
Subject: [PATCH 00/15] v4l2-controls.h: rename _MPEG_ to _CODEC_
Date: Sat, 13 Mar 2021 15:43:08 +0100 [thread overview]
Message-ID: <20210313144323.143600-1-hverkuil-cisco@xs4all.nl> (raw)
The first codec that was supported in V4L2 was the MPEG codec.
As a result of that all codec controls and related data structures
where all prefixed with MPEG. This is confusing and in fact makes
it hard to find the MPEG-specific controls since all controls have
'MPEG' in their name.
This patch series renames all controls and data structures to use
CODEC instead of MPEG, and adds defines for compatibility at the end.
The first patch fixes a typo in the documentation. I posted that
as a seperate patch, but it makes sense to combine this in this series
since it depends on this fix.
Then v4l2-controls.h is modified, renaming MPEG to CODEC and creating
aliases for the old names.
Next the documentation is updated, followed by the drivers/media/*
directories, drivers/staging/media, include/media, videodev2.h and
staging/vc04_services.
Finally the aliases in v4l2-controls.h are placed under #ifndef __KERNEL__
to ensure that the kernel code can't use those anymore.
This patch has no functional changes, only renames and the addition
of compatibility defines at the end.
Regards,
Hans
Hans Verkuil (15):
ext-ctrls-codec.rst: fix typos
v4l2-controls.h: rename _MPEG_ to _CODEC_
Documentation/*/media: rename MPEG to CODEC
media/common: rename MPEG to CODEC
media/i2c: rename MPEG to CODEC
media/v4l2-core: rename MPEG to CODEC
media/pci: rename MPEG to CODEC
media/usb: rename MPEG to CODEC
media/platform: rename MPEG to CODEC
media/test-drivers: rename MPEG to CODEC
staging/media: rename MPEG to CODEC
include/media: rename MPEG to CODEC
videodev2.h: rename MPEG to CODEC
staging/vc04_services: rename MPEG to CODEC
v4l2-controls.h: place all MPEG aliases under #ifndef __KERNEL__
.../driver-api/media/v4l2-controls.rst | 2 +-
.../media/drivers/cx2341x-uapi.rst | 8 +-
.../dvb/audio-bilingual-channel-select.rst | 2 +-
.../media/dvb/audio-channel-select.rst | 2 +-
.../media/dvb/video-get-frame-count.rst | 2 +-
.../userspace-api/media/dvb/video-get-pts.rst | 2 +-
.../media/v4l/dev-sliced-vbi.rst | 14 +-
.../media/v4l/ext-ctrls-codec.rst | 1250 +++++------
.../userspace-api/media/v4l/hist-v4l2.rst | 6 +-
.../media/v4l/pixfmt-compressed.rst | 18 +-
.../userspace-api/media/v4l/v4l2.rst | 4 +-
drivers/media/common/cx2341x.c | 836 ++++----
drivers/media/i2c/saa6752hs.c | 144 +-
drivers/media/pci/cx18/cx18-controls.c | 14 +-
drivers/media/pci/ivtv/ivtv-controls.c | 10 +-
drivers/media/pci/ivtv/ivtv-driver.c | 22 +-
drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +-
drivers/media/pci/saa7164/saa7164-api.c | 12 +-
drivers/media/pci/saa7164/saa7164-core.c | 4 +-
drivers/media/pci/saa7164/saa7164-encoder.c | 52 +-
drivers/media/pci/saa7164/saa7164.h | 4 +-
.../media/pci/solo6x10/solo6x10-v4l2-enc.c | 8 +-
drivers/media/pci/tw5864/tw5864-video.c | 8 +-
.../media/platform/allegro-dvt/allegro-core.c | 348 ++--
drivers/media/platform/allegro-dvt/nal-h264.c | 52 +-
drivers/media/platform/allegro-dvt/nal-h264.h | 4 +-
drivers/media/platform/allegro-dvt/nal-hevc.c | 42 +-
drivers/media/platform/allegro-dvt/nal-hevc.h | 6 +-
drivers/media/platform/coda/coda-bit.c | 8 +-
drivers/media/platform/coda/coda-common.c | 218 +-
drivers/media/platform/coda/coda-h264.c | 40 +-
drivers/media/platform/coda/coda-mpeg2.c | 18 +-
drivers/media/platform/coda/coda-mpeg4.c | 22 +-
drivers/media/platform/coda/coda.h | 2 +-
.../platform/mtk-vcodec/mtk_vcodec_dec.c | 6 +-
.../platform/mtk-vcodec/mtk_vcodec_enc.c | 80 +-
.../platform/mtk-vcodec/venc/venc_h264_if.c | 38 +-
drivers/media/platform/qcom/venus/helpers.c | 154 +-
.../media/platform/qcom/venus/vdec_ctrls.c | 92 +-
drivers/media/platform/qcom/venus/venc.c | 26 +-
.../media/platform/qcom/venus/venc_ctrls.c | 294 +--
.../media/platform/s5p-mfc/s5p_mfc_common.h | 28 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 16 +-
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 764 +++----
.../media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 12 +-
.../media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 38 +-
drivers/media/platform/sti/hva/hva-debugfs.c | 10 +-
drivers/media/platform/sti/hva/hva-h264.c | 48 +-
drivers/media/platform/sti/hva/hva-v4l2.c | 100 +-
drivers/media/platform/sti/hva/hva.h | 14 +-
.../media/test-drivers/vicodec/vicodec-core.c | 4 +-
drivers/media/usb/cx231xx/cx231xx-417.c | 2 +-
drivers/media/usb/go7007/go7007-v4l2.c | 22 +-
drivers/media/usb/hdpvr/hdpvr-control.c | 6 +-
drivers/media/usb/hdpvr/hdpvr-core.c | 4 +-
drivers/media/usb/hdpvr/hdpvr-video.c | 46 +-
drivers/media/usb/hdpvr/hdpvr.h | 4 +-
drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 72 +-
drivers/media/v4l2-core/v4l2-ctrls.c | 640 +++---
drivers/staging/media/hantro/hantro_drv.c | 16 +-
.../media/hantro/hantro_g1_mpeg2_dec.c | 4 +-
.../staging/media/hantro/hantro_g1_vp8_dec.c | 2 +-
.../media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 +-
.../media/hantro/rk3399_vpu_hw_vp8_dec.c | 2 +-
drivers/staging/media/rkvdec/rkvdec.c | 16 +-
drivers/staging/media/sunxi/cedrus/cedrus.c | 34 +-
.../staging/media/sunxi/cedrus/cedrus_dec.c | 12 +-
.../bcm2835-camera/bcm2835-camera.c | 4 +-
.../bcm2835-camera/bcm2835-camera.h | 4 +-
.../vc04_services/bcm2835-camera/controls.c | 126 +-
include/media/drv-intf/cx2341x.h | 36 +-
include/media/hevc-ctrls.h | 22 +-
include/media/mpeg2-ctrls.h | 4 +-
include/media/vp8-ctrls.h | 2 +-
include/uapi/linux/v4l2-controls.h | 1824 +++++++++++------
include/uapi/linux/videodev2.h | 4 +-
76 files changed, 4195 insertions(+), 3629 deletions(-)
--
2.30.1
next reply other threads:[~2021-03-13 14:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-13 14:43 Hans Verkuil [this message]
2021-03-13 14:43 ` [PATCH 01/15] ext-ctrls-codec.rst: fix typos Hans Verkuil
2021-03-13 14:43 ` [PATCH 02/15] v4l2-controls.h: rename _MPEG_ to _CODEC_ Hans Verkuil
2021-03-13 14:43 ` [PATCH 03/15] Documentation/*/media: rename MPEG to CODEC Hans Verkuil
2021-03-13 14:43 ` [PATCH 04/15] media/common: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 05/15] media/i2c: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 06/15] media/v4l2-core: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 07/15] media/pci: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 08/15] media/usb: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 09/15] media/platform: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 10/15] media/test-drivers: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 11/15] staging/media: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 12/15] include/media: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 13/15] videodev2.h: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 14/15] staging/vc04_services: " Hans Verkuil
2021-03-13 14:43 ` [PATCH 15/15] v4l2-controls.h: place all MPEG aliases under #ifndef __KERNEL__ Hans Verkuil
2021-03-14 8:23 ` [PATCH 16/15] ext-ctrls-codec.rst: update note at start of codec section Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210313144323.143600-1-hverkuil-cisco@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=acourbot@chromium.org \
--cc=ezequiel@collabora.com \
--cc=linux-media@vger.kernel.org \
--cc=nicolas@ndufresne.ca \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).