Skip to content

Commit

Permalink
rollback moviemasher upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
ronniebrito committed Oct 9, 2012
1 parent 31eb577 commit c5d326f
Show file tree
Hide file tree
Showing 2,246 changed files with 268,651 additions and 519 deletions.
Binary file added Recorder/12.flv
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ tf.height = 40;
tf.x = 180;
tf.y = 310;

tf.text = "eh nois";
tf.text = "eh";
//addChild(tf);

//var pageURL:String = ExternalInterface.call('window.location.href.toString');
Expand Down Expand Up @@ -127,7 +127,8 @@ tf.text = myUrl;
runtime.conn.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onSecurityError);
//trace("Connecting to Red5...@"+ "rtmp://rocha.ava.ufsc.br/recorder/"+id);
// runtime.conn.connect("rtmp://rocha.ava.ufsc.br/recorder", true );
runtime.conn.connect("rtmp://localhost/recorder", true );
// runtime.conn.connect("rtmp://localhost/recorder", true );
runtime.conn.connect("rtmp://150.162.6.190/recorder", true );
}

public function publish():void {
Expand Down Expand Up @@ -175,7 +176,7 @@ public function CallBackStop(result:Array)

//http://150.162.41.4/~ronnie/etica/moodle/mod/moviemasher/Recorder/web/recorder.swf

var url:String = myUrl + "/../../../recorderCallback?id=" + this.id;
var url:String = myUrl + "/../../../recorderCallback.php?id=" + this.id;
tf.text = myUrl;

// id = mash id
Expand Down
Binary file added Recorder/web.tar
Binary file not shown.
Binary file modified Recorder/web/recorder.swf
Binary file not shown.
23 changes: 23 additions & 0 deletions ____binarySignWritingImage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php
require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
//ob_start();
//header("Content-Type: image/png");
//var_dump($_REQUEST);
$bsw = $_REQUEST['bsw'];

//$file = 'http://localhost/moodle/mod/moviemasher/swmp/swis/column.php?bsw='. $bsw;

$file = $CFG->wwwroot.'/mod/moviemasher/swmp/swis/column.php?bsw='. $bsw;

$f=fopen($file,'r');
$data='';
while(!feof($f))
$data.=fread($f,8);
fclose($f);


//echo file_get_contents('http://www.libras.ufsc.br/hiperlab/swmediawiki/swmp/swis/glyphogram.php?bsw='. $bsw );
echo $data;

//ob_end_flush();
?>
22 changes: 1 addition & 21 deletions binarySignWriting.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,7 @@

require_once(dirname(dirname(dirname(__FILE__))).'/config.php');

$palavra = $_REQUEST['palavra'];
//$palavra = 'adjetivo';
/*$file = 'http://www.nals.cce.ufsc.br/glossario/bsw.php?palavra='.$palavra ;
$f=fopen($file,'r');
$bsw='';
while(!feof($f))
$bsw.=fread($f,8);
fclose($f);
*/
//$palavra = "1";

$bsw= $palavra;
if($palavra == "1"){
$bsw= "0fb33138c39251d50710e38d39a54551a20e38c39253c4f522a38c39254450815339139c5045272f938c39250a53c0fb23038c3965014f020638c39250450615339139952251115338c3a14f551321438c39250f52d0fb32138c39953150c11538c39655b4f511538c39655c52628938c39256d50415338f3a153c5342f938c39254254c0fb32138c39952e50c11538c3965674f515338f3a15395342f938c39253f54c2d238c39254b500 ";
}
if($palavra == "2"){
$bsw= "0fb30038c39954950c20538c39256a50610038d39357151410038d3935955152db38c39859d4f50fb36138c39252d4f530038c39852d4f520538c3925544ff10038d3935655000fb36138c39251e4f520338e39250952214a38e39251f52216d38d39253351f17638d3925475220fb34d38c3925244f51dc38e39254c5161dc38e39a50b51922138c39651e51622138c3965475152fb38c39653153522a38c39655353822a38d39650e53d";
}

//$file= 'http://localhost/moodle/mod/moviemasher/swmp/swis/column.php??size=1&line=000000&fill=FFFFFF&back=FFFFFF&spacing=10&offset=50&bsw='. $bsw;
$bsw = $_REQUEST['palavra'];

$file= $CFG->wwwroot.'/mod/moviemasher/swmp/swis/column.php??size=1&line=000000&fill=FFFFFF&back=FFFFFF&spacing=10&offset=50&bsw='. $bsw;

Expand Down
8 changes: 5 additions & 3 deletions db/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,15 @@
</TABLE>


<TABLE NAME="moviemasher_video" COMMENT="videos belonging to a certain user mash" PREVIOUS="moviemasher_mash" >
<TABLE NAME="moviemasher_media" COMMENT="videos or images belonging to a certain user mash, uploaded" PREVIOUS="moviemasher_mash" >
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="mash_id"/>

<FIELD NAME="mash_id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" COMMENT="mash video belongs to" PREVIOUS="id" NEXT="extension"/>
<FIELD NAME="mash_id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" COMMENT="mash video belongs to" PREVIOUS="id" NEXT="type"/>

<FIELD NAME="type" TYPE="text" LENGTH="medium" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="type of file" PREVIOUS="mash_id" NEXT="extension"/>

<FIELD NAME="extension" TYPE="text" LENGTH="medium" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="File extension" PREVIOUS="mash_id" NEXT="name"/>
<FIELD NAME="extension" TYPE="text" LENGTH="medium" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="File extension" PREVIOUS="type" NEXT="name"/>

<FIELD NAME="name" TYPE="text" LENGTH="medium" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="General introduction of the moviemasher activity" PREVIOUS="extension" NEXT="duration"/>

Expand Down
93 changes: 93 additions & 0 deletions mm/README-AMI-Server.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Server AMI Read Me
------------------

The Movie Masher Server AMI (Amazon Machine Image) is a prepackaged server you launch up
within Amazon's EC2 (Elastic Compute Cloud) infrastructure:

http://aws.amazon.com/ec2/

Once launched, instances of the AMI provide a standard LAMP (LINUX, Apache, MySQL, PHP)
web server with the Movie Masher SDK preinstalled and configured. Simply access the Public
DNS Name of the instance in a web browser to begin editing video online. Instances of the
AMI can also be accessed via SSH or FTP, so it can be easily built upon and rebundled into
your own custom AMIs.

Launching Instances of the AMI
------------------------------

You must have an Amazon account and be signed up for EC2 in order to launch instances of
the Movie Masher Server AMI. It is a publicly available LINUX based AMI - search for
'moviemasher' within the EC2 Management Console and choose the most recent version. Port
80 must be open in the Security Group that instances are launched within for HTTP access.
For SSH and FTP access open port 21 and 22, as well as the 12000-12100 range if using PASV
mode.

If launched without User Data, instances will display the 'share' example deployment when
their Public DNS Names are accessed. Otherwise, most of the options specified in the User
Data are placed in the moviemasher.ini file used by the 'transcode' example, which will
display if properly configured. In order for this example to function properly, an
instance of the Movie Masher Transcoder AMI will need to launched as well - see
README-AMI-Transcoder.txt within this example's directory for details.

The Transcoder instance provides the API that handles preprocessing of uploads and
rendering of mashes back into true video format. API requests are either directly POSTed
to a single instance through its REST (REpresentational State Transfer) interface or to
Amazon's SQS (Simple Queue Service), which doles them out to a pool of instances for
better performance. The resultant file(s) are securely transferred to Amazon's S3 (Simple
Storage Service) or most any HTTP compliant server or service.

