Olaf improvement for README.pkgs + fixes and Andrea replacing improved images + fixes

diff --git a/extra/README.pkgs b/extra/README.pkgs
new file mode 100644 (file)
index 0000000..61c5e35
--- /dev/null
+++ b/extra/README.pkgs
@@ -0,0 +1,211 @@
+# Depending on the distro, use the instructions below and
+# select the appropriate setup operations to install, update
+# or remove cinelerr-gg infinity. (11/24/2019) To upgrade,
+# refresh repo, then replace "install" with "update", or
+# whatever.
+
+# Email problems to cin@lists.cinelerra-gg.org. If
+# repository problems, usually you can manually do an
+# install by using:
+
+# UBUNTU, MINT, DEBIAN
+wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.deb
+# and install it manually:
+dpkg -i cin_5.1.{substitute_filename}.deb
+
+# ARCH
+wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.pkg.tar.xz
+# and install it manually:
+pacman -U cin_5.1.{substitute_filename}.pkg.tar.xz
+
+# FEDORA
+wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.rpm
+# and install it manually:
+dnf install cin_5.1.{substitute_filename}.rpm
+
+# LEAP, SUSE
+wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.rpm
+# and install it manually:
+zypper install cin_5.1.{substitute_filename}.rpm
+
+# CENTOS
+wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.rpm
+# and install it manually:
+yum localinstall cin_5.1.{substitute_filename}.rpm
+
+# GENTOO
+# There are static and dynamic tarballs for
+# Base Release 2.6
+https://cinelerra-gg.org/download/tars/cinelerra-5.1-gentoo-20200202.x86_64-static.txz
+https://cinelerra-gg.org/download/tars/cinelerra-5.1-gentoo-20200202.x86_64.txz
+# download one of the above and then refer to README.txt
+
+# FREEBSD
+# There is a tarball based on FreeBSD version 12.1 at
+https://cinelerra-gg.org/download/testing/bsdcin.tar.xz
+# download the above and then refer to README.txt
+
+# FEDORA
+# Replace the XX in fedoraXX in the next
+# line with your current O/S version number
+dnf install cinelerra --nogpgcheck --repofrompath cingg,https://cinelerra-gg.org/download/pkgs/fedoraXX/
+# dnf erase cinelerra
+
+# CENTOS
+# Python 2 has been updated for other distros to Python 3 so
+# you might have to create a soft link to get the correct
+# version. For help, send email to
+# cin@lists.cinelerra-gg.org first create the file
+# /etc/yum.repos.d/cin_gg, with the following contents:
+[cin_gg]
+name=cingg
+baseurl=https://cinelerra-gg.org/download/pkgs/centos7
+gpgcheck=0
+# end of cin_gg
+yum install cinelerra
+# yum erase cinelerra
+
+# UBUNTU, replace ub14 with your distro id: ub16,ub18 Some
+# ubuntu apt downloads register status as working 0%
+# constantly while running the package download, like ubuntu
+# 14. It may take a few minutes for this step so be patient.
+apt install software-properties-common apt-transport-https
+apt-add-repository https://cinelerra-gg.org/download/pkgs/ub14
+
+# UBUNTU 16/18 note - This has been known to work, but
+# things change quickly:
+# VIP - for the first install, the above line adds cinelerra
+# to /etc/apt/sources.list but... Version 16/18 of Ubuntu
+# are more strict for licensing so you will have to edit the
+# file /etc/apt/sources.list to add [trusted=yes] after deb
+# and before https...cin...
+
+# For example the line should be:
+# deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/ub16 xenial main
+# Or for ub18:
+# deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/ub18 bionic main
+# Also, on the install you will get an error message that you
+# can either ignore as cinelerra will run anyway, or else (the
+# first time only) on the commnand line keyin:
+# echo > /etc/sysctl.d/50-cin.conf "kernel.shmmax=0x7fffffff"
+apt update
+apt install cin
+# to update a previous install (ignore any i386 errors as only 64
+# bit version available):
+apt update
+apt upgrade cin
+# apt remove cin
+
+# MINT should use the same procedure as Ubuntu, but
+# apt-add-repository does not seem to work, so use the GUI
+# UpdateManager as follows:
+# Administration -> Software Sources -> Additional
+# Repositories -> Add a new repository
+# (Note instead of Administration, some versions of Mint GUI
+# UpdateManager might be System)
+# For Mint18, add:
+# deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/mint18 xenial main
+# For Mint19, add:
+# deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/mint19 bionic main
+# IMPORTANT NOTE: if you get "malformed input" error, you will
+# have to create a file by typing the command: sudo touch
+# /etc/apt/sources.list.d/additional-repositories.list then
+# wait 10 minutes or so and try using the Gui Update Manager
+# again.
+apt update
+apt install cin
+# to update a previous install
+apt update
+apt upgrade cin
+# apt remove cin
+
+# DEBIAN uses the same basic procedure as Ubuntu.
+# The apt-add-repository varies per system so you will have to
+# use your best judgement
+apt install software-properties-common apt-transport-https
+apt-add-repository https://cinelerra-gg.org/download/pkgs/debian8
+# OR
+# apt-add-repository https://cinelerra-gg.org/download/pkgs/debian9
+# OR
+# apt-add-repository https://cinelerra-gg.org/download/pkgs/debian10
+# VIP - for the first install, the above line adds cinelerra
+# to /etc/apt/sources.list but... Debian jessie/buster are
+# more strict for licensing so you will have to edit the file
+# /etc/apt/sources.list to add [trusted=yes] after deb and
+# before https...cin...
+# For example for debian9:
+# deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/debian9 stretch main
+# For example for debian9:
+# deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/debian10 buster main
+apt update
+apt install cin
+#to update a previous install
+apt update
+apt upgrade cin
+# apt remove cin
+
+# SUSE/LEAP/TUMBLEWEED
+# (Note: you may have to zypper libavc and libiec versions if
+# not already installed) cinelerra packages are unsigned so
+# you will have to ignore: Package is not signed!
+
+# openSUSE LEAP 15
+zypper ar -f https://cinelerra-gg.org/download/pkgs/leap15/ cingg
+zypper install -r cingg cinelerra # or cinelerra10bit for 10 bit
+# openSUSE LEAP 42
+zypper ar -f https://cinelerra-gg.org/download/pkgs/leap42/ cingg
+# as of 42.3 SUSE there is a new requirement, so you will need
+# to add:
+zypper mr -G cingg
+zypper install -r cingg cinelerra # or cinelerra10bit for 10 bit
+# openSUSE TUMBLEWEED
+zypper ar -f https://cinelerra-gg.org/download/pkgs/tweed/ cingg
+# as of 42.3 SUSE there is a new requirement,
+# so you will need to add:
+zypper mr -G cingg
+zypper install -r cingg cinelerra
+#zypper remove cinelerra
+# or cinelerra10bit for 10 bit.
+# to update a previous install
+# (assuming you enabled autorefresh as above)
+zypper refresh cingg
+zypper up cinelerra
+# or cinelerra10bit for 10 bit.
+
+# SLACKWARE
+# substitute slk32 for slk64 and i486-1 for x86_64-1
+wget -P /tmp https://cinelerra-gg.org/download/pkgs/slk64/cin-{date}-slk64-x86_64.txz
+installpkg /tmp/cin... # name you used in the above line
+#to update a previous install
+upgradepkg /tmp/cin... # name you used in the above line
+#removepkg cin
+
+# ARCH linux
+# (A loosely defined list of packages that you should install
+# first is listed in this file:
+# https://www.cinelerra-gg.org/download/pkgs/README.arch) first
+# edit the file /etc/pacman.conf, to include the following:
+[cingg]
+SigLevel = Optional TrustAll
+Server = https://cinelerra-gg.org/download/pkgs/arch
+# end of cingg
+
+# next run from a window the following 2 commands;
+pacman -Syu
+pacman -S cin
+
+# NOTE: the first line above updates your Arch system to the
+# current rolling release and the second line updates
+# Cinelerra-GG based on the rolling release that was in effect
+# on the last day of the month.
+# Please complete the 2 steps above in order, one right after
+# the other to avoid risk of a partial upgrade.
+
+# Due to the unpredictability of when Arch libraries are
+# updated, performing an install of Cinelerra at any time
+# other than shortly after the last day of the month when the
+# new build package is created, could lead to library
+# incompatibilities. In that case, please consider using the
+# Arch static tar file for installation instead. to remove a
+# previous install:
+# pacman -R cin

