Credit Andrew - fix local Vorbis audio for modifiable parameters, add raw dv profiles...

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index f0b393029718d8e0acb4632aad13a1f1042020fb..90ad489f76a3307314789cab03035426f4d6e374 100644 (file)
--- 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 4d96a607067dda4ef2c924667c0d4105f5a666b0..ca514aaf9810f73f2cf8baa2959f7450027ee3be 100644 (file)
--- 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 7e2a528f4ce5b694ccc3416d696b11d8beb64fa9..852542f5170d5014131250ae6a5c5d7563128c7a 100644 (file)
--- 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 (file)
index 0000000..43dbab9
--- /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 (file)
index 0000000..372edbf
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/dv.dv
@@ -0,0 +1,2 @@
+dv dvvideo
+# Only for testing raw dv stream