' . t('The FlashVideo module for Drupal 5.x is an easy to use module that expands the Upload module by allowing users to upload videos and attach those videos to any content. Even more exciting, is that FlashVideo automatically performs the very common Flash format conversion as well as create an image thumbnail of any newly uploaded video for every cron cycle. Once the video is in Flash format, the video can then be embedded in that node using the very simple [video] tag.') . '
'; + $output = '' . t('The FlashVideo module for Drupal 6.x is an easy to use module that expands the Upload module by allowing users to upload videos and attach those videos to any content. Even more exciting, is that FlashVideo automatically performs the very common Flash format conversion as well as create an image thumbnail of any newly uploaded video for every cron cycle. Once the video is in Flash format, the video can then be embedded in that node using the very simple [video] tag.') . '
'; $output .= '' . t('To enable this module for a certain node type, you must first go to the ' . l(t('FlashVideo Settings'), 'admin/settings/flashvideo') . ' and select the FlashVideo settings for any available node type in the Drupal system. Once the FlashVideo module has been enabled for that node type, you will then notice the modified Upload form when you add new content for that node type.') . '
'; $output .= '' . t('Once a video has been uploaded, it will then have to wait for the next Cron cycle for the conversion to Flash format to begin. You can manually run the cron operation by going to Administer->Logs->Status Report and then click on the link that says run cron manually. After the video has been converted, it will then be available to any node referencing that video. That node can then reference the video by using the [video] tag, and also reference the video thumbnail by providing the [thumbnail] tag.') . '
'; $output .= '' . t('Parameters for these tags are provided by using a ":" to indicate a new parameter is being provided. The following format should be used for both the [video] and [thumbnail] tags. [video: param=value ] where param is the name of the parameter being passed, and value is the value of the parameter.') . '
'; @@ -745,6 +745,9 @@ function flashvideo_get_convert_params($ // Set the ffmpeg command path. $params['cmd_path'] = flashvideo_variable_get(NULL, 'flashvideo_binpath', '/usr/bin/ffmpeg'); + + // Set the flvtool2 command path. + $params['metadata_cmd_path'] = flashvideo_variable_get(NULL, 'flashvideo_binpath_metadata', ''); // Set the video command arguments. $params['video_args'] = flashvideo_variable_get($node_type, 'cmd', '-i @input -f flv -acodec mp3 -ar 22050 -ab 64k -ac 1 @output'); @@ -800,6 +803,7 @@ function flashvideo_get_convert_params($ * - output_dir : The output directory relative to the system files directory. * - originaldir : The output directory to contain the original video after the conversion has been made. * - cmd_path : The path to the ffmpeg executable. Can be overridden with something besides ffmpeg. + * - metadata_cmd_path : The path to the flvtool2 executable. * - video_args : The command to pass to the ffmpeg executable. * - thumb_args : The thumbnail command to pass to the ffmpeg executable. * - thumbsize : An string spcifying the width and height of the thumbnail denoted as "WIDTH x HEIGHT". @@ -960,7 +964,15 @@ function flashvideo_convert($file, $node } // Convert the video. - $ffmpeg_data = shell_exec($command); + $ffmpeg_data = shell_exec($command); + + if(!empty($params['metadata_cmd_path'])) { + //$metadata_command = "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/flvtool2 -U '" . $output_path . "'"; + $metadata_command = $params['metadata_cmd_path'] . " -U '" . $output_path . "'"; + drupal_set_message('Metadata Command: ' . $metadata_command); + // Add metadata + shell_exec($metadata_command); + } } // Check to make sure the new file exists.