From 16d6bda85d7c487086c574e44250badd315a6cdf Mon Sep 17 00:00:00 2001 From: kapodamy Date: Tue, 16 Apr 2019 23:28:03 -0300 Subject: [PATCH] Webm muxer fixes and strings.xml changes * replace "In queue" to "Pending" in the downloads header to avoid confusions (all languages) * use 29bits Clusters size to support huge video resolutions (fixes #2291) (WebmWriter.java) * add missing changes to WebmMuxer.java (i forget select the audio track) --- .../org/schabi/newpipe/streams/WebMWriter.java | 7 +++---- .../giga/postprocessing/WebMMuxer.java | 18 +++++++++++------- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cmn/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-id/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 6 +++--- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 1 - app/src/main/res/values-nl-rBE/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sq/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 26 files changed, 38 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java index 26b9cbebf..98261b0c9 100644 --- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java +++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java @@ -321,9 +321,8 @@ public class WebMWriter { for (int i = 0; i < clusterSizes.size(); i++) { seekTo(out, clusterOffsets.get(i)); - byte[] size = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x200000).array(); - out.write(size, 1, 3); - written += 3; + byte[] buffer = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x10000000).array(); + dump(buffer, out); } } @@ -451,7 +450,7 @@ public class WebMWriter { /* cluster */ dump(new byte[]{0x1f, 0x43, (byte) 0xb6, 0x75}, stream); clusterOffsets.add(written);// warning: max cluster size is 256 MiB - dump(new byte[]{0x20, 0x00, 0x00}, stream); + dump(new byte[]{0x10, 0x00, 0x00, 0x00}, stream); startOffset = written;// size for the this cluster diff --git a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java index 3d5ecb3cd..618c1ec5a 100644 --- a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java +++ b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java @@ -22,16 +22,20 @@ class WebMMuxer extends Postprocessing { muxer.parseSources(); // youtube uses a webm with a fake video track that acts as a "cover image" - WebMTrack[] tracks = muxer.getTracksFromSource(1); - int audioTrackIndex = 0; - for (int i = 0; i < tracks.length; i++) { - if (tracks[i].kind == TrackKind.Audio) { - audioTrackIndex = i; - break; + int[] indexes = new int[sources.length]; + + for (int i = 0; i < sources.length; i++) { + WebMTrack[] tracks = muxer.getTracksFromSource(i); + for (int j = 0; j < tracks.length; j++) { + if (tracks[j].kind == TrackKind.Audio) { + indexes[i] = j; + i = sources.length; + break; + } } } - muxer.selectTracks(0, audioTrackIndex); + muxer.selectTracks(indexes); muxer.build(out); return OK_RESULT; diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index dbf015c87..cc36e40bf 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -451,7 +451,7 @@ يتوفر تحديث ل newpipe! اضغط لتنزيل انتهى - في قائمة الانتظار + ريثما متوقف في قائمة الانتظار قيد المعالجة diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index f606281f4..04bb36ea3 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -425,7 +425,7 @@ Automàtic Canvia la vista Està disponible una nova actualització del NewPipe! - A la cua + Pendent en pausa a la cua Afegeix a la cua diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml index 73eb43c36..7be9efc04 100644 --- a/app/src/main/res/values-cmn/strings.xml +++ b/app/src/main/res/values-cmn/strings.xml @@ -426,7 +426,7 @@ 自动 轻按以下载 已完成 - 于队列中 + 有待 已暂停 已加入队列 后处理 diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 92535310e..0c699cf0e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -453,4 +453,5 @@ Maksimalt antal forsøg før downloaden opgives Sæt på pause ved skift til mobildata Downloads som ikke kan sættes på pause vil blive genstartet + Afventning \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ef2789846..ae4fda922 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -437,7 +437,7 @@ NewPipe-Aktualisierung verfügbar! Zum Herunterladen antippen Fertig - In der Warteschlange + Ausstehend pausiert eingereiht Nachbearbeitung diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index af5b8b213..6a493892d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -469,6 +469,7 @@ abrir en modo popup No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\? Seleccione los directorios de descarga + Pendiente Desuscribirse Nueva pestaña diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 2868528e9..fb41bf8ae 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -435,7 +435,7 @@ NewPipe eguneraketa eskuragarri! Sakatu deskargatzeko Amaituta - Ilaran + Zain pausatuta ilaran post-prozesua diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 41569ff0c..99f02dde8 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -440,7 +440,6 @@ יצא עדכון ל־NewPipe! יש לגעת כדי להוריד הסתיים - בתור מושהה בתור עיבוד מאוחר @@ -473,4 +472,5 @@ מספר הניסיונות החוזרים המרבי בטרם ביטול ההורדה להשהות בעת מעבר לתקשורת נתונים סלולרית הורדות שלא ניתן להשהות יופעלו מחדש + בהמתנה \ No newline at end of file diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 31801434b..c1eb3870d 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -436,7 +436,7 @@ Pembaruan NewPipe Tersedia! Ketuk untuk mengunduh Selesai - Di antrian + Tertunda dijeda antri pengolahan-pasca diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 4ff8de734..f6d6e42f7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -438,7 +438,7 @@ Aggiornamento di NewPipe disponibile! Premi per scaricare Finito - In coda + In attesa di in pausa in coda post-processo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 78a20b1ab..76ccfd2dd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -421,7 +421,7 @@ NewPipeのアップデートがあります! タップでダウンロード 終了しました - 順番に処理中 + 保留中 一時停止 順番待ちに追加しました 保存処理をしています @@ -462,6 +462,6 @@ メインページに表示されるタブ 新しいバージョンが利用可能なときにアプリの更新を確認する通知を表示します ダウンロードから %s の保留中の転送を続行します - モバイルデータ通信に切替時に、一時停止する - 一時停止できない場合は再開して継続されます + モバイルデータ通信に切り替え時に休止 + 休止できないダウンロードが再開されます \ No newline at end of file diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ced8235f7..1f0dc3968 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -432,7 +432,6 @@ Kemas kini NewPipe Tersedia! Ketik untuk muat turun Selesai - Dalam barisan dijeda telah beratur pemprosesan-pasca @@ -465,4 +464,5 @@ Jumlah percubaan maksimum sebelum membatalkan muat turun Jeda semasa beralih ke data mudah alih Muat turun yang tidak dapat dihentikan akan dimulakan semula + Menunggu \ No newline at end of file diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 2f5d19c67..1c81feae5 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -515,7 +515,6 @@ Ny NewPipe-versjon tilgjengelig. Trykk for å laste ned Fullført - I kø pauset i kø etterbehandling diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index 44b2ef6ab..eac4114ff 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -434,7 +434,6 @@ NewPipe-update beschikbaar! Tikt voor te downloaden Voltooid - In wachtrij gepauzeerd toegevoegd aan wachtrij nabewerking diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 96de68b57..4e88b6b48 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -438,7 +438,7 @@ NewPipe-update beschikbaar! Tik om te downloaden Voltooid - In de wachtrij + In afwachting van gepauzeerd aan de wachtrij toegevoegd nabewerking diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 29070990f..d4a56256e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -435,7 +435,6 @@ Dostępna jest aktualizacja NewPipe! Stuknij, aby pobrać Gotowe - W kolejce wstrzymane w kolejce przetwarzanie końcowe @@ -470,4 +469,5 @@ Pobierane pliki, których nie można wstrzymać, zostaną zrestartowane Zdarzenia Konferencje + Oczekuje \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8a16b752d..097ad1288 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -435,7 +435,6 @@ abrir em modo popup Atualização do NewPipe Disponivel! Toque para baixar Finalizado - Na fila pausado adicionado na fila pós processamento @@ -468,4 +467,5 @@ abrir em modo popup Número máximo de tentativas antes de cancelar o download Pausar quando trocar para dados móveis Downloads que não puderem ser pausados serão reiniciados + Pendente \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a86c5b809..ddc9d503c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -431,7 +431,6 @@ Atualização do NewPipe disponível! Toque para descarregar Terminada - Na fila em pausa na fila pós-processamento @@ -466,4 +465,5 @@ Descarregamentos que não podem ser pausados serão reiniciados Eventos Conferências + Pendente \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 620ca5619..374b9921f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -472,4 +472,5 @@ Пост-обработка не удалась Останавливать скачивание при переходе на мобильную сеть Закрыть + в ожидании \ No newline at end of file diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index ec31c4a97..74bf10804 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -48,4 +48,5 @@ Po Më vonë Standard + në pritje të diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e518a1c0f..dd7974af2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -438,7 +438,6 @@ NewPipe Güncellemesi Var! İndirmek için dokunun Tamamlandı - Sırada durdurulmuş sırada son işlemler uygulanıyor @@ -473,4 +472,5 @@ Duraklatılamayan indirmeler yeniden başlatılacak Olaylar Konferanslar + Kadar \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ff247c579..4c9f9c7d0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -429,7 +429,6 @@ Đã có bản cập nhật NewPipe! Nhấn để tải về Xong - Trong hàng chờ đã tạm dừng trong hàng đợi đang xử lý @@ -461,6 +460,7 @@ Số lượt thử lại trước khi hủy tải về Tạm dừng tải khi chuyển qua dữ liệu di động Các tải về không thể tạm dừng được sẽ bắt đầu lại từ đầu + Đang chờ xử lý Hội thảo \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0194418cf..023cd00c8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -434,7 +434,7 @@ 有可用的 NewPipe 更新! 輕觸以下載 結束 - 在佇列中 + 有待 已暫停 已排入佇列 正在後處理 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9df9bd051..8433f909d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -498,7 +498,7 @@ NewPipe Update Available! Tap to download Finished - In queue + Pending paused queued post-processing