Commit Graph

79 Commits

Author SHA1 Message Date
svenhoefer
11a28c07d6 Merge branch 'master' into pu/mp 2017-04-19 21:35:56 +02:00
Jacek Jendrzej
a3bf23d9c9 try to fix version check for avformat codecpar 2017-04-19 17:19:43 +02:00
Jacek Jendrzej
76530e2c05 try fix segfault with --enable-cleanup 2017-03-13 19:13:37 +01:00
Stefan Seyfried
6f1cfd42bb Merge remote-tracking branch 'tuxbox/master' 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
bfa589eb08 make neutrino compatible with new ffmpeg 2017-03-07 15:00:17 +01:00
Stefan Seyfried
ff0d98bcc3 streamts: don't overflow receive buffer, better diag message 2017-02-12 22:58:58 +01:00
Stefan Seyfried
ec3201ab04 streamts: don't overflow receive buffer, better diag message 2017-02-12 16:56:10 +01:00
Stefan Seyfried
f397d08cd3 Merge remote-tracking branch 'tuxbox/master' 2017-01-29 02:14:32 +01:00
Jacek Jendrzej
e111bf7418 movieplayer dont chache last realurl for lua script 2017-01-26 11:55:06 +01:00
Stefan Seyfried
7154f36258 driver: use newer ffmpeg API
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(
2016-11-13 01:44:45 +01:00
Stefan Seyfried
4a400c909a driver: use newer ffmpeg API
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(
2016-11-12 22:16:42 +01:00
Stefan Seyfried
5bf115db80 record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg
2016-10-24 09:45:23 +02:00
Stefan Seyfried
5f33ee96fd record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg
2016-10-22 12:02:10 +02:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
vanhofen
f45d4d2bd5 - streamts: fix -Wformat warning 2016-09-29 10:53:06 +02:00
Jacek Jendrzej
ed02b4c81e src/driver/streamts.cpp try to fix send err loop 2016-04-11 12:48:09 +02:00
Jacek Jendrzej
b526c2480c src/driver/streamts.cpp check after new 2016-04-10 19:42:39 +02:00
Jacek Jendrzej
a830d0d587 add av_dict_free, fix memleak 2016-04-04 15:38:51 +02:00
Jacek Jendrzej
a61b8de691 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name'; 2016-03-25 17:16:54 +01:00
[CST] Focus
59c4b42376 driver/record.cpp, driver/streamts.cpp: ignore bitstream filter errors 2016-03-21 13:44:43 +03:00
Jacek Jendrzej
2adcd8b5d6 src/driver/streamts.cpp init bsfc, fix possible segfault 2016-03-12 16:13:22 +01:00
[CST] Focus
f3a2657c9e driver/record.cpp, driver/streamts.cpp: add more formats, for testing 2016-03-12 14:53:11 +03:00
[CST] Focus
a19083f60d driver/streamts.cpp: fix webtv streaming for live urls via lua plugins 2016-03-04 13:04:34 +03:00
Jacek Jendrzej
7db16952f6 (performance) Prefer prefix ++/-- operators for non-primitive types 2016-02-16 13:02:10 +01:00
[CST] Focus
97d7dc2e6b driver/streamts.cpp: fix webtv stream open 2016-02-05 19:27:31 +03:00
[CST] Focus
c13eb939fe driver/streamts.cpp: add webtv channels streaming for compatible streams 2016-02-05 18:57:42 +03:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
[CST] Focus
5a000b6a4e driver/streamts.cpp: bug fix: SO_SNDBUF for connection fd 2015-09-24 13:32:38 +03:00
Stefan Seyfried
fca14b17c5 set threadnames to unique values 2015-02-28 10:53:18 +01:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
[CST] Focus
a473fe8194 webtv channels integration port,
initial code (C) martii,
initial patch from jacek
2014-08-27 17:32:26 +04:00
Jacek Jendrzej
d9483e019e -add h265 to record and stream 2014-05-29 16:23:36 +02:00
Stefan Seyfried
1a8f4de81e streamts: fix format-string warnings 2014-04-27 19:26:51 +02:00
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2014-04-27 19:14:06 +02:00
Jacek Jendrzej
c170b03b9a streamts.cpp StreamInstance::Send: do not block neutrino by faulty stream 2014-04-07 16:01:27 +02:00
[CST] Focus
b96a7d43a6 driver/streamts.cpp: optimize poll timeout, cancel thread on stop 2014-03-27 18:56:49 +04:00
[CST] Focus
ded947f05a driver/streamts.cpp: add support to stream from different tuners 2014-03-26 14:31:11 +04:00
[CST] Focus
50eb534417 Revert "streamts: put zapit back into standby after streaming"
This reverts commit 8c0cb5b96e.
2014-03-26 14:30:29 +04:00
[CST] Focus
1dfc9c1449 Revert "streamts: set CPU freq to 'high' for streaming"
This reverts commit c9a3b34810.
2014-03-26 14:30:20 +04:00
Stefan Seyfried
c9a3b34810 streamts: set CPU freq to 'high' for streaming 2014-01-13 20:56:11 +01:00
Stefan Seyfried
8c0cb5b96e streamts: put zapit back into standby after streaming
additionally, update copyright info
2014-01-13 20:55:49 +01:00
Stefan Seyfried
145a1c0938 streamts: improve channel switching logic 2014-01-12 23:32:42 +01:00
Stefan Seyfried
1a37ab57a2 streamts: set CPU freq to 'high' for streaming 2014-01-11 18:09:05 +01:00
Stefan Seyfried
573dc62736 streamts: put zapit back into standby after streaming
additionally, update copyright info
2014-01-11 18:07:17 +01:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
Jacek Jendrzej
d92ad1de0d CGenPsi:: add EAC3 audio support, revork genpsi 2013-10-09 21:51:18 +02:00
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
ada1ec3e60 streamts: add dvbsub and teletext pid to stream 2013-08-08 15:09:30 +02:00
Jacek Jendrzej
7a3b584920 genpsi: add pcr pid handling 2013-08-01 17:54:51 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
2013-05-10 10:06:47 +02:00