From 99902723360ec767bb57a0d52a4f259be40dda63 Mon Sep 17 00:00:00 2001
From: baccala <baccala>
Date: Tue, 30 Aug 2005 01:37:46 +0000
Subject: [PATCH] updated video conversion info

---
 README     | 17 +++++++++--------
 rfbproxy.1 | 30 +++++++++++++++---------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/README b/README
index 6c76e44..e530cbe 100644
--- a/README
+++ b/README
@@ -154,11 +154,16 @@ C) Use xrfbviewer, available from www.hexonet.de.  This requires X to run,
 
 RECORDING TO VIDEO
 
-You probably need to record in shared-session mode for --export to work.
-See the comments at the beginning of rfbproxy.c to understand why.
+You probably need to record in shared-session mode for --export to
+work.  See the comments at the beginning of rfbproxy.c to understand
+why.  There are several different video codecs you can use, though I
+think mjpegtools and ffmpeg are the main ones, and many different ways
+to combine the various options.  Look at the man page and the Makefile
+for additional possibilities.
 
-To convert a recorded session to MPEG using the mjpegtools package, do
-something like (for DVD format):
+About the simplest video conversion is to convert a recorded session
+to MPEG using the mjpegtools package, doing something like (for DVD
+format):
 
 rfbproxy --export rfb.log \
 	| ppmtoy4m \
@@ -184,10 +189,6 @@ And mplex like this:
 Now you've got a DVD-compatible MPEG program stream with both video
 and audio in it.
 
-You can also convert to video using ffmpeg, which supports a broader
-range of video formats than mjpegtools.  See the Makefile for some
-targets showing possible invocation syntax.
-
 
 Have fun.
 
diff --git a/rfbproxy.1 b/rfbproxy.1
index 6ee9d96..49f85f5 100644
--- a/rfbproxy.1
+++ b/rfbproxy.1
@@ -137,14 +137,14 @@ playback often helps.  See
 below for a better solution.
 
 .TP
-.I rfbproxy -x log.fbs | ppmtoy4m | mpeg2enc -o video.mpg
+.I rfbproxy -x log.fbs | ppmtoy4m -S 420_jpeg | mpeg2enc -o video.mpg
 Convert the VNC session in
 .I log.fbs
 to MPEG-2 using
 .BR mjpegtools (1).
 
 .TP
-.I rfbproxy -x log.fbs | ppmtoy4m | ffmpeg -f yuv4mpegpipe -i - -vcodec mpeg4 video.avi
+.I rfbproxy -x log.fbs | ppmtoy4m -S 420_jpeg | ffmpeg -f yuv4mpegpipe -i - -vcodec mpeg4 video.avi
 Convert the VNC session in
 .I log.fbs
 to MPEG-4 using
@@ -179,42 +179,42 @@ vrec -s 48000 -b 16 -r audio
 .RE
 
 This one converts the recorded fbs/audio pair into a DVD-standard MPEG-2
-with MP3 audio using
+with MP2 audio using
 .BR mjpegtools (1)
 and
-.BR lame (1).
+.BR toolame (1).
 
 .RS 4
 #!/bin/sh
 .P
-rfbproxy -x fbs | ppmtoy4m | \\
+rfbproxy -x fbs | ppmtoy4m -S 420_jpeg | \\
 .br
     yuvscaler -n ntsc -O DVD | mpeg2enc -f 8 -o video.mpv
 .br
-lame -m m -x -r -s 48 -h audio audio.mp3
+toolame -m mono -s 48 audio audio.mp2
 .br
-mplex -f 8 -o video.mpg audio.mp3 video.mpv
+mplex -f 8 -o video.mpg audio.mp2 video.mpv
 .RE
 
-And this one converts the recorded fbs/audio pair into an DivX5-compatible
-MPEG-4 with MP2 audio using
+And this one converts the recorded fbs/audio pair into an DivX6-compatible
+MPEG-4 with MP3 audio using
 .BR ffmpeg (1)
 and
-.BR toolame (1).
+.BR lame (1).
 
 .RS 4
 #!/bin/sh
 .P
-toolame -m mono -s 48 audio audio.mp2
+lame -m m -x -r -s 48 -h audio audio.mp3
 .br
-rfbproxy -x fbs | ppmtoy4m | \\
+rfbproxy -x fbs | ppmtoy4m -S 420_jpeg | \\
 .br
-    ffmpeg -f yuv4mpegpipe -i - -i audio.mp2 \\
+    ffmpeg -f yuv4mpegpipe -i - -i audio.mp3 \\
 .br
-        -vcodec mpeg4 -b 800 -g 300 -bf 2 -acodec copy video.avi
+        -vcodec mpeg4 -vtag DivX -b 800 -g 300 -bf 2 -acodec copy video.avi
 .RE
 
-Both MPEG-2 and MPEG-4 files can be converted to Ogg/Vorbis:
+Both MPEG-2 and MPEG-4 files can be converted to Ogg/Vorbis with ffmpeg2theora:
 
 .RS 4
 ffmpeg2theora -o video.ogg video.avi