From a049646f9301c99fa3a1314ea945b1a7079a2781 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Tue, 6 Mar 2018 15:19:35 +0100 Subject: [PATCH] 3.0 -Stream chunk 10MB 1 worker --- pom.xml | 2 +- .../com/tonikelope/megabasterd/KissVideoStreamServer.java | 2 +- src/main/java/com/tonikelope/megabasterd/MainPanel.java | 2 +- .../java/com/tonikelope/megabasterd/SettingsDialog.form | 6 +++--- .../java/com/tonikelope/megabasterd/SettingsDialog.java | 6 +++--- .../java/com/tonikelope/megabasterd/StreamChunkWriter.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 8c38a6cb0..16fcbcea4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tonikelope MegaBasterd - 2.99 + 3.0 jar diff --git a/src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java b/src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java index 883228a17..9ddbeebb2 100644 --- a/src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java +++ b/src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java @@ -37,7 +37,7 @@ public final class KissVideoStreamServer implements HttpHandler, SecureSingleThr public static final int THREAD_START = 0x01; public static final int THREAD_STOP = 0x02; - public static final int CHUNK_WORKERS = 8; + public static final int CHUNK_WORKERS = 1; private final MainPanel _main_panel; private final ConcurrentHashMap> _link_cache; diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java index 73fea77e5..fef0f7072 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java @@ -48,7 +48,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; */ public final class MainPanel { - public static final String VERSION = "2.99"; + public static final String VERSION = "3.0"; public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int STREAMER_PORT = 1337; diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form index 93282adbd..0276f4401 100644 --- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form @@ -325,7 +325,7 @@ - + @@ -600,7 +600,7 @@ - + @@ -727,7 +727,7 @@ - + diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java index e176e7bdc..791950839 100644 --- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java @@ -616,7 +616,7 @@ public final class SettingsDialog extends javax.swing.JDialog { megacrypter_reverse_warning_label.setText("Note: you MUST \"OPEN\" this port in your router/firewall."); rec_download_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N - rec_download_slots_label.setText("Note: if you want to download without using a MEGA PREMIUM account you SHOULD enable MULTI SLOT. "); + rec_download_slots_label.setText("Note: if you want to download without using a MEGA PREMIUM account you SHOULD enable MULTI SLOT (try to set as few slots as possible). "); megacrypter_reverse_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N megacrypter_reverse_checkbox.setText("Use Megacrypter reverse mode"); @@ -916,7 +916,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N - rec_upload_slots_label.setText("Note: MULTI-SLOT is required if you want to exit and resume uploads."); + rec_upload_slots_label.setText("Note: MULTI-SLOT is required if you want to exit and resume uploads (try to set as few slots as possible)."); javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); uploads_panel.setLayout(uploads_panelLayout); @@ -949,7 +949,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(limit_upload_speed_checkbox)) - .addGap(0, 551, Short.MAX_VALUE))) + .addGap(0, 308, Short.MAX_VALUE))) .addContainerGap()))) ); uploads_panelLayout.setVerticalGroup( diff --git a/src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java b/src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java index f20ae732f..035009d20 100644 --- a/src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java @@ -16,8 +16,8 @@ import static com.tonikelope.megabasterd.MiscTools.*; */ public class StreamChunkWriter implements Runnable, SecureMultiThreadNotifiable { - public static final int CHUNK_SIZE = 1048576; - public static final int BUFFER_CHUNKS_SIZE = 20; + public static final int CHUNK_SIZE = 10485760; //10 MB + public static final int BUFFER_CHUNKS_SIZE = 3; private long _next_offset_required; private long _bytes_written; private final long _start_offset;