GLx4 w/h mult of 4 is not req, cwdw crop input range checks, fix cropp.png dir, chang...

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index a7e4f3b977302b4753db0bd2f78458abadaf2ea2..e701b9d69ed43bd09e9ac4221ac94ae61dea4f6e 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -480,10 +480,12 @@ void CWindowCropGUI::create_objects()
        x1 = new CWindowCoord(thread->tool_gui, x, y,
                mwindow->edl->session->crop_x1);
        x1->create_objects();
+       x1->set_boundaries((int64_t)0, (int64_t)65536);
        y += pad;
        width = new CWindowCoord(thread->tool_gui, x, y,
                mwindow->edl->session->crop_x2 - mwindow->edl->session->crop_x1);
        width->create_objects();
+       width->set_boundaries((int64_t)1, (int64_t)65536);
 
 
        x += x1->get_w() + 10;
@@ -501,11 +503,13 @@ void CWindowCropGUI::create_objects()
        y1 = new CWindowCoord(thread->tool_gui, x, y,
                mwindow->edl->session->crop_y1);
        y1->create_objects();
+       y1->set_boundaries((int64_t)0, (int64_t)65536);
        y += pad;
 
        height = new CWindowCoord(thread->tool_gui, x, y,
                mwindow->edl->session->crop_y2 - mwindow->edl->session->crop_y1);
        height->create_objects();
+       height->set_boundaries((int64_t)1, (int64_t)65536);
        y += pad;
 
        add_subwindow(crop_mode = new CWindowCropOpMode(mwindow, this,

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index b3ad59a05d7e1200c1805795771137754d290912..35bd21e4d44d534c857972aced98adc3399bca38 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -4489,7 +4489,7 @@ void MWindow::resync_guis()
        lwindow->gui->panel->set_meters(channels, 1);
        lwindow->gui->flush();
        lwindow->gui->unlock_window();
-
+#ifdef GLx4
 // Warn user
        if(((edl->session->output_w % 4) ||
                (edl->session->output_h % 4)) &&
@@ -4499,7 +4499,7 @@ void MWindow::resync_guis()
                        _("This project's dimensions are not multiples of 4 so\n"
                        "it can't be rendered by OpenGL."));
        }
-
+#endif
 
 // Flash frame
        sync_parameters(CHANGE_ALL);
@@ -4524,8 +4524,10 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
                double framerate = asset->get_frame_rate();
                int width = asset->get_w();
                int height = asset->get_h();
+#ifdef GLx4
                // must be multiple of 4 for opengl
                width = (width+3) & ~3;  height = (height+3) & ~3;
+#endif
                int driver = session->playback_config->vconfig->driver;
                int color_model = file->get_best_colormodel(asset, driver);
 //             color_model = BC_CModels::is_yuv(color_model) ?

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index f7d43ee92b14de8a9743ab8a2d4eae658b1de55f..82c4f1e4471479b98797d79bc9d3ff09a0a22a19 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -203,7 +203,7 @@ void MWindow::asset_to_all()
                                }
                        }
 
-
+#ifdef GLx4
                        if( ((edl->session->output_w % 4) ||
                                (edl->session->output_h % 4)) &&
                                edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL ) {
@@ -211,7 +211,7 @@ void MWindow::asset_to_all()
                                        _("This project's dimensions are not multiples of 4 so\n"
                                        "it can't be rendered by OpenGL."));
                        }
