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)
2024-11-22 11:02:35 +01:00 · 2019-04-16 23:28:03 -03:00 · 2019-04-16 23:28:03 -03:00 · 16d6bda85d
commit 16d6bda85d
parent 4b3eb2ece5
26 changed files with 38 additions and 33 deletions
--- 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

--- 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;
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -451,7 +451,7 @@
    <string name="app_update_notification_content_title">يتوفر تحديث ل newpipe!</string>
    <string name="app_update_notification_content_text">اضغط لتنزيل</string>
    <string name="missions_header_finished">انتهى</string>
-    <string name="missions_header_pending">في قائمة الانتظار</string>
+    <string name="missions_header_pending">ريثما</string>
    <string name="paused">متوقف</string>
    <string name="queued">في قائمة الانتظار</string>
    <string name="post_processing">قيد المعالجة</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -425,7 +425,7 @@
    <string name="auto">Automàtic</string>
    <string name="switch_view">Canvia la vista</string>
    <string name="app_update_notification_content_title">Està disponible una nova actualització del NewPipe!</string>
-    <string name="missions_header_pending">A la cua</string>
+    <string name="missions_header_pending">Pendent</string>
    <string name="paused">en pausa</string>
    <string name="queued">a la cua</string>
    <string name="enqueue">Afegeix a la cua</string>
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@ -426,7 +426,7 @@
    <string name="auto">自动</string>
    <string name="app_update_notification_content_text">轻按以下载</string>
    <string name="missions_header_finished">已完成</string>
-    <string name="missions_header_pending">于队列中</string>
+    <string name="missions_header_pending">有待</string>
    <string name="paused">已暂停</string>
    <string name="queued">已加入队列</string>
    <string name="post_processing">后处理</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -453,4 +453,5 @@
    <string name="max_retry_desc">Maksimalt antal forsøg før downloaden opgives</string>
    <string name="pause_downloads_on_mobile">Sæt på pause ved skift til mobildata</string>
    <string name="pause_downloads_on_mobile_desc">Downloads som ikke kan sættes på pause vil blive genstartet</string>
+    <string name="missions_header_pending">Afventning</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -437,7 +437,7 @@
    <string name="app_update_notification_content_title">NewPipe-Aktualisierung verfügbar!</string>
    <string name="app_update_notification_content_text">Zum Herunterladen antippen</string>
    <string name="missions_header_finished">Fertig</string>
-    <string name="missions_header_pending">In der Warteschlange</string>
+    <string name="missions_header_pending">Ausstehend</string>
    <string name="paused">pausiert</string>
    <string name="queued">eingereiht</string>
    <string name="post_processing">Nachbearbeitung</string>
--- 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</string>
    <string name="download_to_sdcard_error_message">No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\?</string>

    <string name="download_pick_path">Seleccione los directorios de descarga</string>
+    <string name="missions_header_pending">Pendiente</string>

    <string name="unsubscribe">Desuscribirse</string>
    <string name="tab_new">Nueva pestaña</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -435,7 +435,7 @@
    <string name="app_update_notification_content_title">NewPipe eguneraketa eskuragarri!</string>
    <string name="app_update_notification_content_text">Sakatu deskargatzeko</string>
    <string name="missions_header_finished">Amaituta</string>
-    <string name="missions_header_pending">Ilaran</string>
+    <string name="missions_header_pending">Zain</string>
    <string name="paused">pausatuta</string>
    <string name="queued">ilaran</string>
    <string name="post_processing">post-prozesua</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -440,7 +440,6 @@
    <string name="app_update_notification_content_title">יצא עדכון ל־NewPipe!</string>
    <string name="app_update_notification_content_text">יש לגעת כדי להוריד</string>
    <string name="missions_header_finished">הסתיים</string>
-    <string name="missions_header_pending">בתור</string>
    <string name="paused">מושהה</string>
    <string name="queued">בתור</string>
    <string name="post_processing">עיבוד מאוחר</string>
@ -473,4 +472,5 @@
    <string name="max_retry_desc">מספר הניסיונות החוזרים המרבי בטרם ביטול ההורדה</string>
    <string name="pause_downloads_on_mobile">להשהות בעת מעבר לתקשורת נתונים סלולרית</string>
    <string name="pause_downloads_on_mobile_desc">הורדות שלא ניתן להשהות יופעלו מחדש</string>
+    <string name="missions_header_pending">בהמתנה</string>
 </resources>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -436,7 +436,7 @@
    <string name="app_update_notification_content_title">Pembaruan NewPipe Tersedia!</string>
    <string name="app_update_notification_content_text">Ketuk untuk mengunduh</string>
    <string name="missions_header_finished">Selesai</string>