diff --git a/images/audio-preset02.png b/images/audio-preset02.png
index 2a2665d9e6eefa5638c39619ab53bd51e422f65e..8cd6c5cfc882fc964d021530a2e7ecaac54b9d14 100644 (file)
Binary files a/images/audio-preset02.png and b/images/audio-preset02.png differ

diff --git a/images/audio.png b/images/audio.png
index b16eed1ad11f944cfb8510a8c033c4807f8b8c82..fd711ee4c908146e6eff227d22bad1a6fd63aec9 100644 (file)
Binary files a/images/audio.png and b/images/audio.png differ

diff --git a/images/automation.png b/images/automation.png
index 842b1c11f70978816483569c4995cd66e47d0cb1..380338e964ec5f6c5fde67c43b11e762c1be1251 100644 (file)
Binary files a/images/automation.png and b/images/automation.png differ

diff --git a/images/back-ren.png b/images/back-ren.png
index a17cdf08f97864b018d1d32d756f332e7a5051bd..7f8610732dd7b7372d62f46daa31245eff80e5c3 100644 (file)
Binary files a/images/back-ren.png and b/images/back-ren.png differ

diff --git a/images/back-ren02.png b/images/back-ren02.png
index e8635934ddc31251cf90e93ccc8a8bb7825784d8..ecedf29f7436d8b08b2d8dae104115da5f8e69b9 100644 (file)
Binary files a/images/back-ren02.png and b/images/back-ren02.png differ

diff --git a/images/batch01.png b/images/batch01.png
index 7995ef567f2ae00c445577de4ba99361faaba0c9..39fe206bd3fbd812a19b4f5905f2b4adcf5a2399 100644 (file)
Binary files a/images/batch01.png and b/images/batch01.png differ

diff --git a/images/batch02.png b/images/batch02.png
index 42b7b1a5cefd5660b4f0cff82e3a574eb9cb27bf..80f23db3ee50795e287f985ba7bfe4f2751f8461 100644 (file)
Binary files a/images/batch02.png and b/images/batch02.png differ

diff --git a/images/farm.png b/images/farm.png
index e34d33200c19c40e9cda9d1f6a02b6d109adb33e..677c41f53cb78504b89ec93deb0cae9d8c61d520 100644 (file)
Binary files a/images/farm.png and b/images/farm.png differ

diff --git a/images/ff.png b/images/ff.png
index 160be4efebabd17314b6c74914eff14e87daa4cd..b2202fe55e63ba1947e56aaa21dcffcdf74828f7 100644 (file)
Binary files a/images/ff.png and b/images/ff.png differ

diff --git a/images/parameters.png b/images/parameters.png
index 60544a8764df2868a908689bed3bf85790a4dc58..2efa7df2a4169db594ab8146053e62f9ebb5cdff 100644 (file)
Binary files a/images/parameters.png and b/images/parameters.png differ

diff --git a/images/render.png b/images/render.png
index 6b53f1104f792c5c2e641eecfce4d8f276325466..7d31960e0b873fe36238a0ec0505ba9ab1aa580e 100644 (file)
Binary files a/images/render.png and b/images/render.png differ

diff --git a/images/render01.png b/images/render01.png
index 444a33c34e17765b71520c2307ebd079d3584ced..9faeb76d00fa67e41bbc4e909debc8a438473722 100644 (file)
Binary files a/images/render01.png and b/images/render01.png differ

diff --git a/images/render02.png b/images/render02.png
index 1c67e363d71d9fb20e16e73cc0b379e82d34861e..597a329521e9dc66788666419adbcf40b08c1ae6 100644 (file)
Binary files a/images/render02.png and b/images/render02.png differ

diff --git a/images/speed.png b/images/speed.png
index d309d8b5729b68d6281bbd3142f45f568953aa9e..520b51056f97bd8314e3a2171686f3793cf12b5f 100644 (file)
Binary files a/images/speed.png and b/images/speed.png differ

diff --git a/images/star.png b/images/star.png
new file mode 100644 (file)
index 0000000..96c42e3
Binary files /dev/null and b/images/star.png differ

diff --git a/images/video-preset.png b/images/video-preset.png
index 0283ba1b9fe6c5c8887eba0e3d7563bda887feb6..700c1c4768f2ed3e37bf2ac78425d60e81f5791f 100644 (file)
Binary files a/images/video-preset.png and b/images/video-preset.png differ

diff --git a/images/yuv420.png b/images/yuv420.png
index 680940e3a29d26ec0e648af49a8f4796eab54cfd..675642972f952f4fe2f3ededaba113adf765a2a2 100644 (file)
Binary files a/images/yuv420.png and b/images/yuv420.png differ

diff --git a/parts/FFmpeg.tex b/parts/FFmpeg.tex
index 5a0ce7d5e73c67c38f940ef7e055c922b2cdc5ed..f9c6269562dc5cc0a9b3eee2cfd83665432b702e 100644 (file)
--- a/parts/FFmpeg.tex
+++ b/parts/FFmpeg.tex
@@ -6,27 +6,27 @@
 \section{FFmpeg Early Probe Explanation}%
 \label{sec:ffmpeg_early_probe_explanation}
 
-When you open media, a series of libraries and codec functions are used to \textit{probe} the data, to see if it can determine the type of file format and codec parameters needed to correctly decode the file.  If ffmpeg probes early -- \textit{Try FFMpeg first} is in effect for the FF button -- it will usually find some way to try to decode just about any contemporary media file.  But there are some times that the built in codecs are actually a better choice.  A lot of this may fall into the category of personal preference.  For example, some may prefer the mpeg library in the \CGG{} code over the ffmpeg code because it has more decoding capability and seems to be more robust when the media is damaged.  In that case you will want the FF button to read \textit{Try FFMpeg last}.
+When you open media, a series of libraries and codec functions are used to \textit{probe} the data, to see if it can determine the type of file format and codec parameters needed to correctly decode the file.  If ffmpeg probes early -- \textit{Try FFMpeg first} is in effect for the FF button (green icon) -- it will usually find some way to try to decode just about any contemporary media file.  But there are some times that the built in codecs are actually a better choice.  A lot of this may fall into the category of personal preference.  For example, some may prefer the mpeg library in the \CGG{} code over the ffmpeg code because it has more decoding capability and seems to be more robust when the media is damaged.  In that case you will want the FF button to read \textit{Try FFMpeg last}.
 
 To summarize, if ffmpeg probes early, you will never get to use the built in libraries, and if you want to skip over buggy old libraries, use ffmpeg early probe enabled so that the newest code will be tried first.
