[PATCH 00/15] v4l2-controls.h: rename _MPEG_ to _CODEC_

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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





[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux