forked from j62/ctbrec
1
0
Fork 0
Commit Graph

2304 Commits

Author SHA1 Message Date
0xboobface dba4aa0a02 Fix OutOfMemoryErrors
1. Catch exceptions thrown by ContinuityFixer and skip to the next
packet.
2. Restrict the queue size to 10 segments. Otherwise, if the download
is faster than the stream is written to hard disk, the queue builds
up with segments until the heap exceeds its maximum size
2018-09-10 17:52:11 +02:00
0xboobface dd316070a5 Set httpTimeout to 10000ms instead of 10ms 2018-09-10 17:44:42 +02:00
0xboobface 527f5f61ff Add setting to split up the recording after x minutes 2018-09-10 13:45:05 +02:00
0xboobface 01aa04b3da Catch exceptions in Stream.stop() 2018-09-09 19:23:42 +02:00
0xboobface 42186208bf Fix typo in log message 2018-09-09 17:55:58 +02:00
0xboobface a361f08f67 Update download links to 1.5.0 2018-09-09 14:47:08 +02:00
0xboobface d0a28aee2f Remove exludes from delete method
The excludes is not used anymore, since the whole merging mechanism
has been removed.

Add more debug statements for the different delete statements.
2018-09-09 14:40:08 +02:00
0xboobface 1c5bcaef35 Make sure the streamer is stopped
The streamer has to be stopped, when the download is stopped or
terminates to release the file handle of the recording and to stop
the merge thread
2018-09-09 14:30:21 +02:00
0xboobface 80cafbb47d Update changelog 2018-09-09 14:28:49 +02:00
0xboobface 94cc2adc25 Bumb version to 1.5.0 2018-09-09 14:28:41 +02:00
0xboobface 455dea97d9 Try not to write to sink, if the streamer has been stopped 2018-09-09 14:28:29 +02:00
0xboobface 17901901f9 Ignore empty recording directories in LocalRecorder.getRecordings() 2018-09-08 21:56:18 +02:00
0xboobface 528d7336e1 Simplify integration of mpegts-streamer
Get rid of unneded thread complexity.
Use Queue.take() instead of poll() to avoid unnecessary looping and
the CPU load it causes.
2018-09-08 21:53:39 +02:00
0xboobface 7efbeac565 Adjust detection of recording state to new download mechanism 2018-09-08 00:37:15 +02:00
0xboobface 89a69fa797 Change the name of a merged recording to model-date.ts 2018-09-08 00:17:40 +02:00
0xboobface 8fcc8e0f91 Reimplement the download so that it uses the BlockingMultiMTSSource
This should create a transport stream file with proper continuity counters
and timestamps
2018-09-07 23:59:37 +02:00
0xboobface 7f881504a6 Merge branch 'master' into mpegts-streamer 2018-09-07 17:24:36 +02:00
0xboobface cda1f25dc0 Remove segment mergers
Segment mergers are not needed anymore. Segments get merged during the
recording or during the download from the server.
2018-09-07 17:23:42 +02:00
0xboobface 7cc5764461 Add System property ctbrec.server.mode on server startup
This property gets set by the server, so that we know,
if we are running in server mode or not
2018-09-07 17:20:07 +02:00
0xboobface 3cf3f2751e Improved logging message 2018-09-07 16:51:12 +02:00
0xboobface 51d48bbe87 Remove unnecessary throw clause
Rmove unnecessary throw IOException clause from the constructor of
InputStreamMTSSource
2018-09-07 16:50:24 +02:00
0xboobface b91888f2ae Improve logging messages 2018-09-07 16:46:49 +02:00
0xboobface 85618289d5 Remove dead code 2018-09-07 15:44:22 +02:00
0xboobface 5df0c25a9d Organize imports 2018-09-07 15:43:59 +02:00
0xboobface 4054ceed96 Bumb version to 1.5.0-SNAPSHOT 2018-09-07 15:38:09 +02:00
0xboobface 7da0aefb35 Update download links to 1.4.3 2018-09-07 15:31:29 +02:00
0xboobface 2555b97944 Bumb version to 1.4.3 2018-09-07 15:28:43 +02:00
0xboobface 2ed07f98a7 Update changelog 2018-09-07 15:28:17 +02:00
0xboobface 017a091d84 Merge branch 'master' into mpegts-streamer 2018-09-07 15:25:21 +02:00
0xboobface 834f6b492c Remove rhino from dependencies
No idea how it ended up in there
2018-09-07 15:23:31 +02:00
0xboobface 1d7dd0d0e8 Merge branch 'master' into mpegts-streamer 2018-09-07 15:20:06 +02:00
0xboobface 698ba72120 Integrate mpegts-streamer to save a recording to a single file
Integrate a modified version of mpegts-streamer (https://github.com/igilham/mpegts-streamer)
Add BlockingMultiMTSSource to mpegts-streamer, which is used to add new InputStreamMTSSources
online for each segment.

Remove all settings and methods, which are needed for segment merging.
2018-09-07 15:16:08 +02:00
0xboobface a147c1b26c Add check for JavaFX on start
On startup check if the application is running on the OpenJDK JVM. If that is the case,
check that JavaFX is available (because OpenJDK comes without JavaFX, it has to be installed
separately). If it is not available, log an error what to do and exit.
2018-09-07 14:31:18 +02:00
0xboobface 9ba0fd624f Save and restore window size, location and maximized state
Save and restore window size, location and maximized state so that
the window opens in the exact same state as when it has been closed.
2018-09-05 14:24:22 +02:00
0xboobface 7d36586b04 Make thumbnail size configurable
Add combobox on the bottom of ThumbOverviewTab.
Add integer thumbWidth to the Settings to save and restore the selected
 value between sessions. Set the selected value for all thumbnails on
all tabs.
2018-09-05 13:54:44 +02:00
0xboobface e0ff933cba Update changelog 2018-09-04 17:05:45 +02:00
0xboobface 22d32bcc64 Add possibility to switch the stream resolution for a recording
Add the possibility to switch the stream resolution for a model, which
already is recorded by the recorder. This makes it more convenient to
switch the resolution, if you already have a bunch of models in the
recorder list.
2018-09-04 16:50:38 +02:00
0xboobface c80f81d937 Add comment and log statement 2018-09-04 16:27:55 +02:00
0xboobface 0cb4b3d9a4 Move stream resolution selection dialog to its own class 2018-09-04 14:55:48 +02:00
0xboobface c4d096eadf Bumbed version to 1.4.3-SNAPSHOT 2018-09-04 14:07:09 +02:00
0xboobface 14ec55ccb0 Set download links to version 1.4.2 2018-09-04 13:42:29 +02:00
0xboobface 1002725c62 Bumbed version to 1.4.2 2018-09-04 13:31:37 +02:00
0xboobface e33c6a3d94 Don't overwrite stream url index for a model on an update
When the manual selection of stream resolution is enabled, the index of
the selected stream is saved in the model object. Don't overwrite this
value, if the model objects get updated, so that the value is persistent
even between sessions.
2018-09-04 13:28:48 +02:00
0xboobface 6383bfb372 Update changelog 2018-08-30 18:54:11 +02:00
0xboobface 79a1ccc011 Enable proxy authentication for SOCKS4 and HTTP 2018-08-30 13:18:19 +02:00
0xboobface cd827a0cb8 Ignore empty recordings directories 2018-08-30 13:04:35 +02:00
0xboobface c57e0c037c Bump version to 1.4.2-SNAPSHOT 2018-08-29 14:37:26 +02:00
0xboobface a312a61d61 Update download links to 1.4.1 2018-08-29 14:37:01 +02:00
0xboobface 57b4ca3bca Bumb version to 1.4.1 2018-08-29 14:31:33 +02:00
0xboobface 0fd04d8afa Update changelog 2018-08-29 14:30:59 +02:00