http://aws.amazon.com/sqs/
http://aws.amazon.com/s3/


User Data XML Syntax
--------------------

<MovieMasher>

<PasswordFTP>YOUR_FTP_PASSWORD</PasswordFTP>
<PasswordMySQL>YOUR_MYSQL_PASSWORD</PasswordMySQL>

<AWSAccessKeyID>YOUR_ACCESS_KEY_ID</AWSAccessKeyID>
<AWSSecretAccessKey>YOUR_SECRET_ACCESS_KEY</AWSSecretAccessKey>

<HostMedia>YOUR_BUCKET_NAME.s3.amazonaws.com</HostMedia>
<S3Bucket>YOUR_BUCKET_NAME</S3Bucket>
<S3Region>eu-west-1</S3Region>

<RESTEndPoint>https://ec2-123-456-789-10.compute-1.amazonaws.com</RESTEndPoint>
<SQSQueueURLSend>https://queue.amazonaws.com/123456/identifier</SQSQueueURLSend>

<KeypairPrivate>-----BEGIN ... END RSA PRIVATE KEY-----</KeypairPrivate>

</MovieMasher>

If PasswordFTP is defined then user 'moviemasher' will be created on the instance and a
link to /var/www placed in their home directory. If PasswordMySQL is defined then the
MySQL 'root' user password will be set (though the example doesn't yet use MySQL for
storage). Since the User Data is only evaluated when the instance is first launched,
setting these options later in moviemasher.ini has no effect - use SSH to change passwords
on running instances.

