From f1fb0cccd0c10d464d4d827cbfb8dd8badef3d53 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 22 May 2019 14:57:42 +1000 Subject: [PATCH] proof of concept for retrieving a texture from a node --- nodes/nodes/nodemedia.cpp | 4 ++ rendering/memorycache.cpp | 1 + timeline/sequence.cpp | 1 + ts/olive_ar.ts | 102 +++++++++++++++++++------------------- ts/olive_bs.ts | 102 +++++++++++++++++++------------------- ts/olive_de.ts | 102 +++++++++++++++++++------------------- ts/olive_es.ts | 102 +++++++++++++++++++------------------- ts/olive_fr.ts | 102 +++++++++++++++++++------------------- ts/olive_id.ts | 102 +++++++++++++++++++------------------- ts/olive_it.ts | 102 +++++++++++++++++++------------------- ts/olive_ru.ts | 102 +++++++++++++++++++------------------- ts/olive_sr.ts | 102 +++++++++++++++++++------------------- 12 files changed, 465 insertions(+), 459 deletions(-) diff --git a/nodes/nodes/nodemedia.cpp b/nodes/nodes/nodemedia.cpp index 2a5988182..e7603db16 100644 --- a/nodes/nodes/nodemedia.cpp +++ b/nodes/nodes/nodemedia.cpp @@ -1,5 +1,7 @@ #include "nodemedia.h" +#include + #include "nodes/nodegraph.h" NodeMedia::NodeMedia(NodeGraph* c) : @@ -36,6 +38,8 @@ void NodeMedia::Process(rational time) buffer_.buffer()->ReleaseBuffer(); + qDebug() << "Node Media has" << buffer_.buffer()->texture(); + texture_output_->SetValue(buffer_.buffer()->texture()); } diff --git a/rendering/memorycache.cpp b/rendering/memorycache.cpp index 35d3143d8..1f3c62c8c 100644 --- a/rendering/memorycache.cpp +++ b/rendering/memorycache.cpp @@ -96,6 +96,7 @@ int MemoryCache::RequestBufferInternal(MemoryCache::Reference *r) buffers_.append(FramebufferObject()); refs_.append(r); access_times_.append(time(nullptr)); + buffers_.last().Create(ctx_, width_, height_); return buffers_.size() - 1; } diff --git a/timeline/sequence.cpp b/timeline/sequence.cpp index 642fe055c..bb520372b 100644 --- a/timeline/sequence.cpp +++ b/timeline/sequence.cpp @@ -197,6 +197,7 @@ QVector Sequence::GetTrackList(olive::TrackType type) GLuint Sequence::texture() { + texture_io->ParentNode()->Process(0); return texture_io->GetValue().value(); } diff --git a/ts/olive_ar.ts b/ts/olive_ar.ts index 1e9a442b6..82c92647d 100644 --- a/ts/olive_ar.ts +++ b/ts/olive_ar.ts @@ -1995,128 +1995,128 @@ Audio Layout: %6 NewSequenceDialog - + Editing "%1" تعديل "%1" - + New Sequence مقطع جديد - + Preset: قالب: - + Film 4K فلم 4K - + TV 4K (Ultra HD/2160p) 4K تلفاز (أقصى-عالي الدقة/2160p) - + 1080p - + 720p - + 480p - + 360p - + 240p - + 144p - + NTSC (480i) - + PAL (576i) - + Custom مخصوص - + Video فيديو - + Width: العرض: - + Height: الطول: - + Frame Rate: معدل اﻹطارات: - + Pixel Aspect Ratio: للمراجعة معدل نسبة البيكسل: - + Square Pixels (1.0) بكسيل مربع (1.0) - + Interlacing: المشابكة: - + None (Progressive) لا شيء (متفاقم) - + Audio الصوت - + Sample Rate: معدل الإعتيان: - + Name: اﻷسم: @@ -3948,7 +3948,7 @@ Seek quickly (may briefly show inaccurate frames when seeking - doesn't aff <لا شيء> - + Nested Sequence مقطع متشعب @@ -3977,130 +3977,130 @@ Seek quickly (may briefly show inaccurate frames when seeking - doesn't aff أفعل هذا مع كل التعارضات الموجودة - + Title... العنوان... - + Solid Color... بحاجة لمتابعة لون صلب... - + Bars... ألواح... - + Tone... نغّم... - + Noise... ضجيج... - + Unsaved Project مشروع غير محفوظ - + You must save this project before you can record audio in it. يجب عليك حفظ المشروع قبل تسجيل الصوت فيه. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) أنقر على الخط الزمني حيث تريد بدء التسجيل (أسحب لوضع حد للتسجيل في إطار وقت معين) - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (لا شيء) - + Pointer Tool أداة المؤشر - + Edit Tool أداة التحرير - + Ripple Tool أداة الموجة - + Razor Tool أداة القطع - + Slip Tool بحاجة لمتابعة أداة المنزلقة - + Slide Tool أداة الشريحة - + Hand Tool أداة اليد - + Transition Tool أداة اﻷنتقال - + Snapping بحاجة لمتابعة الساحبة - + Zoom In تقريب - + Zoom Out أبتعاد - + Record audio سجّل الصوت - + Add title, solid, bars, etc. أضف عنوان, صلب, ألواح, إلخ. diff --git a/ts/olive_bs.ts b/ts/olive_bs.ts index 88f256be9..86639fd46 100644 --- a/ts/olive_bs.ts +++ b/ts/olive_bs.ts @@ -1800,127 +1800,127 @@ Audio Layout: %6 NewSequenceDialog - + Editing "%1" - + New Sequence - + Preset: - + Film 4K - + TV 4K (Ultra HD/2160p) - + 1080p - + 720p - + 480p - + 360p - + 240p - + 144p - + NTSC (480i) - + PAL (576i) - + Custom - + Video Video - + Width: Širina: - + Height: Visina: - + Frame Rate: Okvirna stopa: - + Pixel Aspect Ratio: - + Square Pixels (1.0) - + Interlacing: - + None (Progressive) Nema (progresivno) - + Audio Audio - + Sample Rate: - + Name: @@ -3660,132 +3660,132 @@ Audio Layout: %6 Timeline - + Nested Sequence - + Title... - + Solid Color... - + Bars... - + Tone... - + Noise... - + Unsaved Project - + You must save this project before you can record audio in it. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (nema) - + Pointer Tool - + Edit Tool - + Ripple Tool - + Razor Tool - + Slip Tool - + Slide Tool - + Hand Tool - + Transition Tool - + Snapping - + Zoom In - + Zoom Out - + Record audio - + Add title, solid, bars, etc. diff --git a/ts/olive_de.ts b/ts/olive_de.ts index 36bb1061a..1d503149a 100644 --- a/ts/olive_de.ts +++ b/ts/olive_de.ts @@ -2012,131 +2012,131 @@ Audio Layout: %6 NewSequenceDialog - + Editing "%1" Bearbeitung von "%1" - + New Sequence Neue Sequenz - + Preset: Could be also preset Vorgabe: - + Film 4K Film 4K - + TV 4K (Ultra HD/2160p) TV 4K (Ultra HD/2160p) - + 1080p 1080p - + 720p 720p - + 480p 480p - + 360p 360p - + 240p 240p - + 144p 144p - + NTSC (480i) NTSC (480i) - + PAL (576i) PAL (576i) - + Custom Benutzerdefiniert - + Video Same as in english Video - + Width: Breite: - + Height: Höhe: - + Frame Rate: Bildrate: - + Pixel Aspect Ratio: Pixel-Seitenverhältnis: - + Square Pixels (1.0) Quadratische Pixel (1.0) - + Interlacing: Same as in english Interlacing: - + None (Progressive) Keine (Progressive) - + Audio Same as in english Audio - + Sample Rate: Abtastrate: - + Name: Name: @@ -4005,133 +4005,133 @@ Sucht schneller (kann kurzzeitig ungenaue Frame anzeigen - wirkt sich nicht auf Marker-Name setzen: - + Title... Titel... - + Solid Color... Solid... - + Bars... Balken... - + Tone... Ton... - + Noise... Rauschen... - + Unsaved Project Ungespeichertes Projekt - + You must save this project before you can record audio in it. Sie müssen das Projekt speichern, bevor Sie Audio aufnehmen können. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) Klicken Sie auf die Timeline, an welcher Stelle Sie mit der Aufnahme beginnen möchten (Ziehen, um das Limit der Aufnahme auf einen bestimmten Timeframe zu setzen) - + Pointer Tool Pointer-Werkzeug - + Edit Tool Bearbeitungs-Werkzeug - + Ripple Tool Ripple-Werkzeug - + Razor Tool Schneide-Werkzeug - + Slip Tool - + Slide Tool - + Hand Tool Hand-Werkzeug - + Transition Tool Übergangs-Werkzeug - + Snapping Same as in english Snapping - + Zoom In Hereinzommen - + Zoom Out Herauszoomen - + Record audio Audio aufnehmen - + Add title, solid, bars, etc. Titel, Solid, Balken, etc. Hinzufügen - + Nested Sequence Geschachtelte Sequenz - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (keine) diff --git a/ts/olive_es.ts b/ts/olive_es.ts index a16a0ac0f..ed34ff4e0 100644 --- a/ts/olive_es.ts +++ b/ts/olive_es.ts @@ -1651,127 +1651,127 @@ Audio Layout: %6 NewSequenceDialog - + Editing "%1" - + New Sequence - + Preset: - + Film 4K - + TV 4K (Ultra HD/2160p) - + 1080p - + 720p - + 480p - + 360p - + 240p - + 144p - + NTSC (480i) - + PAL (576i) - + Custom - + Video - + Width: - + Height: - + Frame Rate: - + Pixel Aspect Ratio: - + Square Pixels (1.0) - + Interlacing: - + None (Progressive) - + Audio - + Sample Rate: - + Name: @@ -3511,132 +3511,132 @@ Audio Layout: %6 Timeline - + Nested Sequence - + Title... - + Solid Color... - + Bars... - + Tone... - + Noise... - + Unsaved Project - + You must save this project before you can record audio in it. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) - + Pointer Tool - + Edit Tool - + Ripple Tool - + Razor Tool - + Slip Tool - + Slide Tool - + Hand Tool - + Transition Tool - + Snapping - + Zoom In - + Zoom Out - + Record audio - + Add title, solid, bars, etc. diff --git a/ts/olive_fr.ts b/ts/olive_fr.ts index f0b219df7..3918de017 100644 --- a/ts/olive_fr.ts +++ b/ts/olive_fr.ts @@ -1980,127 +1980,127 @@ Canaux audio : %6 NewSequenceDialog - + Editing "%1" Édition "%1" - + New Sequence Nouvelle séquence - + Preset: Préréglage : - + Film 4K Film 4K - + TV 4K (Ultra HD/2160p) TV 4K (Ultra HD/2160p) - + 1080p 1080p - + 720p 720p - + 480p 480p - + 360p 360p - + 240p 240p - + 144p 144p - + NTSC (480i) NTSC (480i) - + PAL (576i) PAL (576i) - + Custom Personnalisé - + Video Vidéo - + Width: Largeur : - + Height: Hauteur : - + Frame Rate: Images par seconde : - + Pixel Aspect Ratio: Ratio des pixels : - + Square Pixels (1.0) Pixels carré (1,0) - + Interlacing: Entrelacement : - + None (Progressive) Aucun (Progressif) - + Audio Audio - + Sample Rate: Taux d'échantillonnage : - + Name: Nom : @@ -3919,7 +3919,7 @@ Montrer rapidement (la prévisualition peut montrer brièvement des images impr <aucun> - + Nested Sequence Séquence imbriquée @@ -3948,127 +3948,127 @@ Montrer rapidement (la prévisualition peut montrer brièvement des images impr Faire ceci pour tous les conflits - + Title... Titre… - + Solid Color... Couleur unie… - + Bars... Barres… - + Tone... Ton… - + Noise... Bruit… - + Unsaved Project Projet non-sauvegardé - + You must save this project before you can record audio in it. Vous devez sauvegarder ce projet avant d'effectuer un enregistrement audio à l'intérieur. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) Cliquez sur la ligne du temps là où vous souhaitez commencer l'enregistrement (tirez pour limiter l'enregistrement jusqu'à une certaine image) - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (aucun) - + Pointer Tool Curseur - + Edit Tool Éditer - + Ripple Tool Propagation - + Razor Tool Cutter - + Slip Tool Déplacer dessous - + Slide Tool Déplacer dessus - + Hand Tool Main - + Transition Tool Transition - + Snapping Magnétisme - + Zoom In Zoomer - + Zoom Out Dézoomer - + Record audio Enregistrement audio - + Add title, solid, bars, etc. Ajouter un titre, une couleur unie, des barres, etc. diff --git a/ts/olive_id.ts b/ts/olive_id.ts index 8f85552f5..b6c57ab79 100644 --- a/ts/olive_id.ts +++ b/ts/olive_id.ts @@ -1841,127 +1841,127 @@ Tata Audio: %6 NewSequenceDialog - + Editing "%1" Mengedit "%1" - + New Sequence Rangkaian Baru - + Preset: - + Film 4K - + TV 4K (Ultra HD/2160p) - + 1080p - + 720p - + 480p - + 360p - + 240p - + 144p - + NTSC (480i) - + PAL (576i) - + Custom Kustom - + Video - + Width: Lebar: - + Height: Tinggi: - + Frame Rate: Laju frame (fps): - + Pixel Aspect Ratio: Rasio aspek piksel: - + Square Pixels (1.0) Persegi (1.0) - + Interlacing: Mode interlace: - + None (Progressive) Tidak ada (Progresif) - + Audio - + Sample Rate: Laju sampel: - + Name: Nama: @@ -3767,87 +3767,87 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese Timeline - + Pointer Tool Alat Tunjuk - + Edit Tool Alat Edit - + Ripple Tool Alat Pengatur - + Razor Tool Alat Potong - + Slip Tool Alat Slip - + Slide Tool Alat Geser Klip - + Hand Tool Alat Geser Tampilan - + Transition Tool Alat Transisi - + Snapping Lekatan - + Zoom In Perbesar Tampilan - + Zoom Out Perkecil Tampilan - + Record audio Rekam suara - + Add title, solid, bars, etc. Masukkan judul, warna, bars, dll. - + Nested Sequence Rangkaian Bersarang - + Video Transitions - + Audio Transitions - + Timeline: %1 @@ -3876,42 +3876,42 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese Lakukan untuk semua konflik yang ditemukan - + Title... Judul... - + Solid Color... Warna... - + Bars... - + Tone... Nada... - + Noise... - + Unsaved Project Proyek Belum Disimpan - + You must save this project before you can record audio in it. Proyek ini harus disimpan sebelum merekam suara. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) Klik tempat dimana Anda akan mulai merekam (seret untuk membatasi rekaman dalam waktu tertentu) @@ -3920,7 +3920,7 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese Garis Waktu: - + (none) (tidak ada) diff --git a/ts/olive_it.ts b/ts/olive_it.ts index 800f50fd5..82fea3c83 100644 --- a/ts/olive_it.ts +++ b/ts/olive_it.ts @@ -1834,127 +1834,127 @@ Disposizione audio: %6 NewSequenceDialog - + Editing "%1" Modifica di "%1" - + New Sequence Nuova sequenza - + Preset: Preimpostazioni: - + Film 4K Film 4K - + TV 4K (Ultra HD/2160p) TV 4K (Ultra HD/2160p) - + 1080p 1080p - + 720p 720p - + 480p 480p - + 360p 360p - + 240p 240p - + 144p 144p - + NTSC (480i) NTSC (480i) - + PAL (576i) PAL (576i) - + Custom Personalizzato - + Video Video - + Width: Larghezza: - + Height: Altezza: - + Frame Rate: Velocità fotogrammi: - + Pixel Aspect Ratio: Proporzioni dei pixel: - + Square Pixels (1.0) Pixel quadrati (1.0) - + Interlacing: Interlacciamento: - + None (Progressive) Nessuno (progressivo) - + Audio Audio - + Sample Rate: Frequenza di campionamento: - + Name: Nome: @@ -3764,7 +3764,7 @@ Sposta velocemente il cursore (potrebbe mostrare fotogrammi non perfettamente ac Linea temporale: - + Nested Sequence Sequenza annidata @@ -3793,128 +3793,128 @@ Sposta velocemente il cursore (potrebbe mostrare fotogrammi non perfettamente ac Ripeti per ogni conflitto trovato - + Title... Titolo... - + Solid Color... Colore a tinta unita... - + Bars... Barre... - + Tone... Suono... - + Noise... Rumore... - + Unsaved Project Progetto non salvato - + You must save this project before you can record audio in it. Devi salvare il progetto prima di poterci registrare dell'audio. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) Fa' clic sulla linea temporale nel punto in cui vuoi iniziare la registrazione (trascina per limitare la registrazione in una certa finestra) - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (nessuno) - + Pointer Tool Strumento puntatore - + Edit Tool Strumento di modifica - + Ripple Tool Su premier è tradotto come -strumento montaggio con scarto-. Valutare quale usare Strumento ridimensiona a catena - + Razor Tool Strumento di taglio - + Slip Tool Strumento di scivolamento - + Slide Tool Strumento di scorrimento - + Hand Tool Strumento mano - + Transition Tool Strumento transizione - + Snapping Bordi magnetici - + Zoom In Ingrandisci - + Zoom Out Rimpicciolisci - + Record audio Registra audio - + Add title, solid, bars, etc. Aggiungi titolo, colori, barre ecc. diff --git a/ts/olive_ru.ts b/ts/olive_ru.ts index 4bcfc9754..4afdf5115 100644 --- a/ts/olive_ru.ts +++ b/ts/olive_ru.ts @@ -1731,127 +1731,127 @@ Audio Layout: %6 NewSequenceDialog - + Editing "%1" Правка "%1" - + New Sequence Новая последовательность - + Preset: Предстановка: - + Film 4K Кино 4К - + TV 4K (Ultra HD/2160p) TV 4K (Ultra HD/2160p) - + 1080p 1080p - + 720p 720p - + 480p 480p - + 360p 360p - + 240p 240p - + 144p 144p - + NTSC (480i) NTSC (480i) - + PAL (576i) PAL (576i) - + Custom Другое - + Video Видео - + Width: Ширина: - + Height: Высота: - + Frame Rate: Частота кадров: - + Pixel Aspect Ratio: Соотношение сторон пикселя: - + Square Pixels (1.0) Квадратные пиксели (1.0) - + Interlacing: Чересстрочность: - + None (Progressive) Нет (прогрессивно) - + Audio Звук - + Sample Rate: Частота дискретизации: - + Name: Название: @@ -3659,132 +3659,132 @@ Audio Layout: %6 Применить для всех конфликтов - + Nested Sequence Вложенная последовательность - + Title... Титры… - + Solid Color... Цветная заливка… - + Bars... Испытательная таблица… - + Tone... Звуковой сигнал… - + Noise... Шум… - + Unsaved Project Несохранённый проект - + You must save this project before you can record audio in it. Перед записью звука необходимо сохранить проект. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) Щелкните на монтажном столе в точке, от которой хотите начать запись звука. Перетащите курсор после щелчка, чтобы сразу задать длительность записи. - + Pointer Tool Указатель - + Edit Tool Выделение - + Ripple Tool Монтаж со сдвигом - + Razor Tool Подрезка - + Slip Tool Прокрутка с совмещением - + Slide Tool Прокрутка - + Hand Tool Навигация - + Transition Tool Переход - + Snapping Прилипание - + Zoom In Приблизить - + Zoom Out Отдалить - + Record audio Записать звук - + Add title, solid, bars, etc. Добавить титры, заливку цветом, испытательную таблицу и т.д. - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (нет) diff --git a/ts/olive_sr.ts b/ts/olive_sr.ts index b8d54ed68..74cdcc276 100644 --- a/ts/olive_sr.ts +++ b/ts/olive_sr.ts @@ -1787,127 +1787,127 @@ Audio Layout: %6 NewSequenceDialog - + Editing "%1" - + New Sequence - + Preset: - + Film 4K - + TV 4K (Ultra HD/2160p) - + 1080p - + 720p - + 480p - + 360p - + 240p - + 144p - + NTSC (480i) - + PAL (576i) - + Custom - + Video Видео - + Width: Ширина: - + Height: Висина: - + Frame Rate: Оквирна стопа: - + Pixel Aspect Ratio: - + Square Pixels (1.0) - + Interlacing: - + None (Progressive) Нема (прогресивно) - + Audio Аудио - + Sample Rate: - + Name: @@ -3647,132 +3647,132 @@ Audio Layout: %6 Timeline - + Nested Sequence - + Title... - + Solid Color... - + Bars... - + Tone... - + Noise... - + Unsaved Project - + You must save this project before you can record audio in it. - + Click on the timeline where you want to start recording (drag to limit the recording to a certain timeframe) - + Video Transitions - + Audio Transitions - + Timeline: %1 - + (none) (нема) - + Pointer Tool - + Edit Tool - + Ripple Tool - + Razor Tool - + Slip Tool - + Slide Tool - + Hand Tool - + Transition Tool - + Snapping - + Zoom In - + Zoom Out - + Record audio - + Add title, solid, bars, etc.