scratch – Diff between revs 111 and 112

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 111 Rev 112
Line 125... Line 125...
125 FFMpeg\Coordinate\TimeCode::fromSeconds( 125 FFMpeg\Coordinate\TimeCode::fromSeconds(
126 $config['VIDEO_PREVIEW_IMAGE_FRAME_SECOND'] 126 $config['VIDEO_PREVIEW_IMAGE_FRAME_SECOND']
127 ) 127 )
128 ); 128 );
129 $frame->save($userPath.'.'.'jpg'); 129 $frame->save($userPath.'.'.'jpg');
-   130 list($imageWidth, $imageHeight) = getimagesize($userPath.'.'.'jpg');
Line -... Line 131...
-   131
-   132 ### Probe video for width and height.
-   133 $ffprobe = FFMpeg\FFProbe::create();
-   134 $dimension = $ffprobe
-   135 ->streams($CANON_URL)
-   136 ->videos()
-   137 ->first()
-   138 ->getDimensions();
-   139
-   140 $videoWidth = $dimension->getWidth();
-   141 $videoHeight = $dimension->getHeight();
-   142
130 143 ### Build paths.
131 $PREVIEW_IMAGE_URL = $config['URL_PATH'].$file; 144 $PREVIEW_IMAGE_URL = $config['URL_PATH'].$file;
132 $FLOW_PLAYER_VIDEO_URL = $config['URL_PATH'].'flowplayer/flowplayer.swf?config={"clip":"'.$BASIC_URL.'"}'; 145 $FLOW_PLAYER_VIDEO_URL = $config['URL_PATH'].'flowplayer/flowplayer.swf?config={"clip":"'.$BASIC_URL.'"}';
Line 133... Line 146...
133 $FLOW_PLAYER = $config['URL_PATH'].'flowplayer/flowplayer.swf'; 146 $FLOW_PLAYER = $config['URL_PATH'].'flowplayer/flowplayer.swf';
Line 143... Line 156...
143 156
144 <meta property="og:image" content="$PREVIEW_IMAGE_URL"> 157 <meta property="og:image" content="$PREVIEW_IMAGE_URL">
145 <meta property="og:video" content='$FLOW_PLAYER_VIDEO_URL'> 158 <meta property="og:video" content='$FLOW_PLAYER_VIDEO_URL'>
146 <meta property="og:video:secure_url" content='$FLOW_PLAYER_VIDEO_URL'> 159 <meta property="og:video:secure_url" content='$FLOW_PLAYER_VIDEO_URL'>
147 <meta property="og:video:type" content="application/x-shockwave-flash"> 160 <meta property="og:video:type" content="application/x-shockwave-flash">
148 <meta property="og:video:width" content="425"> 161 <meta property="og:video:width" content="$videoWidth">
-   162 <meta property="og:video:height" content="$videoHeight">
-   163
-   164 <meta property="og:image:width" content="$imageWidth">
149 <meta property="og:video:height" content="300"> 165 <meta property="og:image:height" content="$imageHeight">
Line 150... Line 166...
150 </head> 166 </head>
151   167  
152 <body> 168 <body>
153 <p> 169 <p>
154 <object width="425" height="300" id="Scratch Copy" name="Scratch Copy" data="$FLOW_PLAYER" type="application/x-shockwave-flash"><param name="movie" value="$FLOW_PLAYER" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="flashvars" value='config={"clip":"$BASIC_URL"}' /></object> 170 <object width="$videoWidth" height="$videoHeight" id="Scratch Copy" name="Scratch Copy" data="$FLOW_PLAYER" type="application/x-shockwave-flash"><param name="movie" value="$FLOW_PLAYER" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="flashvars" value='config={"clip":"$BASIC_URL"}' /></object>
Line 155... Line 171...
155 </p> 171 </p>
156 </body> 172 </body>