If S3 or SQS are being used, or if the Transcoder instance was launched without a Key
Pair, then both the AWSSecretAccessKey and AWSAccessKeyID must be defined in the User Data
when launching both AMIs. The SQS queue or S3 bucket must provide permission to the
identifiers if they are not publicly writable.

If S3 is being used then a bucket must be created and its name placed in the S3Bucket and
HostMedia options. Alternatively, HostMedia can be a CNAME you've set up on your domain
that maps to the bucket. If the bucket is in a region other than US Standard then S3Region
needs to be defined. The PathMedia option can also be defined to set the prefix used when generating bucket keys.

If REST is being used then RESTEndPoint contains the Public DNS Name of the Transcoder
instance preceded by 'http://' or 'https://' (recommended). Or if SQS is being used
instead then a queue must be created and its URL placed in the SQSQueueURLSend option.
This must match the SQSQueueURLReceive option provided in the User Data when the
Transcoder instance is launched.

If the Transcoder is launched with a Key Pair then the PEM encoded private key portion of
it can be included in the KeypairPrivate option to authenticate API requests. This option
can alternatively contain a file path and the PEM file can be transferred to it after
launch via SSH or FTP. If KeypairPrivate is not defined then AWSAccessKeyID and
AWSSecretAccessKey must be, when launching both the Server and Transcoder AMIs or API
requests cannot be authenticated.
51 changes: 51 additions & 0 deletions mm/README-Migration.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
3.1.XX -> 3.2.XX
----------------

* Transcoding functionality moved from distribution to new Movie Masher Transcoder AMI

* 'server' example now known as 'transcode' - updated to work with new Transcoder API

* Configuration file private/MovieMasher.xml replaced by moviemasher.ini

* Only 'REST' or 'SQS' now supported for Client configuration option

* Only 'HTTP' or 'Local' now supported for File configuration option (S3 provided by HTTP)

* Player and Browser controls need to have id specifically set

* Player now requires 'source' attribute - probably 'mash'

* Example index pages now require video_width and video_height keys for flashvarsObj object

* CGI 'mash' attribute should now be 'player.mash' or other mash object

* Bender control tag 'shader' attribute changed to 'source'

* Moved bender .pbj files to moviemasher/com/moviemasher/pbj

* The following classes have been migrated to the Player SWF file:
com.moviemasher.handler.MP3Handler
com.moviemasher.source.RemoteSource
com.moviemasher.display.Tooltip

* The following classes have been migrated to the Editor SWF file:
com.moviemasher.display.Increment

* 'tie' control attribute removed - use full references in 'pattern' instead, or just
remove since controls like Scrollbar, Ruler, Timeline no longer need them

