From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 11 Jan 2024 18:00:59 +0000 (-0700)
Subject: Credit Andrew - fix local Vorbis audio for modifiable parameters, add raw dv profiles... 
X-Git-Tag: 2024-01~4
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=dc5a5d807e75a138eb7534c91e685734c654e93e;p=goodguy%2Fcinelerra.git

Credit Andrew - fix local Vorbis audio for modifiable parameters, add raw dv profiles for testing purposes, update versioninfo date to 2024, add internal documentation on W-H ratio and clarification in the Format window for Aspect ratio
---

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index f0b39302..90ad489f 100644
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -255,6 +255,10 @@ int File::get_options(FormatTools *format,
 		FileOGG::get_parameters(parent_window, asset, format_window,
 			audio_options, video_options, edl);
 		break;
+	case FILE_VORBIS:
+		FileVorbis::get_parameters(parent_window, asset, format_window,
+			audio_options, video_options, edl);
+		break;
 #endif
 	default:
 		break;
diff --git a/cinelerra-5.1/cinelerra/setformat.C b/cinelerra-5.1/cinelerra/setformat.C
index 4d96a607..ca514aaf 100644
--- a/cinelerra-5.1/cinelerra/setformat.C
+++ b/cinelerra-5.1/cinelerra/setformat.C
@@ -289,6 +289,13 @@ SetFormatWindow::~SetFormatWindow()
 	delete presets;
 }
 
+/* W Ratio, H Ratio
+Sets the ratio of the new canvas size (W, H) to the old (previous) canvas size (W, H). 
+The new canvas size is recalculated based upon a certain factor in the W Ratio, 
+H Ratio fields. A practical use-case: The current resolution is 640x480, and for some reason 
+you want it to be 1.33 times wider. You don't have to calculate what 640x1.33 is; 
+you type 1.33 into the "W" input instead, and Cinelerra calculates it for you. */
+
 void SetFormatWindow::create_objects()
 {
 	lock_window("SetFormatWindow::create_objects");
@@ -421,7 +428,7 @@ void SetFormatWindow::create_objects()
 	y += mwindow->theme->setformat_margin;
 	add_subwindow(new BC_Title(mwindow->theme->setformat_x3,
 		y,
-		_("Aspect ratio:")));
+		_("Display Aspect ratio:")));
 	y += mwindow->theme->setformat_margin;
 	x = mwindow->theme->setformat_x3;
 	add_subwindow(aspect_w = new ScaleAspectText(x, y, thread,
@@ -454,6 +461,10 @@ void SetFormatWindow::create_objects()
 		(ArrayList<BC_ListBoxItem*>*)&mwindow->interlace_project_modes,
 		mwindow->theme->setformat_x4 + textbox->get_w(), y));
 	y += mwindow->theme->setformat_margin;
+	
+	add_subwindow(new BC_Title(mwindow->theme->setformat_x3,
+               y+10,
+               _("Note: W/H ratio fields means multipliers \nrelative to previous canvas size \n")));
 
 	BC_OKTextButton *ok;
 	BC_CancelTextButton *cancel;
diff --git a/cinelerra-5.1/cinelerra/versioninfo.h b/cinelerra-5.1/cinelerra/versioninfo.h
index 7e2a528f..852542f5 100644
--- a/cinelerra-5.1/cinelerra/versioninfo.h
+++ b/cinelerra-5.1/cinelerra/versioninfo.h
@@ -9,7 +9,7 @@
 #define COPYRIGHTTEXT1 "(c) 2006-2019 Heroine Virtual Ltd. by Adam Williams\n"
 #define COPYRIGHTTEXT2 "2007-2020 mods for Cinelerra-GG by W.P.Morrow aka goodguy\n"
 #define COPYRIGHTTEXT3 "2003-2017 mods for Cinelerra-CV by CinelerraCV team\n"
-#define COPYRIGHTTEXT4 "2015-2023 mods for Cinelerra-GG by Cinelerra-GG team\n"
+#define COPYRIGHTTEXT4 "2015-2024 mods for Cinelerra-GG by Cinelerra-GG team\n"
 
 #undef COMPILEDATE
 
diff --git a/cinelerra-5.1/ffmpeg/audio/dv.dv b/cinelerra-5.1/ffmpeg/audio/dv.dv
new file mode 100644
index 00000000..43dbab9d
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/dv.dv
@@ -0,0 +1,2 @@
+dv pcm_s16le
+# Only for testing raw dv stream
diff --git a/cinelerra-5.1/ffmpeg/video/dv.dv b/cinelerra-5.1/ffmpeg/video/dv.dv
new file mode 100644
index 00000000..372edbf8
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/dv.dv
@@ -0,0 +1,2 @@
+dv dvvideo
+# Only for testing raw dv stream