Skip to content

Commit 10f11c2

Browse files
V4L2 enhanced (#766)
* fix v4l2 standard * ignore v4l2 meta devices * added resolution, framerate and device dropdown list to WebUI (thx to @Lord-Grey & @b1rdhous3) * Fix for kernels prior to v4.16 * Device names added & WebUI adapted
1 parent b92af63 commit 10f11c2

File tree

20 files changed

+710
-168
lines changed

20 files changed

+710
-168
lines changed

assets/webconfig/i18n/cs.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "Klasický",
432432
"edt_conf_enum_bbosd": "OSD",
433433
"edt_conf_enum_automatic": "",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "Obecné nastavení",
435436
"edt_conf_gen_name_title": "Název konfigurace",
436437
"edt_conf_gen_name_expl": "Uživatelské jméno, které se používá k detekci Hyperionu. (Užitečné s více než jednou instancí Hyperion)",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "Cesta k Zachycení/Graber usb.",
493494
"edt_conf_v4l2_standard_title": "Video standard",
494495
"edt_conf_v4l2_standard_expl": "Vyberte standard videa pro vaši oblast.",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "Velikost decimace",
496501
"edt_conf_v4l2_sizeDecimation_expl": "Faktor velikosti decimace",
497502
"edt_conf_v4l2_cropLeft_title": "Ořezat zleva",
@@ -809,4 +814,4 @@
809814
"edt_eff_ledtest_header_desc": "",
810815
"update_no_updates_for_branch": "",
811816
"general_speech_sv": ""
812-
}
817+
}

assets/webconfig/i18n/de.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
"edt_conf_enum_PAL": "PAL",
471471
"edt_conf_enum_NTSC": "NTSC",
472472
"edt_conf_enum_SECAM": "SECAM",
473-
"edt_conf_enum_NO_CHANGE": "Auto",
473+
"edt_conf_enum_NO_CHANGE": "Automatisch",
474474
"edt_conf_enum_logsilent": "Stille",
475475
"edt_conf_enum_logwarn": "Warnung",
476476
"edt_conf_enum_logverbose": "Ausführlich",
@@ -479,6 +479,7 @@
479479
"edt_conf_enum_bbclassic": "Klassisch",
480480
"edt_conf_enum_bbosd": "OSD",
481481
"edt_conf_enum_automatic": "Automatisch",
482+
"edt_conf_enum_custom": "Benutzerdefiniert",
482483
"edt_conf_gen_heading_title": "Allgemeine Einstellungen",
483484
"edt_conf_gen_name_title": "Name der Konfiguration",
484485
"edt_conf_gen_name_expl": "Der Name wird verwendet, um Hyperion besser zu identifizieren. (Hilfreich bei mehreren Instanzen)",
@@ -539,9 +540,13 @@
539540
"edt_conf_smooth_continuousOutput_expl": "Aktualisiere die LEDs, auch wenn das Bild sich nicht geändert hat.",
540541
"edt_conf_v4l2_heading_title": "USB Aufnahme",
541542
"edt_conf_v4l2_device_title": "Gerät",
542-
"edt_conf_v4l2_device_expl": "Der Pfad zum USB (v4l) Aufnahmegerät. Wähle 'auto' für automatische Erkennung. Beispiel: '/dev/video0'",
543+
"edt_conf_v4l2_device_expl": "Eine Liste von USB (v4l) Aufnahmegeräten. Wähle 'Automatisch' für automatische Erkennung. Benutzerdefiniert z.b.: '/dev/video0'",
543544
"edt_conf_v4l2_standard_title": "Videoformat",
544-
"edt_conf_v4l2_standard_expl": "Wähle das passende Videoformat deiner Region. Auf 'Auto' wird der gewählte Modus vom v4l interface beibehalten.",
545+
"edt_conf_v4l2_standard_expl": "Wähle das passende Videoformat deiner Region. Auf 'Automatisch' wird der gewählte Modus vom v4l interface beibehalten.",
546+
"edt_conf_v4l2_resolution_title": "Auflösung",
547+
"edt_conf_v4l2_resolution_expl": "Eine Liste von unterstützten Auflösungen des aktiven Gerätes. Auf 'Automatisch' wird der gewählte Modus vom v4l interface beibehalten.",
548+
"edt_conf_v4l2_framerate_title": "Bilder pro Sekunde",
549+
"edt_conf_v4l2_framerate_expl": "Die unterstützten Bilder pro Sekunde des aktiven Gerätes. Auf 'Automatisch' wird der gewählte Modus vom v4l interface beibehalten.",
545550
"edt_conf_v4l2_sizeDecimation_title": "Bildverkleinerung Faktor",
546551
"edt_conf_v4l2_sizeDecimation_expl": "Der Faktor der Bildverkleinerung ausgehend von der ursprünglichen Größe, 1 bedeutet keine Änderung (originales Bild).",
547552
"edt_conf_v4l2_cropLeft_title": "Entferne links",
@@ -570,9 +575,9 @@
570575
"edt_conf_v4l2_sDHOffsetMax_expl": "Signal Erkennungs-Bereich horizontal maximum (0.0-1.0)",
571576
"edt_conf_instCapture_heading_title": "Instance Aufnahme",
572577
"edt_conf_instC_systemEnable_title": "Aktiviere Plattform Aufnahme",
573-
"edt_conf_instC_systemEnable_expl": "Aktiviert die Plattform Aufnahme für diese LED Hardware Instanz",
578+
"edt_conf_instC_systemEnable_expl": "Aktiviert die Plattform Aufnahme für diese LED Hardware Instanz.",
574579
"edt_conf_instC_v4lEnable_title": "Aktiviere USB Aufnahme",
575-
"edt_conf_instC_v4lEnable_expl": "Aktiviert die USB Aufnahme für diese LED Hardware Instanz",
580+
"edt_conf_instC_v4lEnable_expl": "Aktiviert die USB Aufnahme für diese LED Hardware Instanz.",
576581
"edt_conf_fg_heading_title": "Plattform Aufnahme",
577582
"edt_conf_fg_type_title": "Typ",
578583
"edt_conf_fg_type_expl": "Art der Plattform Aufnahme, standard ist 'auto'",

