media9 (20nov12)

git-svn-id: svn://tug.org/texlive/trunk@28319 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 61 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 65c5dce6542..ef7a4eecd51 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20
+	* v0.16
+	* fix: `transparent' option now working with Flash content, updated
+	StrobeMediaPlayback.swf (OSMF-2.0)
+
 2012-10-04
 	* v0.15
 	* fix: error in case of multiple use of `3Dviews' option
diff --git a/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch b/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch
index f5581f51f9d..04e48f41281 100644
--- a/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch
+++ b/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch
@@ -1,31 +1,37 @@
-######################################################################################################
-#
-# SMPfixes.patch, 20120330, Alexander Grahn
-#
-# Patch for StrobeMediaPlayback version 1.6.328 sources
-# http://sourceforge.net/projects/smp.adobe/files/
-#
-######################################################################################################
-# fix: video could not be restarted after having ended if AS variable `autoRewind' was set to `false'
-# new: show first frame of video as default poster instead of black stage
-# new: play/pause video by clicking on the stage
-######################################################################################################
---- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as.orig	2012-03-23 16:04:41.000000000 +0100
-+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as	2012-03-26 13:23:52.000000000 +0200
+--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as	2012-11-20 15:14:02.000000000 +0100
 @@ -98,6 +98,11 @@
  		override protected function onMouseClick(event:MouseEvent):void
  		{
  			var playable:PlayTrait = media.getTrait(MediaTraitType.PLAY) as PlayTrait;
-+			var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
-+			if(playable.playState == PlayState.STOPPED)
-+			{
-+				try{seekable.seek(0);}catch(e:Object){}
-+			}
++ 			var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
++ 			if(playable.playState == PlayState.STOPPED)
++ 			{
++ 				try{seekable.seek(0);}catch(e:Object){}
++ 			}
  			playable.play();
  		}
  		
---- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as.orig	2012-03-26 13:22:33.000000000 +0200
-+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as	2012-03-26 16:03:07.000000000 +0200
+@@ -134,4 +139,4 @@
+ 		/* static */
+ 		private static const VISIBILITY_DELAY:int = 500;
+ 	}
+-}
+\ No newline at end of file
++}
+--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as	2012-11-14 15:42:53.000000000 +0100
+@@ -106,7 +106,7 @@
+ 			if (_enabled && _sliding == false)
+ 			{
+ 				_sliding = true;
+-				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag);
++				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag, true);
+ 				updateFace(down);
+ 				scrubTimer.start();
+ 				dispatchEvent(new ScrubberEvent(ScrubberEvent.SCRUB_START));
+--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as	2012-11-14 15:42:53.000000000 +0100
 @@ -26,6 +26,7 @@
  	import org.osmf.traits.MediaTraitType;
  	import org.osmf.traits.PlayState;
@@ -38,28 +44,24 @@
  		override protected function onMouseClick(event:MouseEvent):void
  		{
  			var playable:PlayTrait = media.getTrait(MediaTraitType.PLAY) as PlayTrait;
-+			var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
++            var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
 +			if(playable.playState == PlayState.STOPPED)
 +			{
-+				try{seekable.seek(0);}catch(e:Object){}
++			    try{seekable.seek(0);}catch(e:Object){}
 +			}
  			playable.play();
  			event.stopImmediatePropagation();
  		}
---- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as.orig	2012-03-29 16:54:07.000000000 +0200
-+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as	2012-03-29 16:54:15.000000000 +0200
-@@ -106,7 +106,7 @@
- 			if (_enabled && _sliding == false)
- 			{
- 				_sliding = true;
--				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag);
-+				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag, true);
- 				updateFace(down);
- 				scrubTimer.start();
- 				dispatchEvent(new ScrubberEvent(ScrubberEvent.SCRUB_START));
---- ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as.orig	2012-03-23 15:44:09.000000000 +0100
-+++ ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as	2012-03-30 15:00:42.000000000 +0200
-@@ -51,6 +51,7 @@
+@@ -58,4 +64,4 @@
+ 			}
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+--- ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as	2012-11-14 15:42:54.000000000 +0100
+@@ -52,6 +52,7 @@
  	import org.osmf.traits.MediaTraitType;
  	import org.osmf.traits.PlayState;
  	import org.osmf.traits.PlayTrait;
@@ -67,15 +69,15 @@
  	import org.osmf.utils.OSMFSettings;
  	import org.osmf.utils.OSMFStrings;
  	
