From e620b69f6d3f1de30d8b2a16c46d7729462e5211 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 22 Sep 2019 18:13:02 -0600 Subject: [PATCH] GLx4 w/h mult of 4 is not req, cwdw crop input range checks, fix cropp.png dir, change bitrate to 'b' in opts files --- cinelerra-5.1/cinelerra/cwindowtool.C | 4 ++++ cinelerra-5.1/cinelerra/mwindow.C | 6 ++++-- cinelerra-5.1/cinelerra/mwindowedit.C | 8 ++++---- cinelerra-5.1/cinelerra/playback3d.C | 4 +++- cinelerra-5.1/cinelerra/preferencesthread.C | 4 ++-- cinelerra-5.1/cinelerra/resizetrackthread.C | 3 ++- cinelerra-5.1/ffmpeg/video/hd.youtube | 2 +- cinelerra-5.1/ffmpeg/video/mov.mov | 2 +- cinelerra-5.1/ffmpeg/video/pass1of2_vp9.webm | 2 +- cinelerra-5.1/ffmpeg/video/pass2of2_vp9.webm | 2 +- cinelerra-5.1/ffmpeg/video/sd.youtube | 2 +- cinelerra-5.1/ffmpeg/video/uhd.youtube | 2 +- cinelerra-5.1/ffmpeg/video/vp9_0320x240_24or25or30fps.mkv | 4 ++-- .../ffmpeg/video/vp9_0320x240_24or25or30fps.webm | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_0640x360_24or25or30fps.mkv | 4 ++-- .../ffmpeg/video/vp9_0640x360_24or25or30fps.webm | 4 ++-- .../video/vp9_0640x480_lowQuality_24or25or30fps.mkv | 4 ++-- .../video/vp9_0640x480_lowQuality_24or25or30fps.webm | 4 ++-- .../video/vp9_0640x480_mediumQuality_24or25or30fps.mkv | 4 ++-- .../video/vp9_0640x480_mediumQuality_24or25or30fps.webm | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_1280x720_24or25or30fps.mkv | 4 ++-- .../ffmpeg/video/vp9_1280x720_24or25or30fps.webm | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.mkv | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_1280x720_50or60fps.webm | 4 ++-- .../ffmpeg/video/vp9_1920x1080_24or25or30fps.mkv | 4 ++-- .../ffmpeg/video/vp9_1920x1080_24or25or30fps.webm | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.mkv | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_1920x1080_50or60fps.webm | 4 ++-- .../ffmpeg/video/vp9_2560x1440_24or25or30fps.mkv | 4 ++-- .../ffmpeg/video/vp9_2560x1440_24or25or30fps.webm | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.mkv | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_2560x1440_50or60fps.webm | 4 ++-- .../ffmpeg/video/vp9_3840x2160_24or25or30fps.mkv | 4 ++-- .../ffmpeg/video/vp9_3840x2160_24or25or30fps.webm | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.mkv | 4 ++-- cinelerra-5.1/ffmpeg/video/vp9_3840x2160_50or60fps.webm | 4 ++-- cinelerra-5.1/guicast/bcpbuffer.C | 4 ++++ cinelerra-5.1/guicast/vframe3d.C | 8 ++++++++ cinelerra-5.1/plugin_defs | 1 + 39 files changed, 86 insertions(+), 64 deletions(-) diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index a7e4f3b9..e701b9d6 100644 --- 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 b3ad59a0..35bd21e4 100644 --- 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 f7d43ee9..82c4f1e4 100644 --- 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 a7f185b5..1844f808 100644 --- 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 58b659c4..73d8d5d4 100644 --- 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 b8368ff4..c929c64b 100644 --- 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 d1002a94..7bfaf329 100644 --- 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 d0faa352..9e1f291d 100644 --- 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 74f7a4f9..555055d8 100644 --- 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 9f5978b6..cfa09a5c 100644 --- 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 f2a78354..ebbaceb9 100644 --- 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 630b91e5..895ccb22 100644 --- 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 9aa2d073..d157e1c2 100644 --- 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 6c9a38a6..2694405e 100644 --- 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 f32ccc31..764de734 100644 --- 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 000fab34..1e39d4d0 100644 --- 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 615a32b0..27df5389 100644 --- 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 57353c1a..0b3e0f04 100644 --- 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 46c806b3..7e1a00a3 100644 --- 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 169c4aed..e6e9c13f 100644 --- 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 41dab1c4..a217888d 100644 --- 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 c05b7294..25762be9 100644 --- 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 08fd094e..309b12d8 100644 --- 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 b32a2392..a2fc6c6c 100644 --- 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 cc1fc628..be0a83af 100644 --- 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 14c7453f..88f772c4 100644 --- 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 2c8423ac..04d9b2f1 100644 --- 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 bbbecc91..8169ed55 100644 --- 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 278df023..3dc086db 100644 --- 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 0372d702..7f8b3569 100644 --- 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 cb617eff..786f5b0f 100644 --- 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 4f97d4c1..b9254cdd 100644 --- 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 1d8aba5b..26ce5119 100644 --- 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 8130e832..cadd1a73 100644 --- 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 8c996cbf..042c7b02 100644 --- 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 8b903457..105b556c 100644 --- 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 fed0d2d2..c847e832 100644 --- 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 42d91ba1..ed47a40e 100644 --- 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 afd04e88..50cf15aa 100644 --- a/cinelerra-5.1/plugin_defs +++ b/cinelerra-5.1/plugin_defs @@ -35,6 +35,7 @@ video := \ color3way \ colorbalance \ crikey \ + cropp \ crossfade \ decimate \ deinterlace \ -- 2.26.2