Skip to content

Commit

Permalink
[media] solo6x10: sync to latest code from Bluecherry's git repo
Browse files Browse the repository at this point in the history
Synced to commit e9815ac5503ae60cfbf6ff8037035de8f62e2846 from
branch next in git repository https://github.com/bluecherrydvr/solo6x10.git
Only removed some code under #if LINUX_VERSION_CODE < some-kernel-version,
renamed the driver back to solo6x10 from solo6x10-edge, removed the
unnecessary compat.h header and kept the slab.h includes.
Otherwise the code is identical.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Mar 25, 2013
1 parent c535cc6 commit dcae5da
Show file tree
Hide file tree
Showing 19 changed files with 2,376 additions and 1,732 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/media/solo6x10/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o
solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o eeprom.o

obj-$(CONFIG_SOLO6X10) += solo6x10.o
33 changes: 12 additions & 21 deletions drivers/staging/media/solo6x10/TODO
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
TODO (staging => main):

* Motion detection flags need to be moved to v4l2
* Some private CIDs need to be moved to v4l2

TODO (general):

* encoder on/off controls
* mpeg cid bitrate mode (vbr/cbr)
* mpeg cid bitrate/bitrate-peak
* mpeg encode of user data
* mpeg decode of user data
* switch between 4 frames/irq to 1 when using mjpeg (and then back
when not)
* implement a CID control for motion areas/thresholds
* implement CID controls for mozaic areas
* allow for higher level of interval (for < 1 fps)
* sound:
- implement playback via external sound jack
- implement loopback of external sound jack with incoming audio?
- implement pause/resume
- batch up desc requests for more efficient use of p2m?
- encoder on/off controls
- mpeg cid bitrate mode (vbr/cbr)
- mpeg cid bitrate/bitrate-peak
- mpeg encode of user data
- mpeg decode of user data
- implement CID controls for mozaic areas

- sound
- implement playback via external sound jack
- implement loopback of external sound jack with incoming audio?
- implement pause/resume (make use of in bc-server)

Please send patches to the linux media list <linux-media@vger.kernel.org> and
Cc Ismael Luceno <ismael.luceno@corp.bluecherry.net>.
Loading

0 comments on commit dcae5da

Please sign in to comment.