-    <string name="missions_header_pending">Di antrian</string>
+    <string name="missions_header_pending">Tertunda</string>
    <string name="paused">dijeda</string>
    <string name="queued">antri</string>
    <string name="post_processing">pengolahan-pasca</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -438,7 +438,7 @@
    <string name="app_update_notification_content_title">Aggiornamento di NewPipe disponibile!</string>
    <string name="app_update_notification_content_text">Premi per scaricare</string>
    <string name="missions_header_finished">Finito</string>
-    <string name="missions_header_pending">In coda</string>
+    <string name="missions_header_pending">In attesa di</string>
    <string name="paused">in pausa</string>
    <string name="queued">in coda</string>
    <string name="post_processing">post-processo</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -421,7 +421,7 @@
    <string name="app_update_notification_content_title">NewPipeのアップデートがあります！</string>
    <string name="app_update_notification_content_text">タップでダウンロード</string>
    <string name="missions_header_finished">終了しました</string>
-    <string name="missions_header_pending">順番に処理中</string>
+    <string name="missions_header_pending">保留中</string>
    <string name="paused">一時停止</string>
    <string name="queued">順番待ちに追加しました</string>
    <string name="post_processing">保存処理をしています</string>
@ -462,6 +462,6 @@
    <string name="main_page_content_summary">メインページに表示されるタブ</string>
    <string name="updates_setting_description">新しいバージョンが利用可能なときにアプリの更新を確認する通知を表示します</string>
    <string name="msg_pending_downloads">ダウンロードから %s の保留中の転送を続行します</string>
-    <string name="pause_downloads_on_mobile">モバイルデータ通信に切替時に、一時停止する</string>
-    <string name="pause_downloads_on_mobile_desc">一時停止できない場合は再開して継続されます</string>
+    <string name="pause_downloads_on_mobile">モバイルデータ通信に切り替え時に休止</string>
+    <string name="pause_downloads_on_mobile_desc">休止できないダウンロードが再開されます</string>
 </resources>
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@ -432,7 +432,6 @@
    <string name="app_update_notification_content_title">Kemas kini NewPipe Tersedia!</string>
    <string name="app_update_notification_content_text">Ketik untuk muat turun</string>
    <string name="missions_header_finished">Selesai</string>
-    <string name="missions_header_pending">Dalam barisan</string>
    <string name="paused">dijeda</string>
    <string name="queued">telah beratur</string>
    <string name="post_processing">pemprosesan-pasca</string>
@ -465,4 +464,5 @@
    <string name="max_retry_desc">Jumlah percubaan maksimum sebelum membatalkan muat turun</string>
    <string name="pause_downloads_on_mobile">Jeda semasa beralih ke data mudah alih</string>
    <string name="pause_downloads_on_mobile_desc">Muat turun yang tidak dapat dihentikan akan dimulakan semula</string>
+    <string name="missions_header_pending">Menunggu</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -515,7 +515,6 @@
    <string name="app_update_notification_content_title">Ny NewPipe-versjon tilgjengelig.</string>
    <string name="app_update_notification_content_text">Trykk for å laste ned</string>
    <string name="missions_header_finished">Fullført</string>
-    <string name="missions_header_pending">I kø</string>
    <string name="paused">pauset</string>
    <string name="queued">i kø</string>
    <string name="post_processing">etterbehandling</string>
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@ -434,7 +434,6 @@
    <string name="app_update_notification_content_title">NewPipe-update beschikbaar!</string>
    <string name="app_update_notification_content_text">Tikt voor te downloaden</string>
    <string name="missions_header_finished">Voltooid</string>
-    <string name="missions_header_pending">In wachtrij</string>
    <string name="paused">gepauzeerd</string>
    <string name="queued">toegevoegd aan wachtrij</string>
    <string name="post_processing">nabewerking</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -438,7 +438,7 @@
    <string name="app_update_notification_content_title">NewPipe-update beschikbaar!</string>
    <string name="app_update_notification_content_text">Tik om te downloaden</string>
    <string name="missions_header_finished">Voltooid</string>
-    <string name="missions_header_pending">In de wachtrij</string>
+    <string name="missions_header_pending">In afwachting van</string>
    <string name="paused">gepauzeerd</string>
    <string name="queued">aan de wachtrij toegevoegd</string>
    <string name="post_processing">nabewerking</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -435,7 +435,6 @@
    <string name="app_update_notification_content_title">Dostępna jest aktualizacja NewPipe!</string>
    <string name="app_update_notification_content_text">Stuknij, aby pobrać</string>
    <string name="missions_header_finished">Gotowe</string>
-    <string name="missions_header_pending">W kolejce</string>
    <string name="paused">wstrzymane</string>
    <string name="queued">w kolejce</string>
    <string name="post_processing">przetwarzanie końcowe</string>
@ -470,4 +469,5 @@
    <string name="pause_downloads_on_mobile_desc">Pobierane pliki, których nie można wstrzymać, zostaną zrestartowane</string>
    <string name="events">Zdarzenia</string>
    <string name="conferences">Konferencje</string>
