Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / filempeg.C

diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C
index bd8da56ba95d07fef27bc697995b505357571d8b..49dfedeac79d720c5b5d7c84011aa656e3dfb4d6 100644 (file)
--- a/cinelerra-5.1/cinelerra/filempeg.C
+++ b/cinelerra-5.1/cinelerra/filempeg.C
@@ -501,10 +501,6 @@ int FileMPEG::open_file(int rd, int wr)
                                {
                                        append_vcommand_line("-a");
 // Square pixels
-                                       if(EQUIV((double)asset->width / asset->height,
-                                               asset->aspect_ratio))
-                                               append_vcommand_line("1");
-                                       else
                                        if(EQUIV(asset->aspect_ratio, 1.333))
                                                append_vcommand_line("2");
                                        else
@@ -513,6 +509,10 @@ int FileMPEG::open_file(int rd, int wr)
                                        else
                                        if(EQUIV(asset->aspect_ratio, 2.11))
                                                append_vcommand_line("4");
+                                       else
+                                       if(EQUIV((double)asset->width / asset->height,
+                                               asset->aspect_ratio))
+                                               append_vcommand_line("1");
                                }
 
                                append_vcommand_line(asset->vmpeg_derivative == 1 ? "-1" : "");
@@ -632,6 +632,28 @@ int FileMPEG::open_file(int rd, int wr)
                                sprintf(string, " -V 500");
                                strncat(mjpeg_command, string, sizeof(mjpeg_command));
                        }
+                       
+                       if(asset->vmpeg_preset == 13) /* set high profile for 1080 */
+                       {
+                       sprintf(string, " -l high");
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+                       }
+                       
+                       if(asset->vmpeg_preset == 6) /* set -T for vcd */
+                       {
+                       sprintf(string, " -T 35");
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+                       }
+                       
+                       if(asset->vmpeg_preset == 7) /* set -T for svcd */
+                       {
+                       sprintf(string, " -T 120");
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+                       }
+                       
+                       sprintf(string, " -c"); /* set closed gop */
+                       strncat(mjpeg_command, string, sizeof(mjpeg_command));
+               
 
                        strncat(mjpeg_command,
                                asset->vmpeg_progressive ? " -I 0" : " -I 1",
@@ -1727,6 +1749,8 @@ MPEGConfigAudio::MPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset)
 {
        this->parent_window = parent_window;
        this->asset = asset;
+// *** CONTEXT_HELP ***
+       context_help_set_keyword("Single File Rendering");
 }
 
 MPEGConfigAudio::~MPEGConfigAudio()
@@ -1881,6 +1905,8 @@ MPEGConfigVideo::MPEGConfigVideo(BC_WindowBase *parent_window,
        this->parent_window = parent_window;
        this->asset = asset;
        reset_cmodel();
+// *** CONTEXT_HELP ***
+       context_help_set_keyword("Single File Rendering");
 }
 
 MPEGConfigVideo::~MPEGConfigVideo()