summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/audio_content.cc22
-rw-r--r--src/lib/audio_content.h2
-rw-r--r--src/lib/po/de_DE.po56
-rw-r--r--src/lib/po/es_ES.po56
-rw-r--r--src/lib/po/fr_FR.po56
-rw-r--r--src/lib/po/it_IT.po57
-rw-r--r--src/lib/po/nl_NL.po56
-rw-r--r--src/lib/po/sv_SE.po57
-rw-r--r--src/lib/video_content.cc62
-rw-r--r--src/lib/video_content.h2
10 files changed, 342 insertions, 84 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index d02728b00..988090bf8 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -33,6 +33,9 @@
using std::string;
using std::cout;
using std::vector;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using dcp::raw_convert;
@@ -236,3 +239,22 @@ AudioContent::processed_audio_channels () const
return audio_processor()->out_channels (audio_channels ());
}
+string
+AudioContent::processing_description () const
+{
+ stringstream d;
+
+ if (audio_frame_rate() != resampled_audio_frame_rate ()) {
+ stringstream from;
+ from << fixed << setprecision(3) << (audio_frame_rate() / 1000.0);
+ stringstream to;
+ to << fixed << setprecision(3) << (resampled_audio_frame_rate() / 1000.0);
+
+ d << String::compose (_("Audio will be resampled from %1kHz to %2kHz."), from.str(), to.str());
+ } else {
+ d << _("Audio will not be resampled.");
+ }
+
+ return d.str ();
+}
+
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 57085a765..f4a537b30 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -98,6 +98,8 @@ public:
boost::mutex::scoped_lock lm (_mutex);
return _audio_processor;
}
+
+ std::string processing_description () const;
private:
/** Gain to apply to audio in dB */
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index d24391f6f..30a753bc1 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 23:31+0000\n"
+"POT-Creation-Date: 2014-11-06 11:37+0000\n"
"PO-Revision-Date: 2014-07-13 02:32+0100\n"
"Last-Translator: Carsten Kurz\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "%1 Kanäle, %2kHz, %3 samples"
msgid "%1 frames; %2 frames per second"
msgstr "%1 Bilder; %2 Bilder pro Sekunde"
-#: src/lib/video_content.cc:247
+#: src/lib/video_content.cc:250
msgid "%1x%2 pixels (%3:1)"
msgstr "%1x%2 pixel (%3:1)"
@@ -86,6 +86,14 @@ msgstr "Audio analysieren"
msgid "Area"
msgstr "Bereich"
+#: src/lib/audio_content.cc:253
+msgid "Audio will be resampled from %1kHz to %2kHz."
+msgstr ""
+
+#: src/lib/audio_content.cc:255
+msgid "Audio will not be resampled."
+msgstr ""
+
#: src/lib/scaler.cc:62
msgid "Bicubic"
msgstr "Bi-Kubisch"
@@ -126,38 +134,42 @@ msgstr "Bildübersicht berechnen"
msgid "Content and DCP have the same rate.\n"
msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n"
+#: src/lib/video_content.cc:566
+msgid "Content frame rate"
+msgstr "Inhalt Bildrate"
+
#: src/lib/subtitle_content.cc:103
#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
-#: src/lib/audio_content.cc:100
+#: src/lib/audio_content.cc:103
msgid "Content to be joined must have the same audio delay."
msgstr "Zu verbindende Inhalte müssen die gleiche Tonverzögerung verwenden."
-#: src/lib/audio_content.cc:96
+#: src/lib/audio_content.cc:99
msgid "Content to be joined must have the same audio gain."
msgstr ""
"Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
-#: src/lib/video_content.cc:161
+#: src/lib/video_content.cc:164
msgid "Content to be joined must have the same colour conversion."
msgstr "Zu verbindende Inhalte müssen die gleiche Farbumwandlung verwenden."
-#: src/lib/video_content.cc:153
+#: src/lib/video_content.cc:156
msgid "Content to be joined must have the same crop."
msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
-#: src/lib/video_content.cc:165
+#: src/lib/video_content.cc:168
#, fuzzy
msgid "Content to be joined must have the same fades."
msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
-#: src/lib/video_content.cc:141
+#: src/lib/video_content.cc:144
msgid "Content to be joined must have the same picture size."
msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
-#: src/lib/video_content.cc:157
+#: src/lib/video_content.cc:160
msgid "Content to be joined must have the same scale setting."
msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
@@ -183,11 +195,11 @@ msgstr ""
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
-#: src/lib/video_content.cc:145
+#: src/lib/video_content.cc:148
msgid "Content to be joined must have the same video frame rate."
msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
-#: src/lib/video_content.cc:149
+#: src/lib/video_content.cc:152
msgid "Content to be joined must have the same video frame type."
msgstr "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben."
@@ -200,6 +212,10 @@ msgstr ""
msgid "Content to be joined must use the same subtitle stream."
msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
+#: src/lib/video_content.cc:524
+msgid "Content video is %1x%2"
+msgstr "Inhalt Video ist %1x%2"
+
#: src/lib/scp_dcp_job.cc:111
msgid "Copy DCP to TMS"
msgstr "DCP zu TMS übertragen"
@@ -243,6 +259,10 @@ msgstr "SCP Session (%1) konnte nicht gestartet werden"
msgid "Could not write to remote file (%1)"
msgstr "Entfernte Datei (%1) konnte nicht gespeichert werden"
+#: src/lib/video_content.cc:535
+msgid "Cropped to %1x%2"
+msgstr "Beschnitten zu %1x%2"
+
#: src/lib/dcp_subtitle_content.cc:72
msgid "DCP XML subtitles"
msgstr ""
@@ -479,6 +499,10 @@ msgstr "Zuwenig Speicher"
msgid "Overcomplete wavelet denoiser"
msgstr "Überbestimmte Wavelet Entrauschung"
+#: src/lib/video_content.cc:559
+msgid "Padded with black to %1x%2"
+msgstr "Mit Schwarz gefüllt auf %1x%2"
+
#: src/lib/dcp_content_type.cc:51
msgid "Policy"
msgstr "Vorschrift"
@@ -515,6 +539,10 @@ msgstr "Surround rechts"
msgid "SSH error (%1)"
msgstr "SSH Fehler (%1)"
+#: src/lib/video_content.cc:550
+msgid "Scaled to %1x%2"
+msgstr "Skaliert auf %1x%2"
+
#: src/lib/ratio.cc:41
msgid "Scope"
msgstr "Scope"
@@ -615,7 +643,7 @@ msgstr "Ungültiges Bildformat vom Server erhalten"
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:264
msgid "Unrecognised audio sample format (%1)"
msgstr "Ton Sample Format (%1) nicht erkannt."
@@ -783,7 +811,7 @@ msgstr "Benötigte Einstellung %1 fehlt"
msgid "moving"
msgstr "wird verschoben"
-#: src/lib/ffmpeg_decoder.cc:420
+#: src/lib/ffmpeg_decoder.cc:431
msgid "multi-part subtitles not yet supported"
msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt"
@@ -797,7 +825,7 @@ msgstr "Name"
msgid "remaining"
msgstr "verbleibend"
-#: src/lib/config.cc:90 src/lib/video_content.cc:204
+#: src/lib/config.cc:90 src/lib/video_content.cc:207
msgid "sRGB"
msgstr "sRGB"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index ae02808d4..fac36332c 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LIBDCPOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 23:31+0000\n"
+"POT-Creation-Date: 2014-11-06 11:37+0000\n"
"PO-Revision-Date: 2014-10-24 16:11-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -37,7 +37,7 @@ msgstr "%1 canales, %2kHz, %3 muestras"
msgid "%1 frames; %2 frames per second"
msgstr "%1 imágenes; %2 imágenes per second"
-#: src/lib/video_content.cc:247
+#: src/lib/video_content.cc:250
msgid "%1x%2 pixels (%3:1)"
msgstr "%1x%2 pixels (%3:1)"
@@ -85,6 +85,14 @@ msgstr "Analizar audio"
msgid "Area"
msgstr "Área"
+#: src/lib/audio_content.cc:253
+msgid "Audio will be resampled from %1kHz to %2kHz."
+msgstr ""
+
+#: src/lib/audio_content.cc:255
+msgid "Audio will not be resampled."
+msgstr ""
+
#: src/lib/scaler.cc:62
msgid "Bicubic"
msgstr "Bicúbico"
@@ -125,35 +133,39 @@ msgstr "Calculando la firma resumen de imagen"
msgid "Content and DCP have the same rate.\n"
msgstr "La fuente y el DCP tienen la misma velocidad.\n"
+#: src/lib/video_content.cc:566
+msgid "Content frame rate"
+msgstr "Velocidad del contenido"
+
#: src/lib/subtitle_content.cc:103
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr "Para unir contenido debe tener la misma opción 'usar subtítulos'."
-#: src/lib/audio_content.cc:100
+#: src/lib/audio_content.cc:103
msgid "Content to be joined must have the same audio delay."
msgstr "Para unir contenido debe tener el mismo retardo de audio."
-#: src/lib/audio_content.cc:96
+#: src/lib/audio_content.cc:99
msgid "Content to be joined must have the same audio gain."
msgstr "Para unir contenido debe tener la misma ganancia de audio."
-#: src/lib/video_content.cc:161
+#: src/lib/video_content.cc:164
msgid "Content to be joined must have the same colour conversion."
msgstr "Para unir contenido debe tener la misma conversión de color."
-#: src/lib/video_content.cc:153
+#: src/lib/video_content.cc:156
msgid "Content to be joined must have the same crop."
msgstr "Para unir contenido debe tener el mismo recorte."
-#: src/lib/video_content.cc:165
+#: src/lib/video_content.cc:168
msgid "Content to be joined must have the same fades."
msgstr "Para unir contenido debe tener los mismos fundidos."
-#: src/lib/video_content.cc:141
+#: src/lib/video_content.cc:144
msgid "Content to be joined must have the same picture size."
msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
-#: src/lib/video_content.cc:157
+#: src/lib/video_content.cc:160
msgid "Content to be joined must have the same scale setting."
msgstr "Para unir contenido debe tener la misma redimensión."
@@ -176,11 +188,11 @@ msgstr ""
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "Para unir contenido debe tener la misma redimensión de subtítulo en Y."
-#: src/lib/video_content.cc:145
+#: src/lib/video_content.cc:148
msgid "Content to be joined must have the same video frame rate."
msgstr "Para unir contenido debe tener la misma velocidad de imagen."
-#: src/lib/video_content.cc:149
+#: src/lib/video_content.cc:152
msgid "Content to be joined must have the same video frame type."
msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
@@ -192,6 +204,10 @@ msgstr "Para unir contenido debe usar el mismo tipo de audio."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
+#: src/lib/video_content.cc:524
+msgid "Content video is %1x%2"
+msgstr "El video es %1x%2"
+
#: src/lib/scp_dcp_job.cc:111
msgid "Copy DCP to TMS"
msgstr "Copiar DCP al TMS"
@@ -234,6 +250,10 @@ msgstr "No se pudo iniciar la sesión SCP (%1)"
msgid "Could not write to remote file (%1)"
msgstr "No se pudo escribir el fichero remoto (%1)"
+#: src/lib/video_content.cc:535
+msgid "Cropped to %1x%2"
+msgstr "Recortado a %1x%2"
+
#: src/lib/dcp_subtitle_content.cc:72
msgid "DCP XML subtitles"
msgstr "Subtítulos DCP XML"
@@ -466,6 +486,10 @@ msgstr "Falta de memoria"
msgid "Overcomplete wavelet denoiser"
msgstr "Overcomplete wavelet denoiser"
+#: src/lib/video_content.cc:559
+msgid "Padded with black to %1x%2"
+msgstr "Completado con negro hasta %1x%2"
+
#: src/lib/dcp_content_type.cc:51
msgid "Policy"
msgstr "Policy"
@@ -502,6 +526,10 @@ msgstr "Surround derecha"
msgid "SSH error (%1)"
msgstr "error SSH (%1)"
+#: src/lib/video_content.cc:550
+msgid "Scaled to %1x%2"
+msgstr "Redimensionado a %1x%2"
+
#: src/lib/ratio.cc:41
msgid "Scope"
msgstr "Scope"
@@ -604,7 +632,7 @@ msgstr "El servidor recibió un tipo de imagen inesperada"
msgid "Unknown error"
msgstr "Error desconocido"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:264
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato de audio desconocido (%1)"
@@ -772,7 +800,7 @@ msgstr "falta una configuración obligatoria %1"
msgid "moving"
msgstr "moviendo"
-#: src/lib/ffmpeg_decoder.cc:420
+#: src/lib/ffmpeg_decoder.cc:431
msgid "multi-part subtitles not yet supported"
msgstr "todavía no se soportan subtítulos en múltiples partes"
@@ -786,7 +814,7 @@ msgstr "nombre"
msgid "remaining"
msgstr "pendiente"
-#: src/lib/config.cc:90 src/lib/video_content.cc:204
+#: src/lib/config.cc:90 src/lib/video_content.cc:207
msgid "sRGB"
msgstr "sRGB"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 3e72cf2c0..3b2ba6714 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 23:31+0000\n"
+"POT-Creation-Date: 2014-11-06 11:37+0000\n"
"PO-Revision-Date: 2014-07-14 12:04+0100\n"
"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
"Language-Team: \n"
@@ -37,7 +37,7 @@ msgstr "%1 canaux, %2kHz, %3 échantillons"
msgid "%1 frames; %2 frames per second"
msgstr "%1 images ; %2 images par seconde"
-#: src/lib/video_content.cc:247
+#: src/lib/video_content.cc:250
msgid "%1x%2 pixels (%3:1)"
msgstr "%1x%2 pixels (%3:1)"
@@ -85,6 +85,14 @@ msgstr "Analyse audio"
msgid "Area"
msgstr "Surface"
+#: src/lib/audio_content.cc:253
+msgid "Audio will be resampled from %1kHz to %2kHz."
+msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
+
+#: src/lib/audio_content.cc:255
+msgid "Audio will not be resampled."
+msgstr ""
+
#: src/lib/scaler.cc:62
msgid "Bicubic"
msgstr "Bicubique"
@@ -125,38 +133,42 @@ msgstr "Fabrication rendu image"
msgid "Content and DCP have the same rate.\n"
msgstr "Le DCP et la source ont la même cadence image.\n"
+#: src/lib/video_content.cc:566
+msgid "Content frame rate"
+msgstr "Cadence du contenu"
+
#: src/lib/subtitle_content.cc:103
#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
-#: src/lib/audio_content.cc:100
+#: src/lib/audio_content.cc:103
msgid "Content to be joined must have the same audio delay."
msgstr "Le contenu à ajouter doit présenter le même délais audio"
-#: src/lib/audio_content.cc:96
+#: src/lib/audio_content.cc:99
msgid "Content to be joined must have the same audio gain."
msgstr "Le contenu à ajouter doit avoir le même gain audio"
-#: src/lib/video_content.cc:161
+#: src/lib/video_content.cc:164
msgid "Content to be joined must have the same colour conversion."
msgstr "Le contenu à ajouter doit avoir le même type de conversion couleur"
-#: src/lib/video_content.cc:153
+#: src/lib/video_content.cc:156
msgid "Content to be joined must have the same crop."
msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
-#: src/lib/video_content.cc:165
+#: src/lib/video_content.cc:168
#, fuzzy
msgid "Content to be joined must have the same fades."
msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
-#: src/lib/video_content.cc:141
+#: src/lib/video_content.cc:144
msgid "Content to be joined must have the same picture size."
msgstr "Le contenu à ajouter doit avoir la même taille d'image"
-#: src/lib/video_content.cc:157
+#: src/lib/video_content.cc:160
msgid "Content to be joined must have the same scale setting."
msgstr ""
"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
@@ -183,11 +195,11 @@ msgstr ""
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
-#: src/lib/video_content.cc:145
+#: src/lib/video_content.cc:148
msgid "Content to be joined must have the same video frame rate."
msgstr "Le contenu à ajouter doit avoir la même cadence d'images"
-#: src/lib/video_content.cc:149
+#: src/lib/video_content.cc:152
msgid "Content to be joined must have the same video frame type."
msgstr "Le contenu à ajouter doit avoir le même type de trame vidéo"
@@ -199,6 +211,10 @@ msgstr "Le contenu à ajouter doit avoir le même flux audio"
msgid "Content to be joined must use the same subtitle stream."
msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
+#: src/lib/video_content.cc:524
+msgid "Content video is %1x%2"
+msgstr "Le contenu vidéo est %1x%2"
+
#: src/lib/scp_dcp_job.cc:111
msgid "Copy DCP to TMS"
msgstr "Copier le DCP dans le TMS"
@@ -242,6 +258,10 @@ msgstr "Démarrage de session SCP (%1) impossible"
msgid "Could not write to remote file (%1)"
msgstr "Écriture vers fichier distant (%1) impossible"
+#: src/lib/video_content.cc:535
+msgid "Cropped to %1x%2"
+msgstr "Rognage de %1x%2"
+
#: src/lib/dcp_subtitle_content.cc:72
msgid "DCP XML subtitles"
msgstr ""
@@ -473,6 +493,10 @@ msgstr "Hors capacité mémoire"
msgid "Overcomplete wavelet denoiser"
msgstr "Réduction de bruit par ondelettes"
+#: src/lib/video_content.cc:559
+msgid "Padded with black to %1x%2"
+msgstr "Enveloppe noire de %1x%2"
+
#: src/lib/dcp_content_type.cc:51
msgid "Policy"
msgstr "Policy"
@@ -509,6 +533,10 @@ msgstr "Arrière droite"
msgid "SSH error (%1)"
msgstr "Erreur SSH (%1)"
+#: src/lib/video_content.cc:550
+msgid "Scaled to %1x%2"
+msgstr "Mis à l'échelle de %1x%2"
+
#: src/lib/ratio.cc:41
msgid "Scope"
msgstr "Scope"
@@ -608,7 +636,7 @@ msgstr "Type d'image non conforme reçu par le serveur"
msgid "Unknown error"
msgstr "Erreur inconnue"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:264
msgid "Unrecognised audio sample format (%1)"
msgstr "Échantillonnage audio (%1) inconnu"
@@ -778,7 +806,7 @@ msgstr "paramètre %1 manquant"
msgid "moving"
msgstr "déplacement"
-#: src/lib/ffmpeg_decoder.cc:420
+#: src/lib/ffmpeg_decoder.cc:431
msgid "multi-part subtitles not yet supported"
msgstr "sous-titres en plusieurs parties non supportés"
@@ -792,7 +820,7 @@ msgstr "nom"
msgid "remaining"
msgstr "restant"
-#: src/lib/config.cc:90 src/lib/video_content.cc:204
+#: src/lib/config.cc:90 src/lib/video_content.cc:207
msgid "sRGB"
msgstr "sRGB"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index e149f083f..8815005fb 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 23:31+0000\n"
+"POT-Creation-Date: 2014-11-06 11:37+0000\n"
"PO-Revision-Date: 2014-02-03 10:48+0100\n"
"Last-Translator: William Fanelli <william.f@impronte.com>\n"
"Language-Team: \n"
@@ -37,7 +37,7 @@ msgstr ""
msgid "%1 frames; %2 frames per second"
msgstr "%1 fotogrammi; %2 fotogrammi al secondo"
-#: src/lib/video_content.cc:247
+#: src/lib/video_content.cc:250
msgid "%1x%2 pixels (%3:1)"
msgstr ""
@@ -86,6 +86,14 @@ msgstr "Analizzo l'audio di %1"
msgid "Area"
msgstr "Area"
+#: src/lib/audio_content.cc:253
+msgid "Audio will be resampled from %1kHz to %2kHz."
+msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
+
+#: src/lib/audio_content.cc:255
+msgid "Audio will not be resampled."
+msgstr ""
+
#: src/lib/scaler.cc:62
msgid "Bicubic"
msgstr "Bicubica"
@@ -127,39 +135,44 @@ msgstr ""
msgid "Content and DCP have the same rate.\n"
msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
+#: src/lib/video_content.cc:566
+#, fuzzy
+msgid "Content frame rate"
+msgstr "tipo di contenuto"
+
#: src/lib/subtitle_content.cc:103
#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
-#: src/lib/audio_content.cc:100
+#: src/lib/audio_content.cc:103
msgid "Content to be joined must have the same audio delay."
msgstr ""
-#: src/lib/audio_content.cc:96
+#: src/lib/audio_content.cc:99
msgid "Content to be joined must have the same audio gain."
msgstr ""
-#: src/lib/video_content.cc:161
+#: src/lib/video_content.cc:164
msgid "Content to be joined must have the same colour conversion."
msgstr ""
-#: src/lib/video_content.cc:153
+#: src/lib/video_content.cc:156
msgid "Content to be joined must have the same crop."
msgstr ""
-#: src/lib/video_content.cc:165
+#: src/lib/video_content.cc:168
#, fuzzy
msgid "Content to be joined must have the same fades."
msgstr ""
"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
-#: src/lib/video_content.cc:141
+#: src/lib/video_content.cc:144
msgid "Content to be joined must have the same picture size."
msgstr ""
-#: src/lib/video_content.cc:157
+#: src/lib/video_content.cc:160
#, fuzzy
msgid "Content to be joined must have the same scale setting."
msgstr ""
@@ -187,11 +200,11 @@ msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
"Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
-#: src/lib/video_content.cc:145
+#: src/lib/video_content.cc:148
msgid "Content to be joined must have the same video frame rate."
msgstr ""
-#: src/lib/video_content.cc:149
+#: src/lib/video_content.cc:152
msgid "Content to be joined must have the same video frame type."
msgstr ""
@@ -203,6 +216,10 @@ msgstr ""
msgid "Content to be joined must use the same subtitle stream."
msgstr ""
+#: src/lib/video_content.cc:524
+msgid "Content video is %1x%2"
+msgstr "Il video originale è %1x%2"
+
#: src/lib/scp_dcp_job.cc:111
msgid "Copy DCP to TMS"
msgstr "Copia del DCP al TMS"
@@ -247,6 +264,10 @@ msgstr "Non posso avviare la sessione SCP (%1)"
msgid "Could not write to remote file (%1)"
msgstr "Non posso scrivere il file remoto (%1)"
+#: src/lib/video_content.cc:535
+msgid "Cropped to %1x%2"
+msgstr "Tagliato da %1x%2"
+
#: src/lib/dcp_subtitle_content.cc:72
msgid "DCP XML subtitles"
msgstr ""
@@ -482,6 +503,10 @@ msgstr ""
msgid "Overcomplete wavelet denoiser"
msgstr "Overcomplete wavelet denoiser"
+#: src/lib/video_content.cc:559
+msgid "Padded with black to %1x%2"
+msgstr "Riempito con nero a %1x%2"
+
#: src/lib/dcp_content_type.cc:51
msgid "Policy"
msgstr "Politica"
@@ -520,6 +545,10 @@ msgstr "Surround destro"
msgid "SSH error (%1)"
msgstr "Errore SSH (%1)"
+#: src/lib/video_content.cc:550
+msgid "Scaled to %1x%2"
+msgstr "Scalato a %1x%2"
+
#: src/lib/ratio.cc:41
msgid "Scope"
msgstr "Scope"
@@ -623,7 +652,7 @@ msgstr ""
msgid "Unknown error"
msgstr "Errore sconosciuto"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:264
msgid "Unrecognised audio sample format (%1)"
msgstr "Formato di campionamento audio non riconosciuto (%1)"
@@ -794,7 +823,7 @@ msgstr "persa la regolazione richiesta %1"
msgid "moving"
msgstr ""
-#: src/lib/ffmpeg_decoder.cc:420
+#: src/lib/ffmpeg_decoder.cc:431
msgid "multi-part subtitles not yet supported"
msgstr "sottotitoli multi-part non ancora supportati"
@@ -808,7 +837,7 @@ msgstr "nome"
msgid "remaining"
msgstr "restano"
-#: src/lib/config.cc:90 src/lib/video_content.cc:204
+#: src/lib/config.cc:90 src/lib/video_content.cc:207
msgid "sRGB"
msgstr "sRGB"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 4d9287fad..5d2e51f33 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 23:31+0000\n"
+"POT-Creation-Date: 2014-11-06 11:37+0000\n"
"PO-Revision-Date: 2014-09-04 20:34+0100\n"
"Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
"Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -38,7 +38,7 @@ msgstr "%1 kanalen, %2kHz, %3 samples"
msgid "%1 frames; %2 frames per second"
msgstr "%1 frames; %2 frames per seconde"
-#: src/lib/video_content.cc:247
+#: src/lib/video_content.cc:250
msgid "%1x%2 pixels (%3:1)"
msgstr "%1x%2 pixels (%3:1)"
@@ -86,6 +86,14 @@ msgstr "Analyseer audio"
msgid "Area"
msgstr "Gebied"
+#: src/lib/audio_content.cc:253
+msgid "Audio will be resampled from %1kHz to %2kHz."
+msgstr ""
+
+#: src/lib/audio_content.cc:255
+msgid "Audio will not be resampled."
+msgstr ""
+
#: src/lib/scaler.cc:62
msgid "Bicubic"
msgstr "Bicubic"
@@ -126,37 +134,41 @@ msgstr "Verwerk video data"
msgid "Content and DCP have the same rate.\n"
msgstr "Inhoud en DCP hebben dezelfde framerate .\n"
+#: src/lib/video_content.cc:566
+msgid "Content frame rate"
+msgstr "Content frame rate"
+
#: src/lib/subtitle_content.cc:103
#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
-#: src/lib/audio_content.cc:100
+#: src/lib/audio_content.cc:103
msgid "Content to be joined must have the same audio delay."
msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben."
-#: src/lib/audio_content.cc:96
+#: src/lib/audio_content.cc:99
msgid "Content to be joined must have the same audio gain."
msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben."
-#: src/lib/video_content.cc:161
+#: src/lib/video_content.cc:164
msgid "Content to be joined must have the same colour conversion."
msgstr "Toegevoegde bestanden moeten dezelfde kleurindeling hebben."
-#: src/lib/video_content.cc:153
+#: src/lib/video_content.cc:156
msgid "Content to be joined must have the same crop."
msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
-#: src/lib/video_content.cc:165
+#: src/lib/video_content.cc:168
#, fuzzy
msgid "Content to be joined must have the same fades."
msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
-#: src/lib/video_content.cc:141
+#: src/lib/video_content.cc:144
msgid "Content to be joined must have the same picture size."
msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben."
-#: src/lib/video_content.cc:157
+#: src/lib/video_content.cc:160
msgid "Content to be joined must have the same scale setting."
msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
@@ -178,11 +190,11 @@ msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
-#: src/lib/video_content.cc:145
+#: src/lib/video_content.cc:148
msgid "Content to be joined must have the same video frame rate."
msgstr "Toegevoegde bestanden moeten dezelfde video frame rate hebben."
-#: src/lib/video_content.cc:149
+#: src/lib/video_content.cc:152
msgid "Content to be joined must have the same video frame type."
msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
@@ -194,6 +206,10 @@ msgstr "Toegevoegde bestanden moeten dezelfde audio stream gebruiken."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Toegevoegde bestanden moeten dezelfde ondertitel stream gebruiken."
+#: src/lib/video_content.cc:524
+msgid "Content video is %1x%2"
+msgstr "Content video is %1x%2"
+
#: src/lib/scp_dcp_job.cc:111
msgid "Copy DCP to TMS"
msgstr "Kopieer DCP to TMS"
@@ -237,6 +253,10 @@ msgstr "Kan SCP sessie niet starten (%1)"
msgid "Could not write to remote file (%1)"
msgstr "Kan niet schrijven naar bestand op FTP server"
+#: src/lib/video_content.cc:535
+msgid "Cropped to %1x%2"
+msgstr "Cropped naar %1x%2"
+
#: src/lib/dcp_subtitle_content.cc:72
msgid "DCP XML subtitles"
msgstr ""
@@ -473,6 +493,10 @@ msgstr "Te weinig geheugen"
msgid "Overcomplete wavelet denoiser"
msgstr "Overcomplete wavelet denoiser"
+#: src/lib/video_content.cc:559
+msgid "Padded with black to %1x%2"
+msgstr "Opgevuld met zwart tot %1x%2"
+
#: src/lib/dcp_content_type.cc:51
msgid "Policy"
msgstr "Beleid"
@@ -509,6 +533,10 @@ msgstr "Rechts surround"
msgid "SSH error (%1)"
msgstr "SSH fout (%1)"
+#: src/lib/video_content.cc:550
+msgid "Scaled to %1x%2"
+msgstr "Geschaald naar %1x%2"
+
#: src/lib/ratio.cc:41
msgid "Scope"
msgstr "Gebied"
@@ -608,7 +636,7 @@ msgstr "Onverwacht beeldtype ontvangen door server"
msgid "Unknown error"
msgstr "Onbekende fout"
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:264
msgid "Unrecognised audio sample format (%1)"
msgstr "Niet herkenbaar audio sample formaat (%1)"
@@ -776,7 +804,7 @@ msgstr "ontbrekende verplichte setting %1"
msgid "moving"
msgstr "bewegend"
-#: src/lib/ffmpeg_decoder.cc:420
+#: src/lib/ffmpeg_decoder.cc:431
msgid "multi-part subtitles not yet supported"
msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
@@ -790,7 +818,7 @@ msgstr "naam"
msgid "remaining"
msgstr "resterend"
-#: src/lib/config.cc:90 src/lib/video_content.cc:204
+#: src/lib/config.cc:90 src/lib/video_content.cc:207
msgid "sRGB"
msgstr "sRGB"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index b8b452bf0..d4bccb1ef 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 23:31+0000\n"
+"POT-Creation-Date: 2014-11-06 11:37+0000\n"
"PO-Revision-Date: 2014-01-19 08:59+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -37,7 +37,7 @@ msgstr "%1 kanaler, %2kHz, %3 sampel"
msgid "%1 frames; %2 frames per second"
msgstr "%1 bilder; %2 bilder per sekund"
-#: src/lib/video_content.cc:247
+#: src/lib/video_content.cc:250
msgid "%1x%2 pixels (%3:1)"
msgstr "%1x%2 pixlar (%3:1)"
@@ -85,6 +85,14 @@ msgstr "Analysera audio"
msgid "Area"
msgstr "Yta"
+#: src/lib/audio_content.cc:253
+msgid "Audio will be resampled from %1kHz to %2kHz."
+msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
+
+#: src/lib/audio_content.cc:255
+msgid "Audio will not be resampled."
+msgstr ""
+
#: src/lib/scaler.cc:62
msgid "Bicubic"
msgstr "Bikubisk"
@@ -125,37 +133,42 @@ msgstr "Beräknar bildsammanfattning"
msgid "Content and DCP have the same rate.\n"
msgstr "Källa och DCP har samma bildfrekvens.\n"
+#: src/lib/video_content.cc:566
+#, fuzzy
+msgid "Content frame rate"
+msgstr "Innehållets bildhastighet"
+
#: src/lib/subtitle_content.cc:103
#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
-#: src/lib/audio_content.cc:100
+#: src/lib/audio_content.cc:103
msgid "Content to be joined must have the same audio delay."
msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning."
-#: src/lib/audio_content.cc:96
+#: src/lib/audio_content.cc:99
msgid "Content to be joined must have the same audio gain."
msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning."
-#: src/lib/video_content.cc:161
+#: src/lib/video_content.cc:164
msgid "Content to be joined must have the same colour conversion."
msgstr "Innehåll som ska sammanfogas måste använda samma färgkonvertering."
-#: src/lib/video_content.cc:153
+#: src/lib/video_content.cc:156
msgid "Content to be joined must have the same crop."
msgstr "Innehåll som ska sammanfogas måste använda samma beskärning."
-#: src/lib/video_content.cc:165
+#: src/lib/video_content.cc:168
#, fuzzy
msgid "Content to be joined must have the same fades."
msgstr "Innehåll som ska sammanfogas måste använda samma beskärning."
-#: src/lib/video_content.cc:141
+#: src/lib/video_content.cc:144
msgid "Content to be joined must have the same picture size."
msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
-#: src/lib/video_content.cc:157
+#: src/lib/video_content.cc:160
#, fuzzy
msgid "Content to be joined must have the same scale setting."
msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
@@ -182,11 +195,11 @@ msgstr ""
msgid "Content to be joined must have the same subtitle Y scale."
msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
-#: src/lib/video_content.cc:145
+#: src/lib/video_content.cc:148
msgid "Content to be joined must have the same video frame rate."
msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
-#: src/lib/video_content.cc:149
+#: src/lib/video_content.cc:152
msgid "Content to be joined must have the same video frame type."
msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp."
@@ -198,6 +211,10 @@ msgstr "Innehåll som ska sammanfogas måste använda samma audioström."
msgid "Content to be joined must use the same subtitle stream."
msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
+#: src/lib/video_content.cc:524
+msgid "Content video is %1x%2"
+msgstr "Original-videon är %1x%2"
+
#: src/lib/scp_dcp_job.cc:111
msgid "Copy DCP to TMS"
msgstr "Kopiera DCP till TMS"
@@ -242,6 +259,10 @@ msgstr "Kunde inte starta SCP-session (%1)"
msgid "Could not write to remote file (%1)"
msgstr "Kunde inte skriva till fjärrfil (%1)"
+#: src/lib/video_content.cc:535
+msgid "Cropped to %1x%2"
+msgstr "Beskuren till %1x%2"
+
#: src/lib/dcp_subtitle_content.cc:72
msgid "DCP XML subtitles"
msgstr ""
@@ -475,6 +496,10 @@ msgstr ""
msgid "Overcomplete wavelet denoiser"
msgstr "Överkomplett wavelet-brusreducering"
+#: src/lib/video_content.cc:559
+msgid "Padded with black to %1x%2"
+msgstr "Svarta kanter tillagda för %1x%2"
+
#: src/lib/dcp_content_type.cc:51
msgid "Policy"
msgstr "Policy"
@@ -512,6 +537,10 @@ msgstr "Höger surround"
msgid "SSH error (%1)"
msgstr "SSH fel (%1)"
+#: src/lib/video_content.cc:550
+msgid "Scaled to %1x%2"
+msgstr "Skalad till %1x%2"
+
#: src/lib/ratio.cc:41
msgid "Scope"
msgstr "Scope"
@@ -614,7 +643,7 @@ msgid "Unknown error"
msgstr "Okänt fel"
# Svengelska
-#: src/lib/ffmpeg_decoder.cc:263
+#: src/lib/ffmpeg_decoder.cc:264
msgid "Unrecognised audio sample format (%1)"
msgstr "Okänt audio-sampelformat (%1)"
@@ -786,7 +815,7 @@ msgstr "saknad nödvändig inställning %1"
msgid "moving"
msgstr "rörlig"
-#: src/lib/ffmpeg_decoder.cc:420
+#: src/lib/ffmpeg_decoder.cc:431
msgid "multi-part subtitles not yet supported"
msgstr "undertexter i flera delar stöds inte ännu"
@@ -800,7 +829,7 @@ msgstr "namn"
msgid "remaining"
msgstr "återstående tid"
-#: src/lib/config.cc:90 src/lib/video_content.cc:204
+#: src/lib/config.cc:90 src/lib/video_content.cc:207
msgid "sRGB"
msgstr "sRGB"
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 98c3d929a..3470e62bf 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -53,6 +53,9 @@ using std::cout;
using std::vector;
using std::min;
using std::max;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
@@ -509,3 +512,62 @@ VideoContent::fade (VideoFrame f) const
return optional<float> ();
}
+
+string
+VideoContent::processing_description () const
+{
+ /* stringstream is OK here as this string is just for presentation to the user */
+ stringstream d;
+
+ if (video_size().width && video_size().height) {
+ d << String::compose (
+ _("Content video is %1x%2"),
+ video_size_after_3d_split().width,
+ video_size_after_3d_split().height
+ );
+
+ d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+ }
+
+ if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) {
+ dcp::Size cropped = video_size_after_crop ();
+ d << String::compose (
+ _("Cropped to %1x%2"),
+ cropped.width, cropped.height
+ );
+
+ d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n";
+ }
+
+ shared_ptr<const Film> film = _film.lock ();
+ assert (film);
+
+ dcp::Size const container_size = film->frame_size ();
+ dcp::Size const scaled = scale().size (dynamic_pointer_cast<const VideoContent> (shared_from_this ()), container_size, container_size, 1);
+
+ if (scaled != video_size_after_crop ()) {
+ d << String::compose (
+ _("Scaled to %1x%2"),
+ scaled.width, scaled.height
+ );
+
+ d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n";
+ }
+
+ if (scaled != container_size) {
+ d << String::compose (
+ _("Padded with black to %1x%2"),
+ container_size.width, container_size.height
+ );
+
+ d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n";
+ }
+
+ d << _("Content frame rate");
+ d << " " << fixed << setprecision(4) << video_frame_rate() << "\n";
+
+ FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
+ d << frc.description () << "\n";
+
+ return d.str ();
+}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index b5936d16d..64112c1da 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -157,6 +157,8 @@ public:
void scale_and_crop_to_fit_width ();
void scale_and_crop_to_fit_height ();
+ std::string processing_description () const;
+
protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-09 19:10:46 +0000