[Gnash-commit] [SCM] Gnash branch, master, updated. 9f661ece59ff2e829d3e953d246d6868d40e49c7

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  9f661ece59ff2e829d3e953d246d6868d40e49c7 (commit)
       via  0d701b07e0647e59cac3896357181807c33b0e04 (commit)
       via  5dce7a1b7534d9ef52078ef7324783421d810a93 (commit)
       via  283bb6a9a81bce30ba505774a758a3c5fe62f6e9 (commit)
       via  e59320176f4cb68a6a651e60113d847ca27413d1 (commit)
      from  0239341724fb9fcef4ce2f7b08a0ab257755fd9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=9f661ece59ff2e829d3e953d246d6868d40e49c7


commit 9f661ece59ff2e829d3e953d246d6868d40e49c7
Merge: 0d701b0 0239341
Author: Sandro Santilli <address@hidden>
Date:   Wed Oct 27 23:31:27 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=0d701b07e0647e59cac3896357181807c33b0e04


commit 0d701b07e0647e59cac3896357181807c33b0e04
Author: Sandro Santilli <address@hidden>
Date:   Wed Oct 27 23:31:09 2010 +0200

    Review (ffmpeg is not _required_ anymore)

diff --git a/gui/dump/README b/gui/dump/README
index 5cea5db..5bb3181 100644
--- a/gui/dump/README
+++ b/gui/dump/README
@@ -1,12 +1,12 @@
-http://www.xmission.com/~ink/gnash/README.txt:
+http://www.xmission.com/~ink/gnash/gnash-dump/README.txt:
 
 Gnash stream dumper
 ===================
 
-This is an experimental build of gnash that allows the user to dump
-both the raw (BGRA24) video stream, and the raw (PCM/Wave) audio
-stream from a movie.  The "dump gui" is disabled by default, you'd
-need to compile it with something like this:
+The application allows the user to dump both the raw (BGRA24) video
+stream, and the raw (PCM/Wave) audio stream from a movie. 
+The "dump gui" is disabled by default, you'd need to compile it with
+something like this:
 
 ./configure \
     --prefix=/usr/local/gnash-dump \
@@ -17,14 +17,11 @@ need to compile it with something like this:
     --disable-nsapi \
     --disable-menus
 
-It *requires* AGG as the renderer and *FFmpeg* as the sound driver.
-Although audio and video are separate (you can dump video, even if you
+It *requires* AGG as the renderer.
+Audio and video are separate (you can dump video, even if you
 choose gstreamer for audio output).
 
-Two new command-line parameters are available:
-
-  -A <file>         
-   Audio dump file (wave format)
+Gui-specific switches supported are:
 
   -D <file>[@<fps>]  
    Name of a file to dump video frames to.
@@ -43,6 +40,11 @@ Two new command-line parameters are available:
    to record doesn't contain proper loading code (ie: _assumes_ loads
    will happen within a given number of frames advancements).
 
+You can use the generic -A switch for dumping audio:
+
+  -A <file>         
+   Audio dump file (wave format)
+
 Once invoked, gnash will output sh-friendly information about the
 results: 
 
@@ -65,13 +67,13 @@ $ /usr/local/gnash-dump/bin/dump-gnash -D address@hidden -A 
\
 One could then play the movie with mplayer:
 
 mplayer -demuxer rawvideo \
-       -rawvideo fps=12.0482:w=550:h=400:format=bgra blah.out \
+       -rawvideo fps=12:w=550:h=400:format=bgra blah.out \
        -audiofile ./blah.wav 
 
 Or play it fullscreen, with hardware acceleration:
 
 mplayer -demuxer rawvideo \
-       -rawvideo fps=12.0482:w=550:h=400:format=bgra blah.out \
+       -rawvideo fps=12:w=550:h=400:format=bgra blah.out \
        -audiofile ./blah.wav \
        -fs \
        -vo xv

http://git.savannah.gnu.org/cgit//commit/?id=5dce7a1b7534d9ef52078ef7324783421d810a93


commit 5dce7a1b7534d9ef52078ef7324783421d810a93
Author: Sandro Santilli <address@hidden>
Date:   Wed Oct 27 23:26:39 2010 +0200

    Merge the dump readmes

diff --git a/gui/dump/README b/gui/dump/README
index 1e4a109..5cea5db 100644
--- a/gui/dump/README
+++ b/gui/dump/README
@@ -1,19 +1,32 @@
+http://www.xmission.com/~ink/gnash/README.txt:
 
-The dump-gnash utility records audio and video coming out
-from playing an SWF into a raw data for video and WAV file
-for audio.
+Gnash stream dumper
+===================
 
-Switches supported in addition to the one reported by 
-gnash --help are:
+This is an experimental build of gnash that allows the user to dump
+both the raw (BGRA24) video stream, and the raw (PCM/Wave) audio
+stream from a movie.  The "dump gui" is disabled by default, you'd
+need to compile it with something like this:
 