+    <string name="missions_header_pending">Oczekuje</string>
 </resources>
--- 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</string>
    <string name="app_update_notification_content_title">Atualização do NewPipe Disponivel!</string>
    <string name="app_update_notification_content_text">Toque para baixar</string>
    <string name="missions_header_finished">Finalizado</string>
-    <string name="missions_header_pending">Na fila</string>
    <string name="paused">pausado</string>
    <string name="queued">adicionado na fila</string>
    <string name="post_processing">pós processamento</string>
@ -468,4 +467,5 @@ abrir em modo popup</string>
    <string name="max_retry_desc">Número máximo de tentativas antes de cancelar o download</string>
    <string name="pause_downloads_on_mobile">Pausar quando trocar para dados móveis</string>
    <string name="pause_downloads_on_mobile_desc">Downloads que não puderem ser pausados serão reiniciados</string>
+    <string name="missions_header_pending">Pendente</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -431,7 +431,6 @@
    <string name="app_update_notification_content_title">Atualização do NewPipe disponível!</string>
    <string name="app_update_notification_content_text">Toque para descarregar</string>
    <string name="missions_header_finished">Terminada</string>
-    <string name="missions_header_pending">Na fila</string>
    <string name="paused">em pausa</string>
    <string name="queued">na fila</string>
    <string name="post_processing">pós-processamento</string>
@ -466,4 +465,5 @@
    <string name="pause_downloads_on_mobile_desc">Descarregamentos que não podem ser pausados serão reiniciados</string>
    <string name="events">Eventos</string>
    <string name="conferences">Conferências</string>
+    <string name="missions_header_pending">Pendente</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -472,4 +472,5 @@
    <string name="error_postprocessing_failed">Пост-обработка не удалась</string>
    <string name="pause_downloads_on_mobile">Останавливать скачивание при переходе на мобильную сеть</string>
    <string name="close">Закрыть</string>
+    <string name="missions_header_pending">в ожидании</string>
 </resources>
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@ -48,4 +48,5 @@
    <string name="yes">Po</string>
    <string name="later">Më vonë</string>
    <string name="playback_default">Standard</string>
+    <string name="missions_header_pending">në pritje të</string>
 </resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -438,7 +438,6 @@
    <string name="app_update_notification_content_title">NewPipe Güncellemesi Var!</string>
    <string name="app_update_notification_content_text">İndirmek için dokunun</string>
    <string name="missions_header_finished">Tamamlandı</string>
-    <string name="missions_header_pending">Sırada</string>
    <string name="paused">durdurulmuş</string>
    <string name="queued">sırada</string>
    <string name="post_processing">son işlemler uygulanıyor</string>
@ -473,4 +472,5 @@
    <string name="pause_downloads_on_mobile_desc">Duraklatılamayan indirmeler yeniden başlatılacak</string>
    <string name="events">Olaylar</string>
    <string name="conferences">Konferanslar</string>
+    <string name="missions_header_pending">Kadar</string>
 </resources>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -429,7 +429,6 @@
    <string name="app_update_notification_content_title">Đã có bản cập nhật NewPipe!</string>
    <string name="app_update_notification_content_text">Nhấn để tải về</string>
    <string name="missions_header_finished">Xong</string>
-    <string name="missions_header_pending">Trong hàng chờ</string>
    <string name="paused">đã tạm dừng</string>
    <string name="queued">trong hàng đợi</string>
    <string name="post_processing">đang xử lý</string>
@ -461,6 +460,7 @@
    <string name="max_retry_desc">Số lượt thử lại trước khi hủy tải về</string>
    <string name="pause_downloads_on_mobile">Tạm dừng tải khi chuyển qua dữ liệu di động</string>
    <string name="pause_downloads_on_mobile_desc">Các tải về không thể tạm dừng được sẽ bắt đầu lại từ đầu</string>
+    <string name="missions_header_pending">Đang chờ xử lý</string>
    <string name="conferences">Hội thảo</string>
    <string name="label_code">Mã</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -434,7 +434,7 @@
    <string name="app_update_notification_content_title">有可用的 NewPipe 更新！</string>
    <string name="app_update_notification_content_text">輕觸以下載</string>
    <string name="missions_header_finished">結束</string>
-    <string name="missions_header_pending">在佇列中</string>
+    <string name="missions_header_pending">有待</string>
    <string name="paused">已暫停</string>
    <string name="queued">已排入佇列</string>
    <string name="post_processing">正在後處理</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -498,7 +498,7 @@
    <string name="app_update_notification_content_title">NewPipe Update Available!</string>
    <string name="app_update_notification_content_text">Tap to download</string>
    <string name="missions_header_finished">Finished</string>
-    <string name="missions_header_pending">In queue</string>
+    <string name="missions_header_pending">Pending</string>
    <string name="paused">paused</string>
    <string name="queued">queued</string>
    <string name="post_processing">post-processing</string>