* Flash CS5.5 now required to rebuild FLA files

* Previews use over* attributes instead of sel* for selected box properties

* Curve library item removed from library in skin file - use the following instead:
color='333333' grad='40' angle='270' curve='5'

* Tooltip class variable on frame one of custom skin SWFs should be removed, if found

* Increment library symbol in skin SWF should be removed

* Fullscreen icons moved from library to timeline in skin file



50 changes: 50 additions & 0 deletions mm/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

Movie Masher Installation
-------------------------

Please note that all of these example deployments come preinstalled on the Movie Masher Server AMI within
Amazon's EC2 infrastructure. See README-AMI-Server.txt for information on how to launch up your own
instance and customize it for your project.

The examples vary in complexity and server requirements... By far the simplest is 'static' since it
uses no CGIs or APIs. The 'actionscript' and 'javascript' examples add the ability to control the
editing interface externally through these languages. The 'flickr' example demonstrates
connecting to an external APIs for content.

By relying on CGI scripts the 'browse', 'save' and 'upload' examples add various hooks that can be
extended to interface with existing content management systems. And finally the 'transcode' example
puts these functions together to demonstrate a simple content flow, incorporating preprocessing of
uploaded media and downloading of rendered mash in true video format.

moviemasher:
example:
actionscript: loads the Movie Masher applet through another SWF
browse: searches through media XML files dynamically
flickr: search and display content from Flickr
javascript: loads and controls the Movie Masher applet through JavaScript
media: demo assets and JavaScript shared by several examples
save: writes mash data to file system
transcode: uses remote transcoder api to render mashes
share: demo of mash playback within Facebook wall
static: simplest example requires no CGI
upload: transfers file to server
LICENSE.html: describes licensing for utilized software
README.txt: this file
README-AMI-Server.txt: describes the Movie Masher Server AMI in EC2
README-Migration.txt: note for 3.1.x users upgrading
moviemasher: Applet SWF files
source: FLAs, fonts, scripts and other source material

To install the simpler examples that don't use CGI (actionscript, flickr, javascript,
static), please do the following:

* Copy the /example and /moviemasher directories to a publicly accessible directory on a web server
* Load the example's index page in a browser through the web server (examples do not run locally!)

To install all other examples, please also do the following:

* Install PHP5 if it's not already
* Follow further directions at the end of each example's README.txt file

Further documentation of the whole system is available on the moviemasher.com site.

43 changes: 43 additions & 0 deletions mm/example/actionscript/LICENSE.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>License : Movie Masher Applet</title>
<style type="text/css">
body {margin: 10px}
p {font-size: 12px; font-family:Ariel,Helvetica}
p:first-child {font-size: 14px;}
</style>
</head>
<body>
<p>
<img src='../media/image/Logo/media.png' width='320' height='144' alt='Movie Masher' />
<br /><br />
Thanks for using <b>Movie Masher</b>, the open source online video editor.
This software is freely available at <a href='http://www.moviemasher.com/' target='_blank'>MovieMasher.com</a> for installation
on your site, even if it's a commmercial one.
</p>
<hr />
<p>
This software is subject to the Mozilla Public License Version 1.1
(the "License"); you may not use this software except in compliance with
the License. You may obtain a copy of the License at
<a href='http://www.mozilla.org/MPL/' target='_blank'>http://www.mozilla.org/MPL/</a>
</p>
<p>
Software distributed under the License is distributed on an "AS IS"
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
the License for the specific language governing rights and limitations
under the License.
</p>
<p>
The Original Code is 'Movie Masher'. The Initial Developer of the
Original Code is Doug Anarino. Portions created by Doug Anarino are
Copyright (C) 2007-2012 <a href='http://www.moviemasher.com/' target='_blank'>MovieMasher.com</a>, Inc. All Rights Reserved.
</p>
<p>
<b><a href="javascript:window.close();">Close</a></b>
</p>
</body>
</html>
Loading

0 comments on commit c5d326f

Please sign in to comment.