-
+#endif
 // Get aspect ratio
                        if( defaults->get("AUTOASPECT", 0) ) {
                                create_aspect_ratio(
@@ -250,7 +250,7 @@ void MWindow::asset_to_size()
                h = indexable->get_h();
                edl->session->output_w = w;
                edl->session->output_h = h;
-
+#ifdef GLx4
                if( ((edl->session->output_w % 4) ||
                        (edl->session->output_h % 4)) &&
                        edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL ) {
@@ -258,7 +258,7 @@ void MWindow::asset_to_size()
                                _("This project's dimensions are not multiples of 4 so\n"
                                "it can't be rendered by OpenGL."));
                }
-
+#endif
 // Get aspect ratio
                if( defaults->get("AUTOASPECT", 0) ) {
                        create_aspect_ratio(edl->session->aspect_w,

diff --git a/cinelerra-5.1/cinelerra/playback3d.C b/cinelerra-5.1/cinelerra/playback3d.C
index a7f185b51cdd7d8d3795183fb9c41c152997a5c9..1844f808ef3aade81a87ecdf28f54049a4f01961 100644 (file)
--- a/cinelerra-5.1/cinelerra/playback3d.C
+++ b/cinelerra-5.1/cinelerra/playback3d.C
@@ -521,12 +521,14 @@ void Playback3D::copy_from_sync(Playback3DCommand *command)
 // command->frame->get_w(),
 // command->frame->get_h(),
 // command->frame->get_color_model());
-// With NVidia at least,
+#ifdef GLx4
+// With NVidia at least
                        if(w % 4)
                        {
                                printf("Playback3D::copy_from_sync: w=%d not supported because it is not divisible by 4.\n", w);
                        }
                        else
+#endif
 // Copy to texture
                        if(command->want_texture)
                        {

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 58b659c43a94153ca78dde74fe10b8b1e983a391..73d8d5d4e4ab06b717729af0bee3911d5d9c5334 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -273,7 +273,7 @@ int PreferencesThread::apply_settings()
 
 //edl->session->recording_format->dump();
 //mwindow->edl->session->recording_format->dump();
-
+#ifdef GLx4
        if(((mwindow->edl->session->output_w % 4) ||
                (mwindow->edl->session->output_h % 4)) &&
                mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL)
@@ -282,7 +282,7 @@ int PreferencesThread::apply_settings()
                        _("This project's dimensions are not multiples of 4 so\n"
                        "it can't be rendered by OpenGL."));
        }
-
+#endif
 
        if(redraw_meters)
        {

diff --git a/cinelerra-5.1/cinelerra/resizetrackthread.C b/cinelerra-5.1/cinelerra/resizetrackthread.C
index b8368ff400d314caf865ddf1cfc97467649c9101..c929c64baad71146680a3f93c2d68e09fc2af5d2 100644 (file)
--- a/cinelerra-5.1/cinelerra/resizetrackthread.C
+++ b/cinelerra-5.1/cinelerra/resizetrackthread.C
@@ -85,7 +85,7 @@ void ResizeVTrackThread::run()
        if(!result) {
                update();
        }
-
+#ifdef GLx4
        if(((w % 4) || (h % 4)) &&
                mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL)
        {
@@ -93,6 +93,7 @@ void ResizeVTrackThread::run()
                        _("This track's dimensions are not multiples of 4 so\n"
                        "it can't be rendered by OpenGL."));
        }
+#endif
 }
 
 

diff --git a/cinelerra-5.1/ffmpeg/video/hd.youtube b/cinelerra-5.1/ffmpeg/video/hd.youtube
index d1002a94f652323e7681cd67449bce22acc657bc..7bfaf329608eca633791d3bd552bcd4975f0e28a 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/hd.youtube
+++ b/cinelerra-5.1/ffmpeg/video/hd.youtube
@@ -3,7 +3,7 @@ webm libvpx-vp9
 # More VP9 options if choose format of webm
 # Refer to Appendix C.3 in Cinelerra_GG manual
 # 1920x1080 (24, 25 or 30 frames per second)
-bitrate=1800k
+b=1800k
 minrate=900k
 maxrate=2610k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/mov.mov b/cinelerra-5.1/ffmpeg/video/mov.mov
index d0faa352a658cae1d8a45e0fe81cf923e12e2884..9e1f291d535060e3571da48b08292ac46c7a7806 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/mov.mov
+++ b/cinelerra-5.1/ffmpeg/video/mov.mov
@@ -1,2 +1,2 @@
 mov mpeg4
-bitrate=1800k
+b=1800k

diff --git a/cinelerra-5.1/ffmpeg/video/pass1of2_vp9.webm b/cinelerra-5.1/ffmpeg/video/pass1of2_vp9.webm
index 74f7a4f96f28ddebe6a7b93bab76278f0be2255a..555055d8c02e9b8304637479f32c694e844a1248 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/pass1of2_vp9.webm
+++ b/cinelerra-5.1/ffmpeg/video/pass1of2_vp9.webm
@@ -2,7 +2,7 @@ webm libvpx-vp9
 # pass 1 of 2, you must render the 2nd pass using pass2of2...
 cin_stats_filename /tmp/cin_video_vp9_webm
 flags +pass1
-bitrate=1024k
+b=1024k
 minrate=512k
 maxrate=1485k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/pass2of2_vp9.webm b/cinelerra-5.1/ffmpeg/video/pass2of2_vp9.webm
index 9f5978b6621c8ed42cfca4dbd4668c486c5bc5a9..cfa09a5cf4d1f54e46253ee2d9fafbb01c317f19 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/pass2of2_vp9.webm
+++ b/cinelerra-5.1/ffmpeg/video/pass2of2_vp9.webm
@@ -2,7 +2,7 @@ webm libvpx-vp9
 # Pass 2 of 2, you must first render using pass1of2...
 cin_stats_filename /tmp/cin_video_vp9_webm
 flags +pass2
-bitrate=1024k
+b=1024k
 minrate=512k
 maxrate=1485k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/sd.youtube b/cinelerra-5.1/ffmpeg/video/sd.youtube
index f2a7835453fef709611cb15d8ffcad1dc800844e..ebbaceb9ab07062eabdcda89b34f09a1e3b7dc3e 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/sd.youtube
+++ b/cinelerra-5.1/ffmpeg/video/sd.youtube
@@ -3,7 +3,7 @@ webm libvpx-vp9
 # More VP9 options if choose format of webm
 # Refer to Appendix C.3 in Cinelerra_GG manual
 # 640x480 (Medium Quality, 24/25/30 frames per second)
-bitrate=750k
+b=750k
 minrate=375k
 maxrate=1088k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/uhd.youtube b/cinelerra-5.1/ffmpeg/video/uhd.youtube
index 630b91e504261a36c11a59ca434aa242b8543a59..895ccb229ff21581c087d772933d32e93d99c872 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/uhd.youtube
+++ b/cinelerra-5.1/ffmpeg/video/uhd.youtube
@@ -3,7 +3,7 @@ webm libvpx-vp9
 # More VP9 options if choose format of webm
 # Refer to Appendix C.3 in Cinelerra_GG manual
 # 3840x2160 (50 or 60 frames per second)
-bitrate=18000k
+b=18000k
 minrate=9000k
 maxrate=26100k
 tile-columns=4

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.mkv
index 9aa2d07366b371c0d537b774e56aa548d52b8d2f..d157e1c22f9506200313d7be59885c0198ccc1ed 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 320x240 (24, 25 or 30 frames per second)
-bitrate=150k
+b=150k
 minrate=75k
 maxrate=218k
 tile-columns=0

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.webm
index 6c9a38a6c53a40c430cdb5e8fc6d139e41e22812..2694405e6b03efec816f84d1b328520e401714c7 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 320x240 (24, 25 or 30 frames per second)
-bitrate=150k
+b=150k
 minrate=75k
 maxrate=218k
 tile-columns=0

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.mkv
index f32ccc31fb0021463db421e894bd656de3b8012e..764de734c45407d1c72c171112a1103b588d0fa2 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 640x360 (24, 25 or 30 frames per second)
-bitrate=276k
+b=276k
 minrate=138k
 maxrate=400k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.webm
index 000fab34fdf52d08294da4c00f134e98065df595..1e39d4d0a1cee5db25fb0da243674a282ce64af1 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 640x360 (24, 25 or 30 frames per second)
-bitrate=276k
+b=276k
 minrate=138k
 maxrate=400k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.mkv
index 615a32b08f8b1ef81a894cbbecb3242c26c7a866..27df5389f4b04d8cd67655a138d5f2cd2db8ea15 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 640x480 (Low Quality, 24, 25 or 30 frames per second)
-bitrate=512k
+b=512k
 minrate=256k
 maxrate=742k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.webm
index 57353c1af8c8c394d68601656aed9319d5526402..0b3e0f04ae8089754cb3c2f459a22a44e7723e2d 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_lowQuality_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 640x480 (Low Quality, 24, 25 or 30 frames per second)
-bitrate=512k
+b=512k
 minrate=256k
 maxrate=742k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.mkv
index 46c806b3e9f9f2e1775bcfaefd32f8387f34a3d4..7e1a00a3e8eecfc80e00837fcdb3948c0f7b87c6 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 640x480 (Medium Quality, 24, 25 or 30 frames per second)
-bitrate=750k
+b=750k
 minrate=375k
 maxrate=1088k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.webm
index 169c4aed4d64b6cb4b173bfcb7dacbd32c3a9f36..e6e9c13f17b67fad95ca86b505ee2e4e31f8fa0d 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_0640x480_mediumQuality_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 640x480 (Medium Quality, 24, 25 or 30 frames per second)
-bitrate=750k
+b=750k
 minrate=375k
 maxrate=1088k
 tile-columns=1

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.mkv
index 41dab1c4c0ee3fd407dbfebd74f14f2604fa6ad6..a217888d27b97b3746525e4584163128a53febff 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1280x720 (24, 25 or 30 frames per second)
-bitrate=1024k
+b=1024k
 minrate=512k
 maxrate=1485k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.webm
index c05b7294fdf421eaaa7de3ac5e464e7ae612d3fb..25762be9c1614d0139a8e9191f993c24adf41a88 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1280x720 (24, 25 or 30 frames per second)
-bitrate=1024k
+b=1024k
 minrate=512k
 maxrate=1485k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.mkv
index 08fd094ed54affecf2699bedc7a23327e99859c3..309b12d8c284a36e2258dbf52a0f6a605601baa0 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1280x720 (50 or 60 frames per second)
-bitrate=1800k
+b=1800k
 minrate=900k
 maxrate=2610k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.webm
index b32a2392981dc2be728bfadd9693532a34af12d4..a2fc6c6c6f58031292dc3860e2b6ffac6962b146 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1280x720 (50 or 60 frames per second)
-bitrate=1800k
+b=1800k
 minrate=900k
 maxrate=2610k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.mkv
index cc1fc628d16c7655fc393f8c6767d604b6ac0e7b..be0a83aff56222bbbc9f98a11cb780d6554657e1 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1920x1080 (24, 25 or 30 frames per second)
-bitrate=1800k
+b=1800k
 minrate=900k
 maxrate=2610k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.webm
index 14c7453f5429b203b95af82aa3ed2320537848d3..88f772c4acfd4d2348b8e515d3eb7818f4d00c0a 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1920x1080 (24, 25 or 30 frames per second)
-bitrate=1800k
+b=1800k
 minrate=900k
 maxrate=2610k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.mkv
index 2c8423ac233c330f9d630ea396a8edc586027cc2..04d9b2f1159af18f8fdfe23c2e3902eb22d0f1d9 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1920x1080 (50 or 60 frames per second)
-bitrate=3000k
+b=3000k
 minrate=1500k
 maxrate=4350k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.webm
index bbbecc917095d25b3c0de6a5eb5bc884cd74529e..8169ed554dcd2aa1265b9e65e3b88406df8250d9 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 1920x1080 (50 or 60 frames per second)
-bitrate=3000k
+b=3000k
 minrate=1500k
 maxrate=4350k
 tile-columns=2

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.mkv
index 278df02341641fecbe5ef46d39e26b0ce18c7116..3dc086db7e3758c4354501a31db804b49e468d72 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 2560x1440 (24, 25 or 30 frames per second)
-bitrate=6000k
+b=6000k
 minrate=3000k
 maxrate=8700k
 tile-columns=3

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.webm
index 0372d702229a53ae6121f5f3eafa0e94e0a4f373..7f8b3569b73593ef8f9575363b633b4523ab3aed 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 2560x1440 (24, 25 or 30 frames per second)
-bitrate=6000k
+b=6000k
 minrate=3000k
 maxrate=8700k
 tile-columns=3

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.mkv
index cb617eff97fed21e0cbb21261531e8764eaef4c1..786f5b0f6f2e21604ce52c73374a7a58e61e58f1 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 2560x1440 (50 or 60 frames per second)
-bitrate=9000k
+b=9000k
 minrate=4500k
 maxrate=13050k
 tile-columns=3

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.webm
index 4f97d4c108598efbc46d33fc9b18d563b7f63e9d..b9254cdda0113123cb5d946fe0ebbcfccbd14128 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 2560x1440 (50 or 60 frames per second)
-bitrate=9000k
+b=9000k
 minrate=4500k
 maxrate=13050k
 tile-columns=3

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.mkv
index 1d8aba5b0b0f5c592aabcbd190ffca50be9731f6..26ce51197da6f62c49b6330aa04fb1fdce5c33d4 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 3840x2160 (24, 25 or 30 frames per second)
-bitrate=12000k
+b=12000k
 minrate=6000k
 maxrate=17400k
 tile-columns=4

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.webm
index 8130e8326a32d3e1d202542f6c8025bce8d68831..cadd1a735da91e0e920c025abc1fddc152a97806 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_24or25or30fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 3840x2160 (24, 25 or 30 frames per second)
-bitrate=12000k
+b=12000k
 minrate=6000k
 maxrate=17400k
 tile-columns=4

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.mkv b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.mkv
index 8c996cbfd4a434dc3fb8774ba12555bd6db285b2..042c7b02334c9de43712b278b0b5f2b0120a14ba 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.mkv
+++ b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.mkv
@@ -1,9 +1,9 @@
 matroska libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 3840x2160 (50 or 60 frames per second)
-bitrate=18000k
+b=18000k
 minrate=9000k
 maxrate=26100k
 tile-columns=4

diff --git a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.webm b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.webm
index 8b903457d629bb01e6f3a7e5c41f6b0282567a3a..105b556c0b5e1e0bfea1ecd4ea6c77fd0e1da4cb 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.webm
+++ b/cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.webm
@@ -1,9 +1,9 @@
 webm libvpx-vp9
 # 20171119-2100
 # based on https://developers.google.com/media/vp9/settings/vod/
-# for explanations see Feature5.pdf section 3
+# for explanations reference the Cinelerra Manual
 # 3840x2160 (50 or 60 frames per second)
-bitrate=18000k
+b=18000k
 minrate=9000k
 maxrate=26100k
 tile-columns=4

diff --git a/cinelerra-5.1/guicast/bcpbuffer.C b/cinelerra-5.1/guicast/bcpbuffer.C
index fed0d2d2d10f6946edb4799e0f5bdabc7abf04c1..c847e8328ed52114fbe4eb5aa9a598a2563b8f26 100644 (file)
--- a/cinelerra-5.1/guicast/bcpbuffer.C
+++ b/cinelerra-5.1/guicast/bcpbuffer.C
@@ -64,7 +64,11 @@ GLXPbuffer BC_PBuffer::get_pbuffer()
 void BC_PBuffer::create_pbuffer(int w, int h)
 {
 #ifdef HAVE_GL
+#ifdef GLx4
        int ww = (w + 3) & ~3, hh = (h + 3) & ~3;
+#else
+       int ww = w, hh = h;
+#endif
        BC_WindowBase *current_window = BC_WindowBase::get_synchronous()->current_window;
        window_id = current_window->get_id();
 

diff --git a/cinelerra-5.1/guicast/vframe3d.C b/cinelerra-5.1/guicast/vframe3d.C
index 42d91ba1af0b77d1a9243a3d1db105e02a84c6e8..ed47a40e0af55ef02810b2439a6c245373e1fecf 100644 (file)
--- a/cinelerra-5.1/guicast/vframe3d.C
+++ b/cinelerra-5.1/guicast/vframe3d.C
@@ -147,7 +147,11 @@ void VFrame::to_texture()
 
 void VFrame::create_pbuffer()
 {
+#ifdef GLx4
        int ww = (get_w()+3) & ~3, hh = (get_h()+3) & ~3;
+#else
+       int ww = get_w(), hh = get_h();
+#endif
        if( pbuffer && (pbuffer->w != ww || pbuffer->h != hh ||
            pbuffer->window_id != BC_WindowBase::get_synchronous()->current_window->get_id() ) ) {
                delete pbuffer;
@@ -293,6 +297,10 @@ void VFrame::init_screen(int w, int h)
        glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, zero);
        glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, zero);
        glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0);
+#ifndef GLx4
+       glPixelStorei(GL_PACK_ALIGNMENT,1);
+       glPixelStorei(GL_UNPACK_ALIGNMENT,1);
+#endif
 #endif
 }
 

diff --git a/cinelerra-5.1/plugin_defs b/cinelerra-5.1/plugin_defs
index afd04e88c81dbd4fae8e367604fe2671c5bf2381..50cf15aad9b0a1756817347f5d53f93208e8b55d 100644 (file)
--- a/cinelerra-5.1/plugin_defs
+++ b/cinelerra-5.1/plugin_defs
@@ -35,6 +35,7 @@ video := \
        color3way \
        colorbalance \
        crikey \
+       cropp \
        crossfade \
        decimate \
        deinterlace \