-The FF button is located in the upper right hand corner of the main window.
+The green icon is located in the upper right hand corner of the main window.
 
-When the icon is red, ffmpeg probes early is enabled and you will see it reads
- \textit{Currently: Try FFMpeg first} when moving over the FF button in the upper 
-right hand corner of the screen.  When the icon is black, ffmpeg probes early is disabled so that 
+When the icon is green, ffmpeg probes early is enabled and you will see it reads
+ \textit{Currently: Try FFMpeg first} when moving over the icon button in the upper 
+right hand corner of the screen.  When the icon is capital "C", ffmpeg probes early is disabled so that 
 ffmpeg probes late and it reads \textit{Currently: Try FFMpeg last}.  The initial default state of 
 the icon is on, that is, ffmpeg probes first. Suggestion is to leave it on except in a few special 
-cases where it may be better to have early probes disabled.  When you mouse over the main menu FF 
+cases where it may be better to have early probes disabled.  When you mouse over the main menu icon 
 toggle button, the text displays ffmpeg's \textit{Currently} set position.  Just left mouse click to change to the other setting.
 The ffmpeg early probe state is saved between sessions and is also affected by choices made in Probe Order (refer to section~\ref{sub:probe_order_loading_media}). It is important to note that the various file indexes may need to be rebuilt if you change which codec is being used to decode the file.  There is a warning popup to remind you when you change the default ffmpeg early probe state (unless you have checked the box to no longer show the warning).  You can easily rebuild the index for a specific media file by going to the Resources window, right mouse click on that media, and choose \texttt{Rebuild Index} from the popup choices.
 
-Figure~\ref{fig:ff} shows (1) reddish colored FF in upper right hand corner of main window indicating
-that ffmpeg early probes is enabled; (2) \textit{Try FFMpeg last}  indicator message for ffmpeg early probes enabled (note that the color is different because you highlighted the icon); and (3) black colored FF indicates ffmpeg will be used last and you are changing the behavior so that \CGG{} warns you accordingly.
+Figure~\ref{fig:ff} shows (1) greenish colored icon in upper right hand corner of main window indicating
+that ffmpeg early probes is enabled; (2) \textit{Try FFMpeg last}  indicator message for ffmpeg early probes enabled (note that the icon is different because you highlighted the icon); and (3) "C"  icon indicates ffmpeg will be used last and you are changing the behavior so that \CGG{} warns you accordingly.
 
 \begin{figure}[htpb]
     \centering
-    \includegraphics[width=0.7\linewidth]{ff.png}
-    \caption{The three colors of \textit{Probe}}
+    \includegraphics[width=0.9\linewidth]{ff.png}
+    \caption{The three icons of \textit{FF Probe}}
     \label{fig:ff}
 \end{figure}
 
@@ -272,8 +272,8 @@ Then to use and to get 10 bit depth and preserve depth from decode to encode:
     \item check OK, and watch for messages in the terminal window
 \end{enumerate}
 
-\subsection{Viewing \& Modifying FFmpeg Format Options inside \CGG{}}%
-\label{sub:viewing_modifying_ffmpeg_cinelerra}
+\subsection{Modifying FFmpeg Format Options inside \CGG{}}%
+\label{sub:modifying_ffmpeg_cinelerra}
 
 There are thousands of options for using ffmpeg.  Now it is possible to \textit{view} the available options for a particular video and audio choice by using the \textit{wrench icon} and then clicking on the \textit{view} box.  FFmpeg has to be the selected file format for this feature to be visible.  It makes it a lot easier since only the applicable options show up as opposed to everything that ffmpeg can do.  These options are just \textit{Hints} and some may be missing due to the way that ffmpeg options are coded -- \CGG{} shows the option data ffmpeg has exposed.
 
@@ -294,21 +294,23 @@ shown on the top line of the Options window.
 
 Parameters exist in 3 layers: ffmpeg, codec, and an interface layer.  You can apply parameters to each layer.  The top 2 layers are accessed with the Kind popup menu. The ffmpeg layer is topmost, and is selected as Kind: ffmpeg.  It can specify many of the more common parameters, such as the bitrate, quality, and so on.  The middle layer is selected as Kind: codec.  These options can specialize your choices, and frequently includes presets and profiles useful for coding well known parameter sets, like \textit{profile=high422}, \textit{preset=medium}, or \textit{tune=film}, etc.   The interface layer may or may not be available.  It is usually accessible only by an \textit{opts} parameter, like \texttt{x264-params key=value:key=value}:\dots  These options are passed directly to the low level codec library.
 
-Figure~\ref{fig:video-preset} shows \textit{ffmpeg} video as the Kind. Note the x264opts (should actually be x264-params now) in the Video Preset window immediately below.
+With the \textit{format} button we can access further parameters, called \textit{Private Options}. A window opens that contains a new view button. More details in the section: \nameref{sub:extra_cin_option_ffmpeg}
+
+Figure~\ref{fig:video-preset} shows \textit{ffmpeg} video as the Kind. Note the x264opts (should actually be x264-params now) in the Video Preset window immediately below. There is also the \textit{format} window with private options.
 
 \begin{figure}[htpb]
     \centering
-    \includegraphics[width=0.8\linewidth]{video-preset.png}
-    \caption{FFmpeg wrench, video preset and view options}
+    \includegraphics[width=1.0\linewidth]{video-preset.png}
+    \caption{FFmpeg wrench, video preset, view and format options}
     \label{fig:video-preset}
 \end{figure}
 
-Figure~\ref{fig:audio-preset02} shows \textit{ffmpeg} video for the Kind. Note the yellow tooltip in the lower right hand corner describing the highlighted option.  Also note the allowed \textit{Range} values above the box provided for keyins.
+Figure~\ref{fig:audio-preset02} shows \textit{ffmpeg} video for the Kind. Note the yellow tooltip in the lower right hand corner describing the highlighted option.  Also note the allowed \textit{Range} values above the box provided for keyins. There is also the \textit{format} window with private options.
 
 \begin{figure}[htpb]
     \centering
-    \includegraphics[width=0.8\linewidth]{audio-preset02.png}
-    \caption{FFmpeg wrench, audio preset and view options}
+    \includegraphics[width=1.0\linewidth]{audio-preset02.png}
+    \caption{FFmpeg wrench, audio preset, view and format options}
     \label{fig:audio-preset02}
 \end{figure}
 