assets/webconfig/i18n/en.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@
469469
"edt_conf_enum_PAL" : "PAL",
470470
"edt_conf_enum_NTSC" : "NTSC",
471471
"edt_conf_enum_SECAM" : "SECAM",
472-
"edt_conf_enum_NO_CHANGE" : "Auto",
472+
"edt_conf_enum_NO_CHANGE" : "Automatic",
473473
"edt_conf_enum_logsilent" : "Silent",
474474
"edt_conf_enum_logwarn" : "Warning",
475475
"edt_conf_enum_logverbose" : "Verbose",
@@ -478,6 +478,7 @@
478478
"edt_conf_enum_bbclassic" : "Classic",
479479
"edt_conf_enum_bbosd" : "OSD",
480480
"edt_conf_enum_automatic" : "Automatic",
481+
"edt_conf_enum_custom": "Custom",
481482
"edt_conf_gen_heading_title" : "General Settings",
482483
"edt_conf_gen_name_title" : "Configuration name",
483484
"edt_conf_gen_name_expl" : "A user defined name which is used to identify Hyperion. (Helpful if you have more than one Hyperion instance)",
@@ -538,9 +539,13 @@
538539
"edt_conf_smooth_continuousOutput_expl" : "Update the leds even if there is no change in the picture.",
539540
"edt_conf_v4l2_heading_title" : "USB Capture",
540541
"edt_conf_v4l2_device_title" : "Device",
541-
"edt_conf_v4l2_device_expl" : "The path to the USB capture interface. Set to 'auto' for automatic detection. Example: '/dev/video0'",
542+
"edt_conf_v4l2_device_expl" : "The path to the USB capture interface. Set to 'Automatic' for automatic detection. Example: '/dev/video0'",
542543
"edt_conf_v4l2_standard_title" : "Video standard",
543-
"edt_conf_v4l2_standard_expl" : "Select the video standard for your region. 'Auto' keeps the value chosen by the v4l2 interface",
544+
"edt_conf_v4l2_standard_expl" : "Select the video standard for your region. 'Automatic' keeps the value chosen by the v4l2 interface",
545+
"edt_conf_v4l2_resolution_title" : "Device Resolution",
546+
"edt_conf_v4l2_resolution_expl" : "A list of supported resolutions of the active device",
547+
"edt_conf_v4l2_framerate_title": "Frames per second",
548+
"edt_conf_v4l2_framerate_expl": "The supported frames per second of the active device",
544549
"edt_conf_v4l2_sizeDecimation_title" : "Size decimation",
545550
"edt_conf_v4l2_sizeDecimation_expl" : "The factor of size decimation. 1 means no decimation (keep original size)",
546551
"edt_conf_v4l2_cropLeft_title" : "Crop left",

assets/webconfig/i18n/es.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "Clásico",
432432
"edt_conf_enum_bbosd": "OSD",
433433
"edt_conf_enum_automatic": "Automático",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "Configuración General",
435436
"edt_conf_gen_name_title": "Nombre de configuración",
436437
"edt_conf_gen_name_expl": "Un nombre definido por el usuario que se utiliza para detectar Hyperion. (Útil con más de una instancia de Hyperion)",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "La ruta a la captura USB.",
493494
"edt_conf_v4l2_standard_title": "Estándar de vídeo",
494495
"edt_conf_v4l2_standard_expl": "Selecciona el estándar de vídeo para tu región.",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "Diezmación de tamaño",
496501
"edt_conf_v4l2_sizeDecimation_expl": "El factor de diezmación del tamaño",
497502
"edt_conf_v4l2_cropLeft_title": "Cortar izquierda",
@@ -809,4 +814,4 @@
809814
"edt_eff_ledtest_header_desc": "Salida giratoria: Rojo, Azul, Verde, Blanco, Negro",
810815
"update_no_updates_for_branch": "",
811816
"general_speech_sv": ""
812-
}
817+
}

