diff options
-rw-r--r-- | drivers/media/pci/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/pci/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/pci/zoran/Kconfig (renamed from drivers/staging/media/zoran/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/Makefile (renamed from drivers/staging/media/zoran/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/videocodec.c (renamed from drivers/staging/media/zoran/videocodec.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/videocodec.h (renamed from drivers/staging/media/zoran/videocodec.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zoran.h (renamed from drivers/staging/media/zoran/zoran.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zoran_card.c (renamed from drivers/staging/media/zoran/zoran_card.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zoran_card.h (renamed from drivers/staging/media/zoran/zoran_card.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zoran_device.c (renamed from drivers/staging/media/zoran/zoran_device.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zoran_device.h (renamed from drivers/staging/media/zoran/zoran_device.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zoran_driver.c (renamed from drivers/staging/media/zoran/zoran_driver.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36016.c (renamed from drivers/staging/media/zoran/zr36016.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36016.h (renamed from drivers/staging/media/zoran/zr36016.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36050.c (renamed from drivers/staging/media/zoran/zr36050.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36050.h (renamed from drivers/staging/media/zoran/zr36050.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36057.h (renamed from drivers/staging/media/zoran/zr36057.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36060.c (renamed from drivers/staging/media/zoran/zr36060.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/zoran/zr36060.h (renamed from drivers/staging/media/zoran/zr36060.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/media/zoran/TODO | 19 |
22 files changed, 2 insertions, 22 deletions
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig index 1224d908713a..7a229dddadaf 100644 --- a/drivers/media/pci/Kconfig +++ b/drivers/media/pci/Kconfig @@ -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 diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile index 551169a3e434..00d740b953d5 100644 --- a/drivers/media/pci/Makefile +++ b/drivers/media/pci/Makefile @@ -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/ diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/media/pci/zoran/Kconfig index 3fb3e27e04a8..3fb3e27e04a8 100644 --- a/drivers/staging/media/zoran/Kconfig +++ b/drivers/media/pci/zoran/Kconfig diff --git a/drivers/staging/media/zoran/Makefile b/drivers/media/pci/zoran/Makefile index 9603bac0195c..9603bac0195c 100644 --- a/drivers/staging/media/zoran/Makefile +++ b/drivers/media/pci/zoran/Makefile diff --git a/drivers/staging/media/zoran/videocodec.c b/drivers/media/pci/zoran/videocodec.c index 8efc5e06b0f7..8efc5e06b0f7 100644 --- a/drivers/staging/media/zoran/videocodec.c +++ b/drivers/media/pci/zoran/videocodec.c diff --git a/drivers/staging/media/zoran/videocodec.h b/drivers/media/pci/zoran/videocodec.h index 6b69f69667f9..6b69f69667f9 100644 --- a/drivers/staging/media/zoran/videocodec.h +++ b/drivers/media/pci/zoran/videocodec.h diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h index 56340553b282..56340553b282 100644 --- a/drivers/staging/media/zoran/zoran.h +++ b/drivers/media/pci/zoran/zoran.h diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c index 3975fc1b2ee3..3975fc1b2ee3 100644 --- a/drivers/staging/media/zoran/zoran_card.c +++ b/drivers/media/pci/zoran/zoran_card.c diff --git a/drivers/staging/media/zoran/zoran_card.h b/drivers/media/pci/zoran/zoran_card.h index 518cb426b446..518cb426b446 100644 --- a/drivers/staging/media/zoran/zoran_card.h +++ b/drivers/media/pci/zoran/zoran_card.h diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/media/pci/zoran/zoran_device.c index 31f049b55529..31f049b55529 100644 --- a/drivers/staging/media/zoran/zoran_device.c +++ b/drivers/media/pci/zoran/zoran_device.c diff --git a/drivers/staging/media/zoran/zoran_device.h b/drivers/media/pci/zoran/zoran_device.h index 34fd5cc914eb..34fd5cc914eb 100644 --- a/drivers/staging/media/zoran/zoran_device.h +++ b/drivers/media/pci/zoran/zoran_device.h diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c index fa672cc8bc67..fa672cc8bc67 100644 --- a/drivers/staging/media/zoran/zoran_driver.c +++ b/drivers/media/pci/zoran/zoran_driver.c diff --git a/drivers/staging/media/zoran/zr36016.c b/drivers/media/pci/zoran/zr36016.c index 4b328ad6083f..4b328ad6083f 100644 --- a/drivers/staging/media/zoran/zr36016.c +++ b/drivers/media/pci/zoran/zr36016.c diff --git a/drivers/staging/media/zoran/zr36016.h b/drivers/media/pci/zoran/zr36016.h index 04afba35669d..04afba35669d 100644 --- a/drivers/staging/media/zoran/zr36016.h +++ b/drivers/media/pci/zoran/zr36016.h diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/media/pci/zoran/zr36050.c index b07d7e5c1b4a..b07d7e5c1b4a 100644 --- a/drivers/staging/media/zoran/zr36050.c +++ b/drivers/media/pci/zoran/zr36050.c diff --git a/drivers/staging/media/zoran/zr36050.h b/drivers/media/pci/zoran/zr36050.h index f9b58f4c77b9..f9b58f4c77b9 100644 --- a/drivers/staging/media/zoran/zr36050.h +++ b/drivers/media/pci/zoran/zr36050.h diff --git a/drivers/staging/media/zoran/zr36057.h b/drivers/media/pci/zoran/zr36057.h index 45d8afc62b37..45d8afc62b37 100644 --- a/drivers/staging/media/zoran/zr36057.h +++ b/drivers/media/pci/zoran/zr36057.h diff --git a/drivers/staging/media/zoran/zr36060.c b/drivers/media/pci/zoran/zr36060.c index 75fd167603dc..75fd167603dc 100644 --- a/drivers/staging/media/zoran/zr36060.c +++ b/drivers/media/pci/zoran/zr36060.c diff --git a/drivers/staging/media/zoran/zr36060.h b/drivers/media/pci/zoran/zr36060.h index 75c88677a4bd..75c88677a4bd 100644 --- a/drivers/staging/media/zoran/zr36060.h +++ b/drivers/media/pci/zoran/zr36060.h diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 421ce9dbf44c..ce379cae01b9 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -44,6 +44,4 @@ source "drivers/staging/media/sunxi/Kconfig" source "drivers/staging/media/tegra-video/Kconfig" -source "drivers/staging/media/zoran/Kconfig" - endif diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 950e96f10aad..7ece57ca0403 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -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/ diff --git a/drivers/staging/media/zoran/TODO b/drivers/staging/media/zoran/TODO deleted file mode 100644 index 6992540d3e53..000000000000 --- a/drivers/staging/media/zoran/TODO +++ /dev/null @@ -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 |