-@@ -151,6 +152,7 @@
+@@ -152,6 +153,7 @@
  			
  			player.addEventListener(TimeEvent.COMPLETE, onComplete);
  			player.addEventListener(MediaErrorEvent.MEDIA_ERROR, onMediaError);
 +			player.addEventListener(MediaPlayerCapabilityChangeEvent.CAN_PLAY_CHANGE, onCanPlayChange);
  			
- 			// this is used for DVR rolling window
- 			// TODO: Add this event only when the resource is DVR rolling window not all the time
-@@ -266,6 +268,8 @@
+ 			// Add DRM error handler
+ 			var drmManager:DRMManager = DRMManager.getDRMManager();
+@@ -338,6 +340,8 @@
  			mainContainer.backgroundAlpha = 0;
  			mainContainer.addEventListener(MouseEvent.DOUBLE_CLICK, onFullScreenRequest);
  			mainContainer.addEventListener(MouseEvent.CLICK, onMainClick, false);
@@ -84,7 +86,7 @@
  			mainContainer.doubleClickEnabled = true;
  			
  			addChild(mainContainer);
-@@ -343,6 +347,9 @@
+@@ -415,6 +419,9 @@
  				}
  
  				player.addEventListener(PlayEvent.PLAY_STATE_CHANGE, onSetAutoHide);
@@ -94,7 +96,7 @@
  					
  				layout();
  				
-@@ -654,6 +661,38 @@
+@@ -757,6 +764,38 @@
  			}
  		}
  		
@@ -133,7 +135,7 @@
  		/**
  		 * Toggles full screen state.
  		 */ 
