iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: zoran: move to mainline

Browse Source 
The zoran driver can be moved back to mainline after it has been
converted by Corentin Labbe to vb2.

Note that the zoran driver no longer supports video output, but
video capture is working fine now.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans Verkuil 2022-08-10 13:54:45 +02:00 committed by Mauro Carvalho Chehab
parent 90f6b6affd
commit 2a0c28063d
22 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/pci/Kconfig
View File

@ -19,6 +19,7 @@ source "drivers/media/pci/sta2x11/Kconfig"
source "drivers/media/pci/tw5864/Kconfig"
source "drivers/media/pci/tw68/Kconfig"
source "drivers/media/pci/tw686x/Kconfig"
source "drivers/media/pci/zoran/Kconfig"
endif

1
drivers/media/pci/Makefile
View File

@ -39,3 +39,4 @@ obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
obj-$(CONFIG_VIDEO_TW5864) += tw5864/
obj-$(CONFIG_VIDEO_TW686X) += tw686x/
obj-$(CONFIG_VIDEO_TW68) += tw68/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/

0
drivers/staging/media/zoran/Kconfig → drivers/media/pci/zoran/Kconfig
View File

0
drivers/staging/media/zoran/Makefile → drivers/media/pci/zoran/Makefile
View File

0
drivers/staging/media/zoran/videocodec.c → drivers/media/pci/zoran/videocodec.c
View File

0
drivers/staging/media/zoran/videocodec.h → drivers/media/pci/zoran/videocodec.h
View File

0
drivers/staging/media/zoran/zoran.h → drivers/media/pci/zoran/zoran.h
View File

0
drivers/staging/media/zoran/zoran_card.c → drivers/media/pci/zoran/zoran_card.c
View File

0
drivers/staging/media/zoran/zoran_card.h → drivers/media/pci/zoran/zoran_card.h
View File

0
drivers/staging/media/zoran/zoran_device.c → drivers/media/pci/zoran/zoran_device.c
View File

0
drivers/staging/media/zoran/zoran_device.h → drivers/media/pci/zoran/zoran_device.h
View File

0
drivers/staging/media/zoran/zoran_driver.c → drivers/media/pci/zoran/zoran_driver.c
View File

0
drivers/staging/media/zoran/zr36016.c → drivers/media/pci/zoran/zr36016.c
View File

0
drivers/staging/media/zoran/zr36016.h → drivers/media/pci/zoran/zr36016.h
View File

0
drivers/staging/media/zoran/zr36050.c → drivers/media/pci/zoran/zr36050.c
View File

0
drivers/staging/media/zoran/zr36050.h → drivers/media/pci/zoran/zr36050.h
View File

0
drivers/staging/media/zoran/zr36057.h → drivers/media/pci/zoran/zr36057.h
View File

0
drivers/staging/media/zoran/zr36060.c → drivers/media/pci/zoran/zr36060.c
View File

0
drivers/staging/media/zoran/zr36060.h → drivers/media/pci/zoran/zr36060.h
View File

2
drivers/staging/media/Kconfig
View File

@ -44,6 +44,4 @@ source "drivers/staging/media/sunxi/Kconfig"
source "drivers/staging/media/tegra-video/Kconfig"
source "drivers/staging/media/zoran/Kconfig"
endif

1
drivers/staging/media/Makefile
View File

@ -10,5 +10,4 @@ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/
obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
obj-$(CONFIG_DVB_AV7110) += av7110/

19
drivers/staging/media/zoran/TODO
View File

@ -1,19 +0,0 @@
How to test the zoran driver:
- RAW capture
mplayer tv:///dev/video0 -tv driver=v4l2
- MJPEG capture (compression)
mplayer tv:///dev/video0 -tv driver=v4l2:outfmt=mjpeg
TODO: need two test for both Dcim path
- MJPEG play (decompression)
ffmpeg -i test.avi -vcodec mjpeg -an -f v4l2 /dev/video0
Note: only recent ffmpeg has the ability of sending non-raw video via v4l2
The original way of sending video was via mplayer vo_zr/vo_zr2, but it does not compile
anymore and is a dead end (usage of some old private ffmpeg structures).
TODO
- fix the v4l compliance "TRY_FMT cannot handle an invalid pixelformat"
- Filter JPEG data to made output work