assets/webconfig/i18n/it.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "Classico",
432432
"edt_conf_enum_bbosd": "OSD",
433433
"edt_conf_enum_automatic": "Automatico",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "impostazioni Generali",
435436
"edt_conf_gen_name_title": "Nome configurazione",
436437
"edt_conf_gen_name_expl": "Un nome definito dall'utente che viene utilizzato per riconoscere Hyperion. (Utile con più di un'istanza di Hyperion)",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "Percorso del dispositivo di cattura usb.",
493494
"edt_conf_v4l2_standard_title": "Standard video",
494495
"edt_conf_v4l2_standard_expl": "Seleziona lo standard video per la tua regione",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "Decimazione dimensione",
496501
"edt_conf_v4l2_sizeDecimation_expl": "Il fattore di decimazione della dimensione",
497502
"edt_conf_v4l2_cropLeft_title": "Ritaglia sinistra",
@@ -809,4 +814,4 @@
809814
"edt_eff_ledtest_header_desc": "",
810815
"update_no_updates_for_branch": "",
811816
"general_speech_sv": ""
812-
}
817+
}

assets/webconfig/i18n/nl.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "",
432432
"edt_conf_enum_bbosd": "",
433433
"edt_conf_enum_automatic": "",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "",
435436
"edt_conf_gen_name_title": "",
436437
"edt_conf_gen_name_expl": "",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "",
493494
"edt_conf_v4l2_standard_title": "",
494495
"edt_conf_v4l2_standard_expl": "",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "",
496501
"edt_conf_v4l2_sizeDecimation_expl": "",
497502
"edt_conf_v4l2_cropLeft_title": "",
@@ -809,4 +814,4 @@
809814
"edt_eff_ledtest_header_desc": "",
810815
"update_no_updates_for_branch": "",
811816
"general_speech_sv": ""
812-
}
817+
}

assets/webconfig/i18n/pl.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "",
432432
"edt_conf_enum_bbosd": "",
433433
"edt_conf_enum_automatic": "",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "",
435436
"edt_conf_gen_name_title": "",
436437
"edt_conf_gen_name_expl": "",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "",
493494
"edt_conf_v4l2_standard_title": "",
494495
"edt_conf_v4l2_standard_expl": "",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "",
496501
"edt_conf_v4l2_sizeDecimation_expl": "",
497502
"edt_conf_v4l2_cropLeft_title": "",
@@ -809,4 +814,4 @@
809814
"edt_eff_ledtest_header_desc": "",
810815
"update_no_updates_for_branch": "",
811816
"general_speech_sv": ""
812-
}
817+
}

assets/webconfig/i18n/ro.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "",
432432
"edt_conf_enum_bbosd": "",
433433
"edt_conf_enum_automatic": "",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "",
435436
"edt_conf_gen_name_title": "",
436437
"edt_conf_gen_name_expl": "",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "",
493494
"edt_conf_v4l2_standard_title": "",
494495
"edt_conf_v4l2_standard_expl": "",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "",
496501
"edt_conf_v4l2_sizeDecimation_expl": "",
497502
"edt_conf_v4l2_cropLeft_title": "",
@@ -809,4 +814,4 @@
809814
"edt_eff_ledtest_header_desc": "",
810815
"update_no_updates_for_branch": "",
811816
"general_speech_sv": ""
812-
}
817+
}

assets/webconfig/i18n/sv.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"edt_conf_enum_bbclassic": "Klassisk",
432432
"edt_conf_enum_bbosd": "OSD",
433433
"edt_conf_enum_automatic": "Automatisk",
434+
"edt_conf_enum_custom": "",
434435
"edt_conf_gen_heading_title": "Allmänna Inställningar",
435436
"edt_conf_gen_name_title": "Konfigurationsnamn",
436437
"edt_conf_gen_name_expl": "Ett användardefinierat namn som används för att identifiera Hyperion. (Hjälpsamt om du har mer än en Hyperion-instans)",
@@ -492,6 +493,10 @@
492493
"edt_conf_v4l2_device_expl": "Sökvägen till USB-fångstgränssnittet. Ställ in på 'auto' för automatisk upptäckt. Exempel: '/dev/video0'",
493494
"edt_conf_v4l2_standard_title": "Videostandard",
494495
"edt_conf_v4l2_standard_expl": "Välj videostandard för din region. 'Auto' behåller det värde som väljs av v4l2-gränssnittet",
496+
"edt_conf_v4l2_resolution_title": "",
497+
"edt_conf_v4l2_resolution_expl": "",
498+
"edt_conf_v4l2_framerate_title": "",
499+
"edt_conf_v4l2_framerate_expl": "",
495500
"edt_conf_v4l2_sizeDecimation_title": "Bildreduktionsfaktor",
496501
"edt_conf_v4l2_sizeDecimation_expl": "Faktorn för bildminskning baserad på originalstorleken, 1 betyder ingen förändring (originalbild).",
497502
"edt_conf_v4l2_cropLeft_title": "Beskär vänster",

0 commit comments

Comments
 (0)