- -S <ms>
-   Sleep for the given amount of milliseconds for each heart-beat.
-   By default there's no sleep.
-   You may want to add some sleeping IFF the SWF file you are willing
-   to record doesn't contain proper loading code (ie: _assumes_ loads
-   will happen within a given number of frames advancements).
+./configure \
+    --prefix=/usr/local/gnash-dump \
+    --enable-renderer=agg \
+    --enable-gui=gtk,dump \
+    --enable-media=ffmpeg \
+    --disable-kparts \
+    --disable-nsapi \
+    --disable-menus
+
+It *requires* AGG as the renderer and *FFmpeg* as the sound driver.
+Although audio and video are separate (you can dump video, even if you
+choose gstreamer for audio output).
+
+Two new command-line parameters are available:
 
- -D <filename>
+  -A <file>         
+   Audio dump file (wave format)
+
+  -D <file>[@<fps>]  
    Name of a file to dump video frames to.
    By default the frequency of video frames dump is driven by
    the heart-beat (defaults to 10ms per beat [100FPS],
@@ -23,4 +36,72 @@ gnash --help are:
    would be always best to be a submultiple of SWF and video output
    FPSs. Example:
 
-    dump-gui -D address@hidden input.swf
+  -S <ms>
+   Sleep for the given amount of milliseconds for each heart-beat.
+   By default there's no sleep.
+   You may want to add some sleeping IFF the SWF file you are willing
+   to record doesn't contain proper loading code (ie: _assumes_ loads
+   will happen within a given number of frames advancements).
+
+Once invoked, gnash will output sh-friendly information about the
+results: 
+
+$ /usr/local/gnash-dump/bin/dump-gnash -D address@hidden -A \
+  blah.wav -t 85 ./sbemail45.swf
+
+  # Created 44100 16Mhz stereo wave file:
+  AUDIOFILE=blah.wav
+  # WARNING:  Gnash was told to loop the movie
+  # Gnash created a raw dump file with the following properties:
+  COLORSPACE=BGRA32
+  NAME=blah.out
+  WIDTH=550
+  HEIGHT=400
+  TIME=85.0749
+  FPS_ACTUAL=12
+  # Finished writing file
+  FRAMECOUNT=1026
+
+One could then play the movie with mplayer:
+
+mplayer -demuxer rawvideo \
+       -rawvideo fps=12.0482:w=550:h=400:format=bgra blah.out \
+       -audiofile ./blah.wav 
+
+Or play it fullscreen, with hardware acceleration:
+
+mplayer -demuxer rawvideo \
+       -rawvideo fps=12.0482:w=550:h=400:format=bgra blah.out \
+       -audiofile ./blah.wav \
+       -fs \
+       -vo xv
+
+Or, convert it to YUV:
+
+mplayer blah.out -vo yuv4mpeg:file=blah.yuv \
+       -demuxer rawvideo \
+       -rawvideo w=550:h=400:format=bgra:fps=12
+
+And then make an MPEG-4/AC3 out of it:
+
+mencoder blah.yuv -audiofile ./blah.wav \
+        -ovc lavc -oac lavc \
+        -lavcopts vcodec=mpeg4:acodec=ac3 -o blah.avi
+
+Things To Do
+============
+
+ o Investigate gstreamer for audio stream capture.
+ o Let gnash send the bitmap data to places other than a file (eg, use
+   FFmpeg to encode on-the-fly).
+ o Use FFmpeg's swscale to convert AGG's RGB-only output to YUV, which
+   could then be sent to X11's XVideo extension for hardware scaling
+   (ala Adobe's Flash 9).  This could be a raw X11-only gui, or an
+   add-on to the gtk gui -- much in the same way that X11-shm is
+   #ifdef'd right now.
+ o Let the user specify which color space/bpp from AGG they want to
+   see (RGB24, RGB16, BGRA32, etc.).
+ o Change automake to *not* include X11 libraries for the dump
+   renderer.  There is no reason that this "gui" couldn't run on a
+   headless server.
+
diff --git a/gui/dump/README.dump-gnash b/gui/dump/README.dump-gnash
deleted file mode 100644
index 49e7aa7..0000000
--- a/gui/dump/README.dump-gnash
+++ /dev/null
@@ -1,96 +0,0 @@
-http://www.xmission.com/~ink/gnash/README.txt:
-
-Gnash stream dumper
-===================
-
-This is an experimental build of gnash that allows the user to dump
-both the raw (BGRA24) video stream, and the raw (PCM/Wave) audio
-stream from a movie.  The "dump gui" is disabled by default, you'd
-need to compile it with something like this:
-
-./configure \
-    --prefix=/usr/local/gnash-dump \
-    --enable-renderer=agg \
-    --enable-gui=gtk,dump \
-    --enable-media=ffmpeg \
-    --disable-kparts \
-    --disable-nsapi \
-    --disable-menus
-
-It *requires* AGG as the renderer and *FFmpeg* as the sound driver.
-Although audio and video are separate (you can dump video, even if you
-choose gstreamer for audio output).
-
-Two new command-line parameters are available:
-
-  -A <file>     Audio dump file (wave format)
-  -D <file>     Video dump file (only valid with dump-gnash)
-
-Once invoked, gnash will output sh-friendly information about the
-results: 
-
-$ /usr/local/gnash-dump/bin/dump-gnash -D blah.out -A \
-  blah.wav -t 85 ./sbemail45.swf
-
-  # Created 44100 16Mhz stereo wave file:
-  AUDIOFILE=blah.wav
-  # WARNING:  Gnash was told to loop the movie
-  # Gnash created a raw dump file with the following properties:
-  COLORSPACE=BGRA32
-  NAME=blah.out
-  WIDTH=550
-  HEIGHT=400
-  INTERVAL=83
-  FPS_DESIRED=12.0482
-  TIME=85.0749
-  FPS_ACTUAL=12.0482
-  # Finished writing file
-  FRAMECOUNT=1026
-
-One could then play the movie with mplayer:
-
-mplayer -demuxer rawvideo \
-       -rawvideo fps=12.0482:w=550:h=400:format=bgra blah.out \
-       -audiofile ./blah.wav 
-
-Or play it fullscreen, with hardware acceleration:
-
-mplayer -demuxer rawvideo \
-       -rawvideo fps=12.0482:w=550:h=400:format=bgra blah.out \
-       -audiofile ./blah.wav \
-       -fs \
-       -vo xv
-
-Or, convert it to YUV:
-
-mplayer blah.out -vo yuv4mpeg:file=blah.yuv \
-       -demuxer rawvideo \
-       -rawvideo w=550:h=400:format=bgra:fps=12
-
-And then make an MPEG-4/AC3 out of it:
-
-mencoder blah.yuv -audiofile ./blah.wav \
-        -ovc lavc -oac lavc \
-        -lavcopts vcodec=mpeg4:acodec=ac3 -o blah.avi
-
-Things To Do
-============
-
- o Investigate gstreamer for audio stream capture.
- o Let gnash send the bitmap data to places other than a file (eg, use
-   FFmpeg to encode on-the-fly).
- o Have SDL output PCM data as fast as we can play the movie?
- o Use something other than a polling loop for driver method.
- o Use FFmpeg's swscale to convert AGG's RGB-only output to YUV, which
-   could then be sent to X11's XVideo extension for hardware scaling
-   (ala Adobe's Flash 9).  This could be a raw X11-only gui, or an
-   add-on to the gtk gui -- much in the same way that X11-shm is
-   #ifdef'd right now.
- o Let the user specify which color space/bpp from AGG they want to
-   see (RGB24, RGB16, BGRA32, etc.).
- o Remove gettimeofday calls so that it works on more operating
-   systems.
- o Change automake to *not* include X11 libraries for the dump
-   renderer.  There is no reason that this "gui" couldn't run on a
-   headless server.
-

http://git.savannah.gnu.org/cgit//commit/?id=283bb6a9a81bce30ba505774a758a3c5fe62f6e9


commit 283bb6a9a81bce30ba505774a758a3c5fe62f6e9
Author: Sandro Santilli <address@hidden>
Date:   Wed Oct 27 23:19:39 2010 +0200

    Add note about dump gui

diff --git a/NEWS b/NEWS
index e569f7b..c891552 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Improvements since 0.8.8 release are:
  * Fixed swapped _framesloaded and _framestotal properties
  * Improved ActionScript performance processing, especially
    for interactive applications.
+ * Improved dump-gui speed, sync and flexibility
 
 Gnash 0.8.8
 2010/08/17

http://git.savannah.gnu.org/cgit//commit/?id=e59320176f4cb68a6a651e60113d847ca27413d1


commit e59320176f4cb68a6a651e60113d847ca27413d1
Author: Sandro Santilli <address@hidden>
Date:   Wed Oct 27 23:19:33 2010 +0200

    Put the dump gui dox in its own dir

diff --git a/README.dump-gnash b/gui/dump/README.dump-gnash
similarity index 100%
rename from README.dump-gnash
rename to gui/dump/README.dump-gnash

-----------------------------------------------------------------------

Summary of changes:
 NEWS              |    1 +
 README.dump-gnash |   96 ----------------------------------------------
 gui/dump/README   |  109 ++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 97 insertions(+), 109 deletions(-)
 delete mode 100644 README.dump-gnash


hooks/post-receive
-- 
Gnash