diff --git a/parts/Installation.tex b/parts/Installation.tex
index 09d83c6f239dacab0a6a9b35383bac516fa9b3be..325cf900b147d292954a7cc4273eab032024f82e 100644 (file)
--- a/parts/Installation.tex
+++ b/parts/Installation.tex
@@ -18,11 +18,6 @@ have been made) available at the link below.
   \href{https://cinelerra-gg.org/download/}{https://cinelerra-gg.org/download/}
 \end{center}
 
-Because there are many references to "git" in this section, it is
-assumed that the user is somewhat familiar with its use.  Because
-"git" has more than 130 commands and is Open Source, it is well
-documented so for problems in usage, please refer to those.
-
 There are 2 kinds of builds, the default system-build and a
 single-user build.  A system build has results which are installed
 to the system.  The majority of the files are installed in the
@@ -122,6 +117,12 @@ grep "\*\*\*.*error" -ai log
 \begin{lstlisting}[style=sh]
 make install
 \end{lstlisting}
+Where <os> represents the Operating System supported by \CGG{}, such
+as centos, fedora, suse, ubuntu, mint, debian.
+The ``with-single-user'' parameter makes it so.
+% Make and log build (
+Check for errors before proceeding.
+
 
 \item If it all worked, you are all setup. Just click on the \CGG{}
   desktop icon.
@@ -173,6 +174,12 @@ The ``with-single-user'' parameter makes it so.
 Check for errors before proceeding.
 
 
+Then just start the application by keying in: \texttt{./cin} in the
+bin subdirectory OR add a desktop icon by using the appropriate
+directory to copy the files to, run as \textbf{root}, and edit to
+correct the directory path.  Below are generic directions of how to
+do this.
+
 Then just start the application by keying in: \texttt{./cin} in the
 bin subdirectory OR add a desktop icon by using the appropriate
 directory to copy the files to, run as \textbf{root}, and edit to
@@ -630,328 +637,225 @@ file in the \texttt{download} directory with instructions so you
 can \textit{cut and paste} and avoid typos; it is also shown
 next.
 
-% FIXME (!) It doesn't work that way. The text is set as it is
-% written.
-% \begin{lstlisting}[style=sh]
-{\tiny
-\begin{verbatim}
-Depending on the distro, use the instructions below and select the appropriate
-setup operations to install, update or remove cinelerr-gg infinity.  (02/05/2020)
-To upgrade, refresh repo, then replace "install" with "update", or whatever.
-
-Email problems to cin@lists.cinelerra-gg.org
-If repository problems, usually you can manually do an install by using:
- UBUNTU, MINT, DEBIAN
-  wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.deb
-  and install it manually: dpkg -i cin_5.1.{substitute_filename}.deb
- ARCH
-  wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.pkg.tar.xz
-  and install it manually: pacman -U cin_5.1.{substitute_filename}.pkg.tar.xz
- FEDORA
-  wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.rpm
-  and install it manually: dnf install cin_5.1.{substitute_filename}.rpm
- LEAP, SUSE
-  wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.rpm
-  and install it manually: zypper install cin_5.1.{substitute_filename}.rpm
- CENTOS
-  wget https://cinelerra-gg.org/download/pkgs/{substitute_name}/cin_5.1.<sub_name>.rpm
-  and install it manually: yum localinstall cin_5.1.{substitute_filename}.rpm
-
-# GENTOO - there are static and dynamic tarballs for Base Release 2.6
-  https://cinelerra-gg.org/download/tars/cinelerra-5.1-gentoo-20200202.x86_64-static.txz
-  https://cinelerra-gg.org/download/tars/cinelerra-5.1-gentoo-20200202.x86_64.txz
-  download one of the above and then refer to README.txt
-
-# FREEBSD - there is a tarball based on FreeBSD version 12.1 at
-  https://cinelerra-gg.org/download/testing/bsdcin.tar.xz
-  download the above and then refer to README.txt
-
-# FEDORA
-# Replace the XX in fedoraXX in the next line with your current O/S version number
-dnf install cinelerra --nogpgcheck --repofrompath cingg,https://cinelerra-gg.org/download/pkgs/fedoraXX/
-# dnf erase cinelerra
-
-# CENTOS
-# Python 2 has been updated for other distros to Python 3 so you might have to create a soft link
-#   to get the correct version.  For help, send email to cin@lists.cinelerra-gg.org
-# first create the file /etc/yum.repos.d/cin_gg, with the following contents:
-[cin_gg]
-name=cingg
-baseurl=https://cinelerra-gg.org/download/pkgs/centos7
-gpgcheck=0
-# end of cin_gg
-yum install cinelerra
-# yum erase cinelerra
-
-# UBUNTU, replace ub14 with your distro id: ub16,ub18
-#  Some ubuntu apt downloads register status as working 0% constantly while running the package
-#   download, like ubuntu 14.  It may take a few minutes for this step so be patient.
-apt install software-properties-common apt-transport-https
-apt-add-repository https://cinelerra-gg.org/download/pkgs/ub14
-# UBUNTU 16/18 note - This has been known to work, but things change quickly:
-# VIP - for the first install, the above line adds \CGG{} to /etc/apt/sources.list but...
-# Version 16/18 of Ubuntu are more strict for licensing so you will have to edit
-#  the file /etc/apt/sources.list to add [trusted=yes] after deb and before https...cin...
-# For example the line should be: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/ub16 xenial main
-#   Or for ub18: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/ub18 bionic main
-# Also, on the install you will get an error message that you can either ignore as \CGG{}
-#  will run anyway, or else (the first time only) on the commnand line keyin:
-#  echo > /etc/sysctl.d/50-cin.conf "kernel.shmmax=0x7fffffff"
-apt update
-apt install cin
-#to update a previous install (ignore any i386 errors as only 64 bit version available):
-apt update
-apt upgrade cin
-##apt remove cin
-
-# MINT should use the same procedure as Ubuntu, but apt-add-repository does not seem to work,
-#  so use the GUI UpdateManager as follows:
-#  Administration->Software Sources->Additional Repositories->Add a new repository
-#    (Note instead of Administration, some versions of Mint GUI UpdateManager might be System)
-#  For Mint18,add: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/mint18 xenial main
-#  For Mint19,add: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/mint19 bionic main
-# IMPORTANT NOTE: if you get "malformed input" error, you will have to create a file
-#    by typing the command: sudo touch /etc/apt/sources.list.d/additional-repositories.list
-#    then wait 10 minutes or so and try using the Gui Update Manager again.
-apt update
-apt install cin
-#to update a previous install
-apt update
-apt upgrade cin
-##apt remove cin
-
-# DEBIAN uses the same basic procedure as Ubuntu.
-#  The apt-add-repository varies per system so you will have to use your best judgement
-apt install software-properties-common apt-transport-https
-apt-add-repository https://cinelerra-gg.org/download/pkgs/debian8
-OR apt-add-repository https://cinelerra-gg.org/download/pkgs/debian9
-OR apt-add-repository https://cinelerra-gg.org/download/pkgs/debian10
-# VIP - for the first install, the above line adds cinelerra to /etc/apt/sources.list but...
-# Debian stretch/jessie/buster are more strict for licensing so you will have to edit
-#  the file /etc/apt/sources.list to add [trusted=yes] after deb and before https...cin...
-# For example for debian8: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/debian8 jessie main
-# For example for debian9: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/debian9 stretch main
-# For example for debian10: deb [trusted=yes] https://cinelerra-gg.org/download/pkgs/debian10 buster main
-apt update
-apt install cin
-#to update a previous install
-apt update
-apt upgrade cin
-##apt remove cin
-
-# SUSE/LEAP/TUMBLEWEED
-# (Note: you may have to zypper libavc and libiec versions if not already installed)
-# cinelerra packages are unsigned so you will have to ignore: Package is not signed!
-# openSUSE LEAP 15
-zypper ar -f https://cinelerra-gg.org/download/pkgs/leap15/ cingg
-zypper install -r cingg cinelerra   # or cinelerra10bit for 10 bit
-# openSUSE LEAP 42
-zypper ar -f https://cinelerra-gg.org/download/pkgs/leap42/ cingg
-# as of 42.3 SUSE there is a new requirement, so you will need to add:
-zypper mr -G cingg
-zypper install -r cingg cinelerra   # or cinelerra10bit for 10 bit
-# openSUSE TUMBLEWEED
-zypper ar -f https://cinelerra-gg.org/download/pkgs/tweed/ cingg
-# as of 42.3 SUSE there is a new requirement, so you will need to add:
-zypper mr -G cingg
-zypper install -r cingg cinelerra
-##zypper remove cinelerra          # or cinelerra10bit for 10 bit
-#to update a previous install (assuming you enabled autorefresh as above)
-zypper refresh cingg
-zypper up cinelerra  # or cinelerra10bit for 10 bit
-
-# SLACKWARE, substitute slk32 for slk64 and i486-1 for x86_64-1
-wget -P /tmp https://cinelerra-gg.org/download/pkgs/slk64/cin-{date}-slk64-x86_64.txz
-installpkg /tmp/cin...    # name you used in the above line
-#to update a previous install
-upgradepkg /tmp/cin...    # name you used in the above line
-##removepkg cin
-
-# ARCH linux
-#  (A loosely defined list of packages that you should install first is listed in this file:
-#   https://www.cinelerra-gg.org/download/pkgs/README.arch   )
-# first edit the file /etc/pacman.conf, to include the following:
-[cingg]
-SigLevel = Optional TrustAll
-Server = https://cinelerra-gg.org/download/pkgs/arch
-# end of cingg
-#
-# next run from a window the following 2 commands;
-pacman -Syu
-pacman -S cin
-# NOTE: the first line above updates your Arch system to the current rolling release and the second
-#  line updates \CGG{} based on the rolling release that was in effect on the last day of the month.
-#  Please complete the 2 steps above in order, one right after the other to avoid risk of a partial upgrade.
-#  Due to the unpredictability of when Arch libraries are updated, performing an install of \CGG{} at
-#  any time other than shortly after the last day of the month when the new build package is created,
-#  could lead to library incompatibilities.  In that case, please consider using the Arch static tar file
-#  for installation instead.
-#to remove a previous install
-##pacman -R cin
-\end{verbatim}
-}
-% \end{lstlisting}
+\lstset{inputpath=extra/}
+\lstinputlisting[
+style=nil,
+basicstyle=\footnotesize,
+caption={README.pkgs}
+]{README.pkgs}
 
 \section{Windows 10 with Cygwin for \CGG{} Limited}%
 \label{sec:ms_windows10}
 
-To run \CGG{} on a Windows 10 computer, you will need to have Cygwin installed on your system, 
-along with the  \CGG{} static tar and a patched library: libxbc.  This setup has been tested 
-with Windows 10, version 1909, on an HP EliteBook 820 at 2.3 GHz.
-
-This limited version provides \textit{core} functionality at this time with the standard Windows FFmpeg
-executable, meaning that specific modifications in FFmpeg needed for \CGG{} are not available. 
-Limited capabilities include only a few render output formats available - for example \textit{mov}, \textit{qt} 
-as \textit{mjpeg}, and \textit{mpeg} for videos and \textit{avi} and \textit{qt} as \textit{s16le} 
-for audio, but not \textit{mkv} or \textit{mp4}.  
-This is due to the fact that several codec and utility libraries are not currently compiled to 
-work with Windows.
+To run \CGG{} on a Windows 10 computer, you will need to have
+Cygwin installed on your system, along with the \CGG{} static tar
+and a patched library: libxbc.  This setup has been tested with
+Windows 10, version 1909, on an HP EliteBook 820 at 2.3 GHz.
+
+This limited version provides \textit{core} functionality at this
+time with the standard Windows FFmpeg executable, meaning that
+specific modifications in FFmpeg needed for \CGG{} are not
+available.  Limited capabilities include only a few render output
+formats available - for example \textit{mov}, \textit{qt} as
+\textit{mjpeg}, and \textit{mpeg} for videos and \textit{avi} and
+\textit{qt} as \textit{s16le} for audio, but not \textit{mkv} or
+\textit{mp4}.  This is due to the fact that several codec and
+utility libraries are not currently compiled to work with Windows.
 
 \subsection*{Installing Cygwin}
 \label{sec:installing_cygwin}
 
-Cygwin is an environment that runs natively on Windows which allows Unix programs to be compiled 
-and run on Windows.  With cygwin installed on your Windows 10 computer, you will be able to run 
-\CGG{}.  Before installing cygwin, you need to be warned that the Avast anti-virus software 
-kills files necessary for cygwin installation and execution, so you will have to remove it and 
-use alternative anti-virus software (the standard default already included with Windows 10 
-is Defender). Below are the steps for installation:
+Cygwin is an environment that runs natively on Windows which
+allows Unix programs to be compiled and run on Windows.  With
+cygwin installed on your Windows 10 computer, you will be able to
+run \CGG{}.  Before installing cygwin, you need to be warned that
+the Avast anti-virus software kills files necessary for cygwin
+installation and execution, so you will have to remove it and use
+alternative anti-virus software (the standard default already
+included with Windows 10 is Defender). Below are the steps for
+installation:
 
 \begin{enumerate}
-       \item Download cygwin for your 64-bit computer at: {\small \url{https://www.cygwin.com/}}
-       \item Generally just take the defaults as they show up, but the next steps show what comes up.
-       \item When a warning window pops up, click \textit{Yes}.
-       \item Click \textit{Next}.
-       \item Choose \textit{Install from Internet} option and then click \textit{Next}.
-       \item Choose your desired directory by clicking on Browse button. Choose \textit{All Users (Recommended)} and then click \textit{Next}.
-       \item Choose the local package directory where you would like your installation files to be placed. Click \textit{Next}.
-       \item Choose \textit{Direct Connection} if you are using Internet with plug and play device. Click \textit{Next}.
-       \item Choose any download site preferably ``cygwin.mirror.constant.com'' and then click \textit{Next}.
-       \item For list of things to install, leave all set to \textit{Default} except these to \textit{Install} instead:
-
-\begin{tabular}{ll}
-       base& devel\\
-       gnome& graphics\\
-       system& video\\
-       X11 \\
-\end{tabular}
-
-     This install takes a long time; approximately 2 hours on an EliteBook and requires approximately 20GB storage.
-       \item Finally you will want to have the icons on your desktop (already default) and then click \textit{Finish}.
+\item Download cygwin for your 64-bit computer at:
+  \href{https://www.cygwin.com/}{https://www.cygwin.com/}
+
+\item Generally just take the defaults as they show up, but the
+  next steps show what comes up.
+
+\item When a warning window pops up, click \textit{Yes}.
+
+\item Click \textit{Next}.
+
+\item Choose \textit{Install from Internet} option and then click
+  \textit{Next}.
+
+\item Choose your desired directory by clicking on Browse
+  button. Choose \textit{All Users (Recommended)} and then click
+  \textit{Next}.
+
+\item Choose the local package directory where you would like your
+  installation files to be placed. Click \textit{Next}.
+
+\item Choose \textit{Direct Connection} if you are using Internet
+  with plug and play device. Click \textit{Next}.
+
+\item Choose any download site preferably
+  ``cygwin.mirror.constant.com'' and then click \textit{Next}.
+
+\item For list of things to install, leave all set to
+  \textit{Default} except these to \textit{Install} instead:
+
+  \begin{tabular}{ll}
+    base& devel\\
+    gnome& graphics\\
+    system& video\\
+    X11
+  \end{tabular}
+
+  This install takes a long time; approximately 2 hours on an
+  EliteBook and requires approximately 20GB storage.
+
+\item Finally you will want to have the icons on your desktop
+  (already default) and then click \textit{Finish}.
 \end{enumerate}
 
-Then to install the \CGG{} tar files, you will need to start a cygwin console terminal from the startup menu as shown here:
-       \texttt{Start $\rightarrow$ Cygwin $\rightarrow$ Cygwin64} Terminal
+Then to install the \CGG{} tar files, you will need to start a
+cygwin console terminal from the startup menu as shown here:
+\texttt{Start $\rightarrow$ Cygwin $\rightarrow$ Cygwin64}
+Terminal
 
 \subsection*{Installing \CGG{}}
 \label{sec:installing_cinelerra}
 
 \begin{enumerate}
-       \item Download the tar file at:\\
-        {\small \url{https://cinelerra-gg.org/download/testing/libxcb-bld.tar.bz2}}
-       \item Install libxbc from the tar file -- installs into \texttt{/usr/local} and requires approximately 21MB storage.
+\item Download the tar file
+  \href{https://cinelerra-gg.org/download/testing/libxcb-bld.tar.bz2}{libxcb-bld.tar.bz2}.
+
+\item Install libxbc from the tar file -- installs into
+  \texttt{/usr/local} and requires approximately 21MB storage.
 \begin{lstlisting}[style=sh]
-       $ tar -C /usr/local -xJf /path/libxcb-bld.tar.bz2
+tar -C /usr/local -xJf /path/libxcb-bld.tar.bz2
 \end{lstlisting}
-The libxcb path repairs an error (XIOError), which stops Cinelerra.
-       \item Download the tar file at:\\
-       {\small \url{https://cinelerra-gg.org/download/testing/cygcin-bld.tar.bz2}}     
-       \item Install cygcin from the tar file - this installs into home directory.  Note this is cygcin NOT cygwin. You must change the \texttt{path} below to the name of the path where you downloaded the tar file.
+  The libxcb path repairs an error (XIOError), which stops
+  Cinelerra.
+
+\item Download the tar file
+  \href{https://cinelerra-gg.org/download/testing/cygcin-bld.tar.bz2}{cygcin-bld.tar.bz2}.
+
+\item Install cygcin from the tar file - this installs into home
+  directory.  Note this is cygcin \emph{not} cygwin. You must change the
+  \texttt{path} below to the name of the path where you downloaded
+  the tar file.
 \begin{lstlisting}[style=sh]
-       $ cd
-       $ tar -xJf /path/cygcin-bld.tar.bz2
+cd
+tar -xJf /path/cygcin-bld.tar.bz2
 \end{lstlisting}
 \end{enumerate}
-This creates \texttt{\~{}/cygcin} , a user build installation of \CGG{} and requires approximately 400MB storage.
+
+This creates \texttt{\~{}/cygcin}, a user build installation of
+\CGG{} and requires approximately 400MB storage.
 
 \underline{Running \CGG{}:}
 
 You will need to start a cygwin desktop from the startup menu:
 \begin{enumerate}
-       \item \texttt{Start$\rightarrow$ Cygwin-X $\rightarrow$ Openbox}
+\item \texttt{Start$\rightarrow$ Cygwin-X $\rightarrow$ Openbox}
+
+  You should start a console controlling terminal so that you can
+  see program logging.
 
-You should start a console controlling terminal so that you can see program logging.
-       \item \texttt{Start$\rightarrow$ Cygwin $\rightarrow$ Cygwin64} Terminal
+\item \texttt{Start$\rightarrow$ Cygwin $\rightarrow$ Cygwin64} Terminal
 
-This opens a separate window that can survive a cygwin hang and bugs. Without these logs, it is much more difficult to use.
+  This opens a separate window that can survive a cygwin hang and
+  bugs. Without these logs, it is much more difficult to use.
 
-       \item Type into that console controlling window, the following:
+\item Type into that console controlling window, the following:
 \begin{lstlisting}[style=sh]
-       $ export DISPLAY=:0.0
+export DISPLAY=:0.0
 \end{lstlisting}
-       \item Change directories to where \CGG{} is installed:
+
+\item Change directories to where \CGG{} is installed:
 \begin{lstlisting}[style=sh]
-       $ cd /path/cygcin    (NOT cygwin)
+cd /path/cygcin    (NOT cygwin)
 \end{lstlisting}
-       \item Finally keyin:
+
+\item Finally keyin:
 \begin{lstlisting}[style=sh]
-       $ ./cin
+./cin
 \end{lstlisting}
-which starts up your 4 \CGG{} windows.
+  which starts up your 4 \CGG{} windows.
 \end{enumerate}
 
-The most noticeable difference from the Linux versions is that \CGG{} seems to run 
-very slowly on Windows 10. You must be very tolerant and patient to see this work.  
-It can however exhibit astonishing speed when encoding.  \CGG{} has to be downgraded significantly due to lack of supported interfaces, codecs (for example h264/h265), and utilities.  
-The only graphics driver is X11 and the only sound driver is pulseaudio.  Almost all configurable
-omissions are applied to this build.  
+The most noticeable difference from the Linux versions is that
+\CGG{} seems to run very slowly on Windows 10. You must be very
+tolerant and patient to see this work.  It can however exhibit
+astonishing speed when encoding.  \CGG{} has to be downgraded
+significantly due to lack of supported interfaces, codecs (for
+example h264/h265), and utilities.  The only graphics driver is
+X11 and the only sound driver is pulseaudio.  Almost all
+configurable omissions are applied to this build.
 
 \underline{\CGG{} build on cygwin from source code:}
 
 \begin{enumerate}
-       \item Download and install ffmpeg into /usr/local :
+\item Download and install ffmpeg into /usr/local :
 
-       download ffmpeg (currently 4.2.2)
+  download ffmpeg (currently 4.2.2)
 \begin{lstlisting}[style=sh]
-       $ cd /tmp
-       $ tar -xJf /path/ffmpeg-4.2.2.tar.bz2
-       $ cd ffmpeg-4.2.2
-       $ ./configure
-       $ make -j
-       $ make install
+cd /tmp
+tar -xJf /path/ffmpeg-4.2.2.tar.bz2
+cd ffmpeg-4.2.2
+./configure
+make -j
+make install
 \end{lstlisting}
-       \item Download and install a patched libxcb:
+
+\item Download and install a patched libxcb:
 \begin{lstlisting}[style=sh]
-       $ cd /tmp
-       $ rm -rf libxcb-1.13/
-       $ tar -xf /path/libxcb-1.13.tar.bz2
-       $ cd libxcb-1.13/
-       $ patch -p1 < /path/cinelerra-5.1/thirdparty/src/libxcb.patch1
-          patching file configure.ac
-          patching file src/xcb_in.c
-       $ ./autogen.sh
-       $ ./configure
-       $ make -j
-       $ make install
+cd /tmp
+rm -rf libxcb-1.13/
+tar -xf /path/libxcb-1.13.tar.bz2
+cd libxcb-1.13/
+patch -p1 < /path/cinelerra-5.1/thirdparty/src/libxcb.patch1
+   patching file configure.ac
+   patching file src/xcb_in.c
+./autogen.sh
+./configure
+make -j
+make install
 \end{lstlisting}
-       \item Download cinelerra-gg:
+\item Download cinelerra-gg:
 \begin{lstlisting}[style=sh]
-       $ cd /build_path/
-       $ git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git"
-       $ cd cinelerra-gg/cinelerra-5.1
+cd /build_path/
+git clone "git://git.cinelerra-gg.org/goodguy/cinelerra.git"
+cd cinelerra-gg/cinelerra-5.1
 \end{lstlisting}
-       \item Apply cygwin patch:
+\item Apply cygwin patch:
 \begin{lstlisting}[style=sh]
-       $ patch -p2 < blds/cygwin.patch
+patch -p2 < blds/cygwin.patch
 \end{lstlisting}
-       \item Run the build with:
+\item Run the build with:
 \begin{lstlisting}[style=sh]
-       $ ./blds/cygwin.bld
+./blds/cygwin.bld
 \end{lstlisting}
 \end{enumerate}
 
-This produces a directory: $/build\_path$/cinelerra-gg$/cinelerra$-5.1/bin
+This produces a directory: /build\_path/cinelerra-gg/cinelerra-5.1/bin
 which is used to create the cygcin archive.
 
 Currently, the targets are not stripped and can be run from gdb.
 There is only very limited signal handler dmp file support.
-Running gdb from inside a desktop resident console (not a cygwin64 window) will hang cygwin (and cin) when it hits a breakpoint.  You must run from an external console window to avoid this issue.
+Running gdb from inside a desktop resident console (not a cygwin64
+window) will hang cygwin (and cin) when it hits a breakpoint.  You
+must run from an external console window to avoid this issue.
 
 
 \section{Distribution Systems with \CGG{} Included}%
 \label{sec:distribution_systems_with_cinelerra_included}
 
-There are also some special complete distribution systems available that include \CGG{} for audio and video production capabilities.
+There are also some special complete distribution systems
+available that include \CGG{} for audio and video production
+capabilities.
 
 \subsection{AV Linux}
 \label{sec:AV_Linux}
@@ -976,23 +880,32 @@ graphics, animations, physical computing, etc.
 Click here for the
 \href{https://gitlab.com/giuseppetorre/bodhilinuxmedia}{homepage of Bodhi Linux}.
 
--\begin{center}
--       {\small \url{https://gitlab.com/giuseppetorre/bodhilinuxmedia}}
--\end{center}   
 
 \section{Cinx and a “Bit” of Confusion}%
 \label{sec:cinx_and_a_bit_of_confusion}
 
-Cinx is the exact same program as Cin.  
-The X (x) represents the roman numeral 10 for 10-bit as opposed to 8-bit standard.  
-The third-party library used for x265 must be specially compiled with \texttt{--bit-depth=10} in order to produce 10-bit rendered output.  
-This build will not be able to output 8-bit depth which means you have to retain the Cin version also.  
-Whatever build ffmpeg is linked to will determine what bit depth it can output.  
-This is why there have to be separate builds.  
-If you install both packages, Cin and CinX, you may get \textit{file conflicts of same file name} --- just continue.
-
-Keep in mind that the regular 8-bit version works on 8-bit bytes --- the standard word size for computers, but the 10-bit version has to use 2 words to contain all 10 bits so you can expect rendering to be as much as twice as slow.  
-There is also a 12-bit version for consideration but currently the results are simply the same as 10-bit with padding to make 12-bit so it is of no value.
+Cinx is the exact same program as Cin.  The X (x) represents the
+roman numeral 10 for 10-bit as opposed to 8-bit standard.  The
+third-party library used for x265 must be specially compiled with
+\texttt{--bit-depth=10} in order to produce 10-bit rendered
+output.
+%
+This build will not be able to output 8-bit depth which means you
+have to retain the Cin version also.
+%
+Whatever build ffmpeg is linked to will determine what bit depth
+it can output.  This is why there have to be separate builds.  If
+you install both packages, Cin and CinX, you may get \textit{file
+  conflicts of same file name} --- just continue.
+
+Keep in mind that the regular 8-bit version works on 8-bit bytes
+--- the standard word size for computers, but the 10-bit version
+has to use 2 words to contain all 10 bits so you can expect
+rendering to be as much as twice as slow.
+%
+There is also a 12-bit version for consideration but currently the
+results are simply the same as 10-bit with padding to make 12-bit
+so it is of no value.
 
 
 %%% Local Variables:

diff --git a/parts/Keyframes.tex b/parts/Keyframes.tex
index a43e4e5ced7a682eadd5def891529844eb5ca44e..256f911bcfbd8ecab3ef4f967960fa5b2dc046c3 100644 (file)
--- a/parts/Keyframes.tex
+++ b/parts/Keyframes.tex
@@ -41,7 +41,7 @@ To make it easier to navigate curve keyframes, since there is not much room on t
 \begin{figure}[htpb]
     \centering
     \includegraphics[width=0.7\linewidth]{automation.png}
-    \caption{Automation zoom menu with tumbler}
+    \caption{Automation Audio Fade menu with tumbler}
     \label{fig:automation}
 \end{figure}
 
@@ -170,8 +170,8 @@ Keyframe values can be set using the various plugin \textit{show controls} (magn
 
 \begin{figure}[htpb]
     \centering
-    \includegraphics[width=0.8\linewidth]{parameters.png}
-    \caption{Keyframe Parameters window for a Blue Banana plugin added to the video track}
+    \includegraphics[width=0.7\linewidth]{parameters.png}
+    \caption{Keyframe Parameters window for a Color 3 Way plugin added to the video track}
     \label{fig:parameters}
 \end{figure}
 

diff --git a/parts/Rendering.tex b/parts/Rendering.tex
index 1be6e02aa84a7cda10306946afa1d9ecc19b6e46..cf8ddc1b46337bb527b9842c4946e1832f11e871 100644 (file)
--- a/parts/Rendering.tex
+++ b/parts/Rendering.tex
@@ -149,7 +149,7 @@ rendering an output file, are called a batch.  This allows a large
 amount of media to be processed without user intervention.
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.8\linewidth]{batch01.png}
+  \includegraphics[width=1.0\linewidth]{batch01.png}
   \caption{Example of the Batch Render menu}
   \label{fig:batch01}
 \end{figure}
@@ -346,7 +346,7 @@ to illustrate how to take advantage of their capabilities.
 \end{description}
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.8\linewidth]{batch02.png}
+  \includegraphics[width=1.0\linewidth]{batch02.png}
   \caption{Batch render with the 4 ghosted buttons on the right side
     + the Warning message below}
   \label{fig:batch02}
@@ -372,7 +372,7 @@ the time ruler showing what has been background rendered
 (figure~\ref{fig:back-ren02}).
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.8\linewidth]{back-ren02.png}
+  \includegraphics[width=1.0\linewidth]{back-ren02.png}
   \caption{Settings Background Rendering}
   \label{fig:back-ren02}
 \end{figure}
@@ -383,7 +383,7 @@ right before the effect to preview it in real time and full frame
 rates (figure~\ref{fig:back-ren}).
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.8\linewidth]{back-ren.png}
+  \includegraphics[width=1.0\linewidth]{back-ren.png}
   \caption{Timeline with the top red bar}
   \label{fig:back-ren}
 \end{figure}
@@ -507,8 +507,8 @@ Below we describe the Performance tab for configuring a render farm
 (figure~\ref{fig:farm}).
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.8\linewidth]{farm.png}
-  \caption{Settings $\rightarrow$ Preferences, Performance tab, menu
+  \includegraphics[width=1.0\linewidth]{farm.png}
+  \caption{Settings: Preferences: Performance tab, menu
     to set up your Render Farm}
   \label{fig:farm}
 \end{figure}
@@ -1024,7 +1024,7 @@ always complete, and it may include options that are not legal with
 all parameter configurations.
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.6\linewidth]{yuv420.png}
+  \includegraphics[width=1.0\linewidth]{yuv420.png}
   \caption{Render \& Video Preset menus displaying Pixel choices}
   \label{fig:yuv420}
 \end{figure}
@@ -1074,7 +1074,7 @@ can be set with the \textit{cin\_sample\_fmt} parameter
 used.\\ Example: \textit{cin\_sample\_fmt=s16}
 
 \begin{figure}[htpb] \centering
-  \includegraphics[width=0.55\linewidth]{audio.png}
+  \includegraphics[width=0.7\linewidth]{audio.png}
   \caption{Render menu showing where Samples is}
   \label{fig:audio}
 \end{figure}

diff --git a/parts/Transition.tex b/parts/Transition.tex
index 0c4213a456242adf7e508396f745f6baea5f1542..739cb3331da6af7fcd3265f65f1b236c2b26a558 100644 (file)
--- a/parts/Transition.tex
+++ b/parts/Transition.tex
@@ -91,17 +91,46 @@ Video switches segments via a small rectangular view that gradually grows to ful
 \subsection*{Shape Wipe}%
 \label{sub:shape_wipe}
 
-Wipe a specific shape across the video. Currently available shapes are: \textit{asimetric\_clocks}, \textit{asimetric\_clocks\_2}, \textit{audio}, \textit{burst}, \textit{Butterfly},
- \textit{Cinelerra16-9-Heavy}, \textit{Cinelerra16-9-Light}, \textit{CinelerraGG}, \textit{Circle-h\_01}, \textit{Circle-h\_02}, \textit{Circle-v\_01}, \textit{Circle-v\_02},
- \textit{circle}, \textit{clock}, \textit{Clouds\_01}, \textit{Clouds\_02}, \textit{crazy\_clock}, \textit{cream}, \textit{Cross-Iris\_01}, \textit{Cross\_01},
-\textit{Diagonal-Curve}, \textit{Diagonal-Linear}, \textit{Diamond-Iris\_01}, \textit{Diamond\_01},
- \textit{Diamond\_02}, \textit{Diamond\_03}, \textit{Double-Door-h}, \textit{Double-Door-v}, \textit{film}, \textit{film2}, \textit{Gravity},
-\textit{heart}, \textit{Linear-h}, \textit{Linear-v}, \textit{mosaic}, \textit{multi\_box}, \textit{Plasma\_01}, 
- \textit{rare\_spiral}, \textit{specks}, \textit{spiral}, \textit{spiral\_clock}, \textit{square}, \textit{squares}, \textit{star}, \textit{tile2x2h}, \textit{tile2x2v}, \textit{Venetian-Blinds-h-x05},
- \textit{Venetian-Blinds-h-x10}, \textit{Venetian-Blinds-v-x05}, and \textit{Venetian-Blinds-v-x10}, \textit{water}\protect\footnote{many shapes by Igor Beg and Rafa Mar}. 
+Wipe a specific shape across the video. Currently available 51 shapes\protect\footnote{many shapes by Igor Beg and Rafa Mar} are:
+
+\begin{center}
+       \begin{longtable}{p{4cm}p{4cm}p{4cm}}
+               \label{tabular:transitions}
+               \textit{asimetric\_clocks} & \textit{asimetric\_clocks\_2} & \textit{audio} \\
+               \textit{burst} & \textit{Butterfly} & \textit{Cinelerra16-9-Heavy} \\
+               \textit{Cinelerra16-9-Light} & \textit{CinelerraGG} & \textit{Circle-h\_01} \\
+               \textit{Circle-h\_02} & \textit{Circle-v\_01} & \textit{Circle-v\_02} \\
+               \textit{circle} & \textit{clock} & \textit{Clouds\_01} \\
+               \textit{Clouds\_02} &\textit{crazy\_clock}  & \textit{cream} \\
+               \textit{Cross-Iris\_01} & \textit{Cross\_01} & \textit{Diagonal-Curve} \\
+               \textit{Diagonal-Linear} & \textit{Diamond-Iris\_01} & \textit{Diamond\_01} \\
+               \textit{Diamond\_02} & \textit{Diamond\_03} & \textit{Double-Door-h} \\
+               \textit{Double-Door-v} & \textit{film} & \textit{film2} \\
+               \textit{Gravity} & \textit{heart} & \textit{Linear-h} \\
+               \textit{Linear-v} & \textit{mosaic} & \textit{multi\_box} \\
+               \textit{Plasma\_01} & \textit{rare\_spiral} & \textit{specks} \\
+               \textit{spiral} & \textit{spiral\_clock} & \textit{square} \\
+               \textit{squares} & \textit{star} & \textit{tile2x2h} \\
+               \textit{tile2x2v} & \textit{Venetian-Blinds-h-x05} & \textit{Venetian-Blinds-h-x10} \\
+               \textit{Venetian-Blinds-v-x05} & \textit{Venetian-Blinds-v-x10} & \textit{water} \\
+\\
+               \textit{16-9\_boart} & \textit{16-9\_boxes} & \textit{16-9\_cat\_eyes} \\
+               \textit{16-9\_file\_bands} & \textit{16-9\_multi\_circle} & \textit{16-9\_multi\_spiral} \\
+               \textit{16-9\_multi\_square} & \textit{16-9\_rare\_spiral} & \textit{16-9\_rectangles} \\
+               \textit{16-9\_star} & \textit{16-9\_stars} & \textit{16-9\_wood} \\
+
+               \bottomrule
+       \end{longtable}
+\end{center}
 
 The menu for Shape Wipe that popups when you click on \textit{Show} has several possible choices.  First, the \textit{Shape} allows for choosing from the list of shapes as outlined previously either by typing in the textbox, using the down arrow, or clicking on the tumbler down/up arrows.
-Next, there is a \textit{Feather} textbox with tumbler arrows or a slider bar to easily change the blending amount.  A reset button is conveniently located to the right of the slider bar.  There is a checkbox to \textit{Preserve shape aspect ratio} and a \textit{Direction} of \textit{White to Black} or \textit{Black to White}.
+Next, there is a \textit{Feather} textbox with tumbler arrows or a slider bar to easily change the blending amount.  A reset button is conveniently located to the right of the slider bar.  There is a checkbox to \textit{Preserve shape aspect ratio} and a \textit{Direction} of \textit{White to Black} or \textit{Black to White} (figure~\ref{fig:star}).
+
+\begin{figure}[htpb] \centering
+       \includegraphics[width=0.9\linewidth]{star.png}
+       \caption{Example of the Shape Wipe $\rightarrow$ Star}
+       \label{fig:star}
+\end{figure}
 
 You can add your own images to the Shape Wipe transition and there are some free ones available to download such as under the \texttt{Video $\rightarrow$ Transitions} pulldown at {\small \url{assistcg.com}}.