-@@ -928,12 +967,20 @@
+@@ -1036,12 +1075,20 @@
  				&&	configuration.endOfVideoOverlay != ""
  				&&	player.loop == false
  				&&	player.playing == false
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index ea1b1ffcdbe..514e7ab6e89 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
diff --git a/Master/texmf-dist/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index 7aa2c518047..3ac394f8087 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -87,9 +87,11 @@ A \LaTeX{} package for embedding interactive Adobe Flash (SWF) and 3D files (Ado
 \tableofcontents
 
 \section{Introduction}
-This package provides an interface to embed interactive Flash (SWF) and 3D objects (Adobe U3D \& PRC) as well as video and sound files or streams in the popular MP4, FLV and MP3 formats into PDF documents. Playback of multimedia files uses the built-in Flash Player of Adobe Reader and does, therefore, not depend on external plug-ins. Flash Player supports the efficient H.264 codec for video compression.
+This package provides an interface to embed, in the first place, interactive Flash (SWF) and 3D objects (Adobe U3D \& PRC) into PDF documents. Video and sound files or streams in the popular MP4, FLV and MP3 formats can be embedded as well. However, a media player Flash component is required for playback, as will be explained shortly. Playback of multimedia files uses Adobe Flash Player, which was bundled with Adobe Reader 9 and 10 versions. Unfortunately, beginning with Adobe Reader 11, it must be installed as a separate plug-in.
 
-MP4/H.264 video files can be encoded from existing video files and from numbered bitmap sequences using the \verb+ffmpeg+ command line tool (\url{http://ffmpeg.org}). In order to allow for precise seeking within video files it is necessary to encode them with a sufficient number of key frames. The command line for recoding an existing video file \verb+video.avi+ into \verb+video.mp4+ reads
+Among the supported media types, video and sound files require an additional Flash (SWF) application for playback, which must be either embedded into the PDF or loaded at runtime from the internet. There are numerous such players, both open-source and commercial, available on the internet. One of them is the highly configurable open-source `StrobeMediaPlayback.swf'~\cite{strobe}, maintained by Adobe and hosted on \href{http://sourceforge.net/projects/osmf.adobe/files/}{SourceForge.net}. Package `media9' comes with an enhanced version of `StrobeMediaPlayback.swf'. In addition, two simple players for video and audio, `VPlayer.swf' and `APlayer.swf' are included, which can be used instead. They provide sufficient functionality for playing embedded files and streamed media.
+
+Flash Player supports the efficient H.264 codec for video compression. MP4/H.264 video files can be encoded from existing video files and from numbered bitmap sequences using the \verb+ffmpeg+ command line tool (\url{http://ffmpeg.org}). In order to allow for precise seeking within video files it is necessary to encode them with a sufficient number of key frames. The command line for recoding an existing video file \verb+video.avi+ into \verb+video.mp4+ reads
 \begin{Verbatim}
   ffmpeg -i video.avi -vcodec libx264 -x264opts keyint=25 video.mp4
 \end{Verbatim}
@@ -99,8 +101,6 @@ From a sequence \verb+frame-0.png+, \verb+frame-1.png+, ... of bitmap files, an
 \end{Verbatim}
 Both examples insert a key frame at every second.
 
-Among the supported media types, video and sound files require an additional Flash (SWF) application for playback, which must be either embedded into the PDF or loaded at runtime from the internet. There are numerous such players, both open-source and commercial, available on the internet. One of them is the highly configurable open-source `StrobeMediaPlayback.swf'~\cite{strobe}, maintained by Adobe and hosted on \href{http://sourceforge.net/projects/smp.adobe/files/}{SourceForge.net}. Package `media9' comes with an enhanced version of `StrobeMediaPlayback.swf'. In addition, two simple players for video and audio, `VPlayer.swf' and `APlayer.swf' are included, which can be used instead. They provide sufficient functionality for playing embedded files and streamed media.
-
 \emph{Note:} `media9' package replaces the now obsolete `movie15' package. `media9' is based on the RichMedia Annotation (Annotations are the interactive parts in a document, in PDF specification parlance.), an Adobe addition to the PDF specification~\cite{supplement}, while `movie15' uses the old multimedia framework (`Screen Annotation') of pre-9 Readers which depends on external plug-ins and which does not support recent media file formats.
 
 Package `media9' supports the usual PDF making workflows, i.\,e. pdf\LaTeX{}, Lua\LaTeX, \LaTeX{} $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+/Distiller and \pXepLaTeX{} $\rightarrow$ \verb+(x)dvipdfmx+.
@@ -252,7 +252,7 @@ With `\verb+draft+' the media is not embedded. Instead, a box is inserted that h
 \begin{verbatim}
 transparent
 \end{verbatim}
-Indicates whether underlying page content is visible through transparent areas of the embedded media. Doesn't seem to work well for Flash content. Default is `\verb+transparent=false+'; media artwork is drawn over an opaque background prior to composition over the page content.
+Indicates whether underlying page content is visible through transparent areas of the embedded media. Default is `\verb+transparent=false+'; media artwork is drawn over an opaque background prior to composition over the page content.
 \begin{verbatim}
 passcontext
 \end{verbatim}
@@ -461,7 +461,7 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
 \section[Embedding Flash, video and sound (with examples)]{Embedding Flash, video and sound}
 A YouTube video clip, as shown in Fig.~\ref{alien}, may serve as a basic example of loading Flash content from a URL to be displayed in an embedded fashion in a PDF document. Indeed, a YouTube clip is nothing more than a small SWF file which loads a video stream and other necessary resources, such as user controls and a player skin from a remote server. It can be configured via ActionScript variables, to play several videos in a row, to play a video in a loop etc. Player parameters are documented on \url{http://code.google.com/apis/youtube/player_parameters.html} and can be passed to the player using either the `\verb+flashvars+' option, as in the example, or appended to the URL string after the video ID. A question mark `\verb+?+' must be put between the video ID and the parameter string. Some of the documented parameters, such as `\verb+rel+', seem to have an effect only if they are passed as part of the URL.
 
-\begin{figure}[bp]
+\begin{figure}[H]
 \centering
 \begin{Verbatim}
 \includemedia[
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index bdc917301ce..333517e20ee 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -39,8 +39,8 @@
 \RequirePackage{l3keys2e}
 \RequirePackage{ifpdf}
 
-\def\g@mix@date@tl{2012/10/04}
-\def\g@mix@version@tl{0.15}
+\def\g@mix@date@tl{2012/11/20}
+\def\g@mix@version@tl{0.16}
 
 \def\g@mix@liiikerneldate{2012/07/16}
 \def\g@mix@liiipkgdate{2012/07/16}
@@ -1085,9 +1085,9 @@
       /Asset~\g_mix_mainasset_tl
       \bool_if:NF\g_mix_iiid_bool{
         /Params~<<
-          /Binding/Background
+          /Binding/Foreground
           \tl_if_blank:VF\g_mix_flashvars_tl{
-           /FlashVars~(\g_mix_flashvars_tl)
+            /FlashVars~(\g_mix_flashvars_tl)
           }
         >>
       }
diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
index 7fd66e73e14..96dfcb71687 100644
--- a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
diff --git a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
index 0197d3b2237..fa81f53e21f 100644
--- a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf