From: Good Guy Date: Thu, 17 Jun 2021 23:11:51 +0000 (-0600) Subject: fix for Gang Channels/Media X-Git-Tag: 2021-06~4 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=986fe708363ab0225a954e637f14bbbd8e800d81;p=goodguy%2Fcinelerra.git fix for Gang Channels/Media --- diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C index 0c364f73..8a667b5c 100644 --- a/cinelerra-5.1/cinelerra/theme.C +++ b/cinelerra-5.1/cinelerra/theme.C @@ -369,6 +369,7 @@ void Theme::build_menus() frame_rates.append(new BC_ListBoxItem("100")); frame_rates.append(new BC_ListBoxItem("120")); frame_rates.append(new BC_ListBoxItem("144")); + frame_rates.append(new BC_ListBoxItem("240")); frame_rates.append(new BC_ListBoxItem("1000")); char string[BCTEXTLEN]; diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C index 5c07480e..aff2b093 100644 --- a/cinelerra-5.1/cinelerra/track.C +++ b/cinelerra-5.1/cinelerra/track.C @@ -1836,20 +1836,22 @@ int Track::in_gang(Track *track) int Track::is_armed() { - return armed && gang_master()->armed; +// return armed && gang_master()->armed; + return gang_master()->armed; } int Track::is_ganged() { - return ganged && gang_master()->ganged; +// return ganged && gang_master()->ganged; + return gang_master()->ganged; } int Track::armed_gang(Track *track) { - if( !track->ganged ) return 0; +// if( !track->ganged ) return 0; if( edl->local_session->gang_tracks == GANG_NONE ) return ganged; Track *current = gang_master(); - if( !current->ganged ) return 0; +// if( !current->ganged ) return 0; for(;;) { if( track == current ) return 1; current = current->next; diff --git a/cinelerra-5.1/ffmpeg/video/av1.webm b/cinelerra-5.1/ffmpeg/video/av1.webm index d5e642bb..d8306db8 100644 --- a/cinelerra-5.1/ffmpeg/video/av1.webm +++ b/cinelerra-5.1/ffmpeg/video/av1.webm @@ -2,5 +2,8 @@ webm libaom-av1 # this codec codes less than one frame per sec # and so even a few seconds of video can take # a very long time to encode +cpu-used 5 +row-mt 1 +tiles 2x2 strict -2 threads 8