From 93ccc33320aec8a66d41fcd0715b645bd2b5fab0 Mon Sep 17 00:00:00 2001 From: benfry Date: Tue, 6 Sep 2011 21:32:40 +0000 Subject: [PATCH] tweaks to make the MovieMaker tool passable --- .../tools/MovieMaker/src/MovieMakerTool.java | 1522 +++++++++-------- 1 file changed, 775 insertions(+), 747 deletions(-) diff --git a/build/shared/tools/MovieMaker/src/MovieMakerTool.java b/build/shared/tools/MovieMaker/src/MovieMakerTool.java index 66fbcd3f9..0753089aa 100644 --- a/build/shared/tools/MovieMaker/src/MovieMakerTool.java +++ b/build/shared/tools/MovieMaker/src/MovieMakerTool.java @@ -13,586 +13,619 @@ import ch.randelshofer.gui.datatransfer.FileTextFieldTransferHandler; import ch.randelshofer.media.mp3.MP3AudioInputStream; import ch.randelshofer.media.quicktime.QuickTimeWriter; +import java.awt.Font; import java.awt.Graphics2D; import java.awt.RenderingHints; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.util.Arrays; -import java.util.Enumeration; import java.util.prefs.Preferences; import javax.imageio.ImageIO; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.UnsupportedAudioFileException; -import javax.swing.AbstractButton; -import javax.swing.JComponent; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.ProgressMonitor; -import javax.swing.SwingWorker; +import javax.swing.*; import javax.swing.border.EmptyBorder; import javax.swing.filechooser.FileSystemView; +import processing.app.Base; +import processing.app.Editor; +import processing.app.tools.Tool; + /** * Hacked from Werner Randelshofer's QuickTimeWriter demo. The original version * can be found here. */ -public class MovieMakerTool extends javax.swing.JFrame { - private JFileChooser imageFolderChooser; - private JFileChooser soundFileChooser; - private JFileChooser movieFileChooser; - private Preferences prefs; +public class MovieMakerTool extends JFrame implements Tool { + private JFileChooser imageFolderChooser; + private JFileChooser soundFileChooser; + private JFileChooser movieFileChooser; + private Preferences prefs; + +// private Editor editor; - /** Creates new form QuickTimeMovieMakerMain */ - public MovieMakerTool() { - initComponents(); +//MovieMakerTool m = new MovieMakerTool(); +//m.setVisible(true); +//m.pack(); - String version = getClass().getPackage().getImplementationVersion(); - if (version != null) { - setTitle(getTitle() + " " + version); - } + public String getMenuTitle() { + return "Movie Maker"; + } - ((JComponent) getContentPane()).setBorder(new EmptyBorder(12, 18, 18, 18)); - imageFolderField.setTransferHandler(new FileTextFieldTransferHandler(JFileChooser.DIRECTORIES_ONLY)); - soundFileField.setTransferHandler(new FileTextFieldTransferHandler()); + + public void run() { + setVisible(true); + } + - JComponent[] smallComponents = {compressionBox, - compressionLabel, - fpsField, - fpsLabel, - heightField, - heightLabel, - widthField, - widthLabel, - passThroughCheckBox, - noPreparationRadio, - fastStartCompressedRadio, - fastStartRadio}; - for (JComponent c : smallComponents) { - c.putClientProperty("JComponent.sizeVariant", "small"); - } + public void init(Editor editor) { +// this.editor = editor; + initComponents(); - // Get Preferences - prefs = Preferences.userNodeForPackage(MovieMakerTool.class); - imageFolderField.setText(prefs.get("movie.imageFolder", "")); - soundFileField.setText(prefs.get("movie.soundFile", "")); - widthField.setText("" + prefs.getInt("movie.width", 320)); - heightField.setText("" + prefs.getInt("movie.height", 240)); - passThroughCheckBox.setSelected(prefs.getBoolean("movie.passThrough", false)); - String fps = "" + prefs.getDouble("movie.fps", 30); - if (fps.endsWith(".0")) { - fps = fps.substring(0, fps.length() - 2); - } - fpsField.setText(fps); - compressionBox.setSelectedIndex(Math.max(0, Math.min(compressionBox.getItemCount() - 1, prefs.getInt("movie.compression", 1)))); +// String version = getClass().getPackage().getImplementationVersion(); +// if (version != null) { +// setTitle(getTitle() + " " + version); +// } - // - String streaming = prefs.get("movie.streaming", "fastStartCompressed"); - for (Enumeration i = streamingGroup.getElements(); i.hasMoreElements();) { - AbstractButton btn = i.nextElement(); - if (btn.getActionCommand().equals(streaming)) { - btn.setSelected(true); - break; - } - } + ((JComponent) getContentPane()).setBorder(new EmptyBorder(12, 18, 18, 18)); + imageFolderField.setTransferHandler(new FileTextFieldTransferHandler(JFileChooser.DIRECTORIES_ONLY)); + soundFileField.setTransferHandler(new FileTextFieldTransferHandler()); + + JComponent[] smallComponents = { + compressionBox, + compressionLabel, + fpsField, + fpsLabel, + widthField, + widthLabel, + heightField, + heightLabel, + passThroughCheckBox, +// noPreparationRadio, +// fastStartCompressedRadio, +// fastStartRadio + }; + for (JComponent c : smallComponents) { + c.putClientProperty("JComponent.sizeVariant", "small"); } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { + // Get Preferences + prefs = Preferences.userNodeForPackage(MovieMakerTool.class); + imageFolderField.setText(prefs.get("movie.imageFolder", "")); + soundFileField.setText(prefs.get("movie.soundFile", "")); + widthField.setText("" + prefs.getInt("movie.width", 320)); + heightField.setText("" + prefs.getInt("movie.height", 240)); + passThroughCheckBox.setSelected(prefs.getBoolean("movie.passThrough", false)); + String fps = "" + prefs.getDouble("movie.fps", 30); + if (fps.endsWith(".0")) { + fps = fps.substring(0, fps.length() - 2); + } + fpsField.setText(fps); + compressionBox.setSelectedIndex(Math.max(0, Math.min(compressionBox.getItemCount() - 1, prefs.getInt("movie.compression", 1)))); - streamingGroup = new javax.swing.ButtonGroup(); - aboutLabel = new javax.swing.JLabel(); - imageFolderHelpLabel = new javax.swing.JLabel(); - imageFolderField = new javax.swing.JTextField(); - chooseImageFolderButton = new javax.swing.JButton(); - soundFileHelpLable = new javax.swing.JLabel(); - soundFileField = new javax.swing.JTextField(); - chooseSoundFileButton = new javax.swing.JButton(); - createMovieButton = new javax.swing.JButton(); - widthLabel = new javax.swing.JLabel(); - widthField = new javax.swing.JTextField(); - heightLabel = new javax.swing.JLabel(); - heightField = new javax.swing.JTextField(); - compressionLabel = new javax.swing.JLabel(); - compressionBox = new javax.swing.JComboBox(); - fpsLabel = new javax.swing.JLabel(); - fpsField = new javax.swing.JTextField(); - passThroughCheckBox = new javax.swing.JCheckBox(); - streamingLabel = new javax.swing.JLabel(); - noPreparationRadio = new javax.swing.JRadioButton(); - fastStartRadio = new javax.swing.JRadioButton(); - fastStartCompressedRadio = new javax.swing.JRadioButton(); +// String streaming = prefs.get("movie.streaming", "fastStartCompressed"); +// for (Enumeration i = streamingGroup.getElements(); i.hasMoreElements();) { +// AbstractButton btn = i.nextElement(); +// if (btn.getActionCommand().equals(streaming)) { +// btn.setSelected(true); +// break; +// } +// } + + pack(); + } - FormListener formListener = new FormListener(); + + private void initComponents() { + imageFolderHelpLabel = new JLabel(); + imageFolderField = new JTextField(); + chooseImageFolderButton = new JButton(); + soundFileHelpLable = new JLabel(); + soundFileField = new JTextField(); + chooseSoundFileButton = new JButton(); + createMovieButton = new JButton(); + widthLabel = new JLabel(); + widthField = new JTextField(); + heightLabel = new JLabel(); + heightField = new JTextField(); + compressionLabel = new JLabel(); + compressionBox = new JComboBox(); + fpsLabel = new JLabel(); + fpsField = new JTextField(); + passThroughCheckBox = new JCheckBox(); +// streamingLabel = new JLabel(); +// streamingGroup = new ButtonGroup(); +// noPreparationRadio = new JRadioButton(); +// fastStartRadio = new JRadioButton(); +// fastStartCompressedRadio = new JRadioButton(); - setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - setTitle("QuickTime Movie Maker"); + FormListener formListener = new FormListener(); - aboutLabel.setText("This is a demo for the QuickTimeWriter class.
" + - "QuickTimeWriter supports writing of audio and video data in a QuickTime Movie file using pure Java.
Copyright © 2010-2011 Werner Randelshofer. All rights reserved.
This software can be licensed under Creative Commons Atribution 3.0."); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + setVisible(false); + } + }); + Base.registerWindowCloseKeys(getRootPane(), new ActionListener() { + public void actionPerformed(ActionEvent actionEvent) { + setVisible(false); + } + }); + setTitle("QuickTime Movie Maker"); - imageFolderHelpLabel.setText("Drag a folder with image files into the field below:"); + aboutLabel = + new JLabel("" + + "This tool creates a QuickTime movie from a sequence of images.
" + + "
" + + "To avoid artifacts caused by re-compressing images as video,
" + + "use uncompressed TIFF or (lossless) PNG images as the source.
" + + "
" + + "TIFF images will write more quickly, but require more disk space:
" + + "saveFrame(\"frames/####.tif\");
" + + "
" + + "PNG images are smaller, but your sketch will run more slowly:
" + + "saveFrame(\"frames/####.png\");
" + + "
" + + "This code is based on QuickTime Movie Maker 1.5.1 2011-01-17.
" + + "Copyright © 2010-2011 Werner Randelshofer. All rights reserved.
" + + "This software is licensed under Creative Commons Atribution 3.0."); - chooseImageFolderButton.setText("Choose..."); - chooseImageFolderButton.addActionListener(formListener); + imageFolderHelpLabel.setText("Drag a folder with image files into the field below:"); + chooseImageFolderButton.setText("Choose..."); + chooseImageFolderButton.addActionListener(formListener); - soundFileHelpLable.setText("Drag a sound file into the field below (.au, .aiff, .wav, .mp3):"); + soundFileHelpLable.setText("Drag a sound file into the field below (.au, .aiff, .wav, .mp3):"); + chooseSoundFileButton.setText("Choose..."); + chooseSoundFileButton.addActionListener(formListener); - chooseSoundFileButton.setText("Choose..."); - chooseSoundFileButton.addActionListener(formListener); + createMovieButton.setText("Create Movie..."); + createMovieButton.addActionListener(formListener); - createMovieButton.setText("Create QuickTime Movie..."); - createMovieButton.addActionListener(formListener); + Font font = new Font("Dialog", Font.PLAIN, 11); + + widthLabel.setFont(font); + widthLabel.setText("Width:"); + widthField.setColumns(4); + widthField.setFont(font); + widthField.setText("320"); - widthLabel.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - widthLabel.setText("Width:"); + heightLabel.setFont(font); + heightLabel.setText("Height:"); + heightField.setColumns(4); + heightField.setFont(font); + heightField.setText("240"); - widthField.setColumns(4); - widthField.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - widthField.setText("320"); + compressionLabel.setFont(font); + compressionLabel.setText("Compression:"); + compressionBox.setFont(font); + compressionBox.setModel(new DefaultComboBoxModel(new String[] { "None", "Animation", "JPEG", "PNG" })); - heightLabel.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - heightLabel.setText("Height:"); + fpsLabel.setFont(font); + fpsLabel.setText("Frame Rate:"); + fpsField.setColumns(4); + fpsField.setFont(font); + fpsField.setText("30"); - heightField.setColumns(4); - heightField.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - heightField.setText("240"); + passThroughCheckBox.setFont(font); + passThroughCheckBox.setText("Same size as originals"); + passThroughCheckBox.setToolTipText("Check this box if the folder contains already encoded video frames in the desired size."); - compressionLabel.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N - compressionLabel.setText("Compression:"); +// streamingLabel.setText("Prepare for Internet Streaming"); +// +// streamingGroup.add(noPreparationRadio); +// noPreparationRadio.setFont(font); +// noPreparationRadio.setSelected(true); +// noPreparationRadio.setText("No preparation"); +// noPreparationRadio.setActionCommand("none"); +// noPreparationRadio.addActionListener(formListener); +// +// streamingGroup.add(fastStartRadio); +// fastStartRadio.setFont(font); +// fastStartRadio.setText("Fast Start"); +// fastStartRadio.setActionCommand("fastStart"); +// fastStartRadio.addActionListener(formListener); +// +// streamingGroup.add(fastStartCompressedRadio); +// fastStartCompressedRadio.setFont(font); +// fastStartCompressedRadio.setText("Fast Start - Compressed Header"); +// fastStartCompressedRadio.setActionCommand("fastStartCompressed"); +// fastStartCompressedRadio.addActionListener(formListener); - compressionBox.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - compressionBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "None", "Animation", "JPEG", "PNG" })); - - fpsLabel.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - fpsLabel.setText("FPS:"); - - fpsField.setColumns(4); - fpsField.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - fpsField.setText("30"); - - passThroughCheckBox.setFont(new java.awt.Font("Lucida Grande", 0, 11)); - passThroughCheckBox.setText("Pass through"); - passThroughCheckBox.setToolTipText("Check this box if the folder contains already encoded video frames in the desired size."); - - streamingLabel.setText("Prepare for Internet Streaming"); - - streamingGroup.add(noPreparationRadio); - noPreparationRadio.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N - noPreparationRadio.setSelected(true); - noPreparationRadio.setText("No preparation"); - noPreparationRadio.setActionCommand("none"); - noPreparationRadio.addActionListener(formListener); - - streamingGroup.add(fastStartRadio); - fastStartRadio.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N - fastStartRadio.setText("Fast Start"); - fastStartRadio.setActionCommand("fastStart"); - fastStartRadio.addActionListener(formListener); - - streamingGroup.add(fastStartCompressedRadio); - fastStartCompressedRadio.setFont(new java.awt.Font("Lucida Grande", 0, 11)); // NOI18N - fastStartCompressedRadio.setText("Fast Start - Compressed Header"); - fastStartCompressedRadio.setActionCommand("fastStartCompressed"); - fastStartCompressedRadio.addActionListener(formListener); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); - getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(61, 61, 61) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(widthLabel) - .addComponent(fpsLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + GroupLayout layout = new GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(61, 61, 61) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addComponent(widthLabel) + .addComponent(fpsLabel)) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(fpsField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(compressionLabel) + .addGap(1, 1, 1) + .addComponent(compressionBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(passThroughCheckBox)) + .addGroup(layout.createSequentialGroup() + .addComponent(widthField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(heightLabel) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addComponent(heightField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))) + .addGap(41, 41, 41)) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addComponent(aboutLabel, GroupLayout.DEFAULT_SIZE, 484, Short.MAX_VALUE) + .addComponent(imageFolderHelpLabel) + .addComponent(soundFileHelpLable) + .addGroup(layout.createSequentialGroup() + .addComponent(soundFileField, GroupLayout.DEFAULT_SIZE, 372, Short.MAX_VALUE) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addComponent(chooseSoundFileButton)) + .addComponent(createMovieButton, GroupLayout.Alignment.TRAILING) + .addGroup(GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(imageFolderField, GroupLayout.DEFAULT_SIZE, 372, Short.MAX_VALUE) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addComponent(chooseImageFolderButton)))) + .addGroup(layout.createSequentialGroup() + .addContainerGap()))) + /*.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addComponent(streamingLabel) + .addGroup(layout.createSequentialGroup() + .addGap(21, 21, 21) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) + .addComponent(fastStartRadio) + .addComponent(noPreparationRadio) + .addComponent(fastStartCompressedRadio)))))) + .addContainerGap())*/ + ); + layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(fpsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(compressionLabel) - .addGap(1, 1, 1) - .addComponent(compressionBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(passThroughCheckBox)) - .addGroup(layout.createSequentialGroup() - .addComponent(widthField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(heightLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(heightField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(41, 41, 41)) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(aboutLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 484, Short.MAX_VALUE) - .addComponent(imageFolderHelpLabel) - .addComponent(soundFileHelpLable) - .addGroup(layout.createSequentialGroup() - .addComponent(soundFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 372, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chooseSoundFileButton)) - .addComponent(createMovieButton, javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(imageFolderField, javax.swing.GroupLayout.DEFAULT_SIZE, 372, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chooseImageFolderButton)))) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(streamingLabel) - .addGroup(layout.createSequentialGroup() - .addGap(21, 21, 21) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(fastStartRadio) - .addComponent(noPreparationRadio) - .addComponent(fastStartCompressedRadio)))))) - .addContainerGap()) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(aboutLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(imageFolderHelpLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(imageFolderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(chooseImageFolderButton)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(widthLabel) - .addComponent(widthField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(heightLabel) - .addComponent(heightField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(compressionBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(fpsLabel) - .addComponent(fpsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(compressionLabel) - .addComponent(passThroughCheckBox)) - .addGap(18, 18, 18) - .addComponent(soundFileHelpLable) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(soundFileField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(chooseSoundFileButton)) - .addGap(18, 18, 18) - .addComponent(streamingLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(noPreparationRadio) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(fastStartRadio) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(fastStartCompressedRadio) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 4, Short.MAX_VALUE) - .addComponent(createMovieButton) - .addContainerGap()) - ); + .addContainerGap() + .addComponent(aboutLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(imageFolderHelpLabel) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(imageFolderField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(chooseImageFolderButton)) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(widthLabel) + .addComponent(widthField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(heightLabel) + .addComponent(heightField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(compressionBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(fpsLabel) + .addComponent(fpsField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(compressionLabel) + .addComponent(passThroughCheckBox)) + .addGap(18, 18, 18) + .addComponent(soundFileHelpLable) + .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(soundFileField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(chooseSoundFileButton)) + .addGap(18, 18, 18) +// .addComponent(streamingLabel) +// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) +// .addComponent(noPreparationRadio) +// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) +// .addComponent(fastStartRadio) +// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) +// .addComponent(fastStartCompressedRadio) +// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 4, Short.MAX_VALUE) + .addComponent(createMovieButton) + .addContainerGap()) + ); - pack(); + pack(); + } + + // Code for dispatching events from components to event handlers. + + private class FormListener implements java.awt.event.ActionListener { + FormListener() {} + public void actionPerformed(java.awt.event.ActionEvent evt) { + if (evt.getSource() == chooseImageFolderButton) { + MovieMakerTool.this.chooseImageFolder(evt); + } + else if (evt.getSource() == chooseSoundFileButton) { + MovieMakerTool.this.chooseSoundFile(evt); + } + else if (evt.getSource() == createMovieButton) { + MovieMakerTool.this.createMovie(evt); + } +// else if (evt.getSource() == fastStartCompressedRadio) { +// MovieMakerTool.this.streamingRadioPerformed(evt); +// } +// else if (evt.getSource() == fastStartRadio) { +// MovieMakerTool.this.streamingRadioPerformed(evt); +// } +// else if (evt.getSource() == noPreparationRadio) { +// MovieMakerTool.this.streamingRadioPerformed(evt); +// } + } + } + + private void chooseImageFolder(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chooseImageFolder + if (imageFolderChooser == null) { + imageFolderChooser = new JFileChooser(); + imageFolderChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + if (imageFolderField.getText().length() > 0) { + imageFolderChooser.setSelectedFile(new File(imageFolderField.getText())); + } else if (soundFileField.getText().length() > 0) { + imageFolderChooser.setCurrentDirectory(new File(soundFileField.getText()).getParentFile()); + } + } + if (JFileChooser.APPROVE_OPTION == imageFolderChooser.showOpenDialog(this)) { + imageFolderField.setText(imageFolderChooser.getSelectedFile().getPath()); + } + } + + private void chooseSoundFile(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chooseSoundFile + if (soundFileChooser == null) { + soundFileChooser = new JFileChooser(); + if (soundFileField.getText().length() > 0) { + soundFileChooser.setSelectedFile(new File(soundFileField.getText())); + } else if (imageFolderField.getText().length() > 0) { + soundFileChooser.setCurrentDirectory(new File(imageFolderField.getText())); + } + } + if (JFileChooser.APPROVE_OPTION == soundFileChooser.showOpenDialog(this)) { + soundFileField.setText(soundFileChooser.getSelectedFile().getPath()); + } + } + + private void createMovie(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createMovie + // --------------------------------- + // Check input + // --------------------------------- + final File soundFile = soundFileField.getText().trim().length() == 0 ? null : new File(soundFileField.getText().trim()); + final File imageFolder = imageFolderField.getText().trim().length() == 0 ? null : new File(imageFolderField.getText().trim()); + //final String streaming = prefs.get("movie.streaming", "fastStartCompressed"); + final String streaming = "fastStartCompressed"; + if (soundFile == null && imageFolder == null) { + JOptionPane.showMessageDialog(this, "You need to specify a folder with
image files and/or a sound file."); + return; } - // Code for dispatching events from components to event handlers. + final int width, height; + final double fps; + try { + width = Integer.parseInt(widthField.getText()); + height = Integer.parseInt(heightField.getText()); + fps = Double.parseDouble(fpsField.getText()); + } catch (Throwable t) { + JOptionPane.showMessageDialog(this, "Width, Height and FPS must be numeric."); + return; + } + if (width < 1 || height < 1 || fps < 1) { + JOptionPane.showMessageDialog(this, "Width, Height and FPS must be greater than zero."); + return; + } - private class FormListener implements java.awt.event.ActionListener { - FormListener() {} - public void actionPerformed(java.awt.event.ActionEvent evt) { - if (evt.getSource() == chooseImageFolderButton) { - MovieMakerTool.this.chooseImageFolder(evt); - } - else if (evt.getSource() == chooseSoundFileButton) { - MovieMakerTool.this.chooseSoundFile(evt); - } - else if (evt.getSource() == createMovieButton) { - MovieMakerTool.this.createMovie(evt); - } - else if (evt.getSource() == fastStartCompressedRadio) { - MovieMakerTool.this.streamingRadioPerformed(evt); - } - else if (evt.getSource() == fastStartRadio) { - MovieMakerTool.this.streamingRadioPerformed(evt); - } - else if (evt.getSource() == noPreparationRadio) { - MovieMakerTool.this.streamingRadioPerformed(evt); - } - } - }// //GEN-END:initComponents + final QuickTimeWriter.VideoFormat videoFormat; + switch (compressionBox.getSelectedIndex()) { + case 0: + videoFormat = QuickTimeWriter.VideoFormat.RAW; + break; + case 1: + videoFormat = QuickTimeWriter.VideoFormat.RLE; + break; + case 2: + videoFormat = QuickTimeWriter.VideoFormat.JPG; + break; + case 3: + default: + videoFormat = QuickTimeWriter.VideoFormat.PNG; + break; + } - private void chooseImageFolder(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chooseImageFolder - if (imageFolderChooser == null) { - imageFolderChooser = new JFileChooser(); - imageFolderChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - if (imageFolderField.getText().length() > 0) { - imageFolderChooser.setSelectedFile(new File(imageFolderField.getText())); - } else if (soundFileField.getText().length() > 0) { - imageFolderChooser.setCurrentDirectory(new File(soundFileField.getText()).getParentFile()); - } - } - if (JFileChooser.APPROVE_OPTION == imageFolderChooser.showOpenDialog(this)) { - imageFolderField.setText(imageFolderChooser.getSelectedFile().getPath()); - } - }//GEN-LAST:event_chooseImageFolder + // --------------------------------- + // Update Preferences + // --------------------------------- + prefs.put("movie.imageFolder", imageFolderField.getText()); + prefs.put("movie.soundFile", soundFileField.getText()); + prefs.putInt("movie.width", width); + prefs.putInt("movie.height", height); + prefs.putDouble("movie.fps", fps); + prefs.putInt("movie.compression", compressionBox.getSelectedIndex()); +// prefs.putBoolean("movie.passThrough", passThroughCheckBox.isSelected()); - private void chooseSoundFile(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chooseSoundFile - if (soundFileChooser == null) { - soundFileChooser = new JFileChooser(); - if (soundFileField.getText().length() > 0) { - soundFileChooser.setSelectedFile(new File(soundFileField.getText())); - } else if (imageFolderField.getText().length() > 0) { - soundFileChooser.setCurrentDirectory(new File(imageFolderField.getText())); - } - } - if (JFileChooser.APPROVE_OPTION == soundFileChooser.showOpenDialog(this)) { - soundFileField.setText(soundFileChooser.getSelectedFile().getPath()); - } - }//GEN-LAST:event_chooseSoundFile - private void createMovie(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createMovie - // --------------------------------- - // Check input - // --------------------------------- - final File soundFile = soundFileField.getText().trim().length() == 0 ? null : new File(soundFileField.getText().trim()); - final File imageFolder = imageFolderField.getText().trim().length() == 0 ? null : new File(imageFolderField.getText().trim()); - final String streaming = prefs.get("movie.streaming", "fastStartCompressed"); - if (soundFile == null && imageFolder == null) { - JOptionPane.showMessageDialog(this, "You need to specify a folder with
image files and/or a sound file."); - return; + // --------------------------------- + // Choose an output file + // --------------------------------- + if (movieFileChooser == null) { + movieFileChooser = new JFileChooser(); + if (prefs.get("movie.outputFile", null) != null) { + movieFileChooser.setSelectedFile(new File(prefs.get("movie.outputFile", null))); + } else { + if (imageFolderField.getText().length() > 0) { + movieFileChooser.setCurrentDirectory(new File(imageFolderField.getText()).getParentFile()); + } else if (soundFileField.getText().length() > 0) { + movieFileChooser.setCurrentDirectory(new File(soundFileField.getText()).getParentFile()); } + } + } + if (JFileChooser.APPROVE_OPTION != movieFileChooser.showSaveDialog(this)) { + return; + } - final int width, height; - final double fps; + final File movieFile = movieFileChooser.getSelectedFile().getPath().toLowerCase().endsWith(".mov")// + ? movieFileChooser.getSelectedFile() + : new File(movieFileChooser.getSelectedFile().getPath() + ".mov"); + prefs.put("movie.outputFile", movieFile.getPath()); + createMovieButton.setEnabled(false); + + final boolean passThrough = passThroughCheckBox.isSelected(); + + // --------------------------------- + // Create the QuickTime movie + // --------------------------------- + SwingWorker w = new SwingWorker() { + + @Override + protected Object doInBackground() { try { - width = Integer.parseInt(widthField.getText()); - height = Integer.parseInt(heightField.getText()); - fps = Double.parseDouble(fpsField.getText()); + + // Read image files + File[] imgFiles = null; + if (imageFolder != null) { + imgFiles = imageFolder.listFiles(new FileFilter() { + + FileSystemView fsv = FileSystemView.getFileSystemView(); + + public boolean accept(File f) { + return f.isFile() && !fsv.isHiddenFile(f) && !f.getName().equals("Thumbs.db"); + } + }); + Arrays.sort(imgFiles); + } + +// // Check on first image, if we can actually do pass through +// if (passThrough) { +// } + + // Delete movie file if it already exists. + if (movieFile.exists()) { + movieFile.delete(); + } + + if (imageFolder != null && soundFile != null) { + writeVideoAndAudio(movieFile, imgFiles, soundFile, width, height, fps, videoFormat, passThrough, streaming); + } else if (imageFolder != null) { + writeVideoOnlyVFR(movieFile, imgFiles, width, height, fps, videoFormat, passThrough, streaming); + } else { + writeAudioOnly(movieFile, soundFile, streaming); + + } + return null; } catch (Throwable t) { - JOptionPane.showMessageDialog(this, "Width, Height and FPS must be numeric."); - return; - } - if (width < 1 || height < 1 || fps < 1) { - JOptionPane.showMessageDialog(this, "Width, Height and FPS must be greater than zero."); - return; + return t; } + } - final QuickTimeWriter.VideoFormat videoFormat; - switch (compressionBox.getSelectedIndex()) { - case 0: - videoFormat = QuickTimeWriter.VideoFormat.RAW; - break; - case 1: - videoFormat = QuickTimeWriter.VideoFormat.RLE; - break; - case 2: - videoFormat = QuickTimeWriter.VideoFormat.JPG; - break; - case 3: - default: - videoFormat = QuickTimeWriter.VideoFormat.PNG; - break; - } - - // --------------------------------- - // Update Preferences - // --------------------------------- - prefs.put("movie.imageFolder", imageFolderField.getText()); - prefs.put("movie.soundFile", soundFileField.getText()); - prefs.putInt("movie.width", width); - prefs.putInt("movie.height", height); - prefs.putDouble("movie.fps", fps); - prefs.putInt("movie.compression", compressionBox.getSelectedIndex()); - prefs.putBoolean("movie.passThrough", passThroughCheckBox.isSelected()); - - - // --------------------------------- - // Choose an output file - // --------------------------------- - if (movieFileChooser == null) { - movieFileChooser = new JFileChooser(); - if (prefs.get("movie.outputFile", null) != null) { - movieFileChooser.setSelectedFile(new File(prefs.get("movie.outputFile", null))); - } else { - if (imageFolderField.getText().length() > 0) { - movieFileChooser.setCurrentDirectory(new File(imageFolderField.getText()).getParentFile()); - } else if (soundFileField.getText().length() > 0) { - movieFileChooser.setCurrentDirectory(new File(soundFileField.getText()).getParentFile()); - } - } - } - if (JFileChooser.APPROVE_OPTION != movieFileChooser.showSaveDialog(this)) { - return; - } - - final File movieFile = movieFileChooser.getSelectedFile().getPath().toLowerCase().endsWith(".mov")// - ? movieFileChooser.getSelectedFile() - : new File(movieFileChooser.getSelectedFile().getPath() + ".mov"); - prefs.put("movie.outputFile", movieFile.getPath()); - createMovieButton.setEnabled(false); - - final boolean passThrough = passThroughCheckBox.isSelected(); - - // --------------------------------- - // Create the QuickTime movie - // --------------------------------- - SwingWorker w = new SwingWorker() { - - @Override - protected Object doInBackground() { - try { - - // Read image files - File[] imgFiles = null; - if (imageFolder != null) { - imgFiles = imageFolder.listFiles(new FileFilter() { - - FileSystemView fsv = FileSystemView.getFileSystemView(); - - public boolean accept(File f) { - return f.isFile() && !fsv.isHiddenFile(f) && !f.getName().equals("Thumbs.db"); - } - }); - Arrays.sort(imgFiles); - } - - // Check on first image, if we can actually do pass through - if (passThrough) { - } - - // Delete movie file if it already exists. - if (movieFile.exists()) { - movieFile.delete(); - } - - if (imageFolder != null && soundFile != null) { - writeVideoAndAudio(movieFile, imgFiles, soundFile, width, height, fps, videoFormat, passThrough, streaming); - } else if (imageFolder != null) { - writeVideoOnlyVFR(movieFile, imgFiles, width, height, fps, videoFormat, passThrough, streaming); - } else { - writeAudioOnly(movieFile, soundFile, streaming); - - } - return null; - } catch (Throwable t) { - return t; - } - } - - @Override - protected void done() { - Object o; - try { - o = get(); - } catch (Exception ex) { - o = ex; - } - if (o instanceof Throwable) { - Throwable t = (Throwable) o; - t.printStackTrace(); - JOptionPane.showMessageDialog(MovieMakerTool.this, "Creating the QuickTime Movie failed.
" + (t.getMessage() == null ? t.toString() : t.getMessage()), "Sorry", JOptionPane.ERROR_MESSAGE); - } - createMovieButton.setEnabled(true); - } - }; - w.execute(); - - - }//GEN-LAST:event_createMovie - - private void streamingRadioPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_streamingRadioPerformed - prefs.put("movie.streaming", evt.getActionCommand()); - }//GEN-LAST:event_streamingRadioPerformed - - /** variable frame rate. */ - private void writeVideoOnlyVFR(File movieFile, File[] imgFiles, int width, int height, double fps, QuickTimeWriter.VideoFormat videoFormat, boolean passThrough, String streaming) throws IOException { - File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); - ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Creating Output File...", 0, imgFiles.length); - Graphics2D g = null; - BufferedImage img = null; - BufferedImage prevImg = null; - int[] data = null; - int[] prevData = null; - QuickTimeWriter qtOut = null; + @Override + protected void done() { + Object o; try { - int timeScale = (int) (fps * 100.0); - int duration = 100; - - qtOut = new QuickTimeWriter(videoFormat == QuickTimeWriter.VideoFormat.RAW ? movieFile : tmpFile); - qtOut.addVideoTrack(videoFormat, timeScale, width, height); - qtOut.setSyncInterval(0, 30); - - if (!passThrough) { - img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); - data = ((DataBufferInt) img.getRaster().getDataBuffer()).getData(); - prevImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); - prevData = ((DataBufferInt) prevImg.getRaster().getDataBuffer()).getData(); - g = img.createGraphics(); - g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - } - int prevImgDuration = 0; - for (int i = 0; i < imgFiles.length && !p.isCanceled(); i++) { - File f = imgFiles[i]; - p.setNote("Processing " + f.getName()); - p.setProgress(i); - - if (passThrough) { - qtOut.writeSample(0, f, duration); - } else { - BufferedImage fImg = ImageIO.read(f); - g.drawImage(fImg, 0, 0, width, height, null); - if (i != 0 && Arrays.equals(data, prevData)) { - prevImgDuration += duration; - } else { - if (prevImgDuration != 0) { - qtOut.writeFrame(0, prevImg, prevImgDuration); - } - prevImgDuration = duration; - System.arraycopy(data, 0, prevData, 0, data.length); - } - } - } - if (prevImgDuration != 0) { - qtOut.writeFrame(0, prevImg, prevImgDuration); - } - if (streaming.equals("fastStart")) { - qtOut.toWebOptimizedMovie(movieFile, false); - tmpFile.delete(); - } else if (streaming.equals("fastStartCompressed")) { - qtOut.toWebOptimizedMovie(movieFile, true); - tmpFile.delete(); - } - qtOut.close(); - qtOut = null; - } finally { - p.close(); - if (g != null) { - g.dispose(); - } - if (img != null) { - img.flush(); - } - if (qtOut != null) { - qtOut.close(); - } + o = get(); + } catch (Exception ex) { + o = ex; } - } + if (o instanceof Throwable) { + Throwable t = (Throwable) o; + t.printStackTrace(); + JOptionPane.showMessageDialog(MovieMakerTool.this, "Creating the QuickTime Movie failed.
" + (t.getMessage() == null ? t.toString() : t.getMessage()), "Sorry", JOptionPane.ERROR_MESSAGE); + } + createMovieButton.setEnabled(true); + } + }; + w.execute(); - /** fixed framerate. */ - /* + + }//GEN-LAST:event_createMovie + +// private void streamingRadioPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_streamingRadioPerformed +// prefs.put("movie.streaming", evt.getActionCommand()); +// }//GEN-LAST:event_streamingRadioPerformed + + /** variable frame rate. */ + private void writeVideoOnlyVFR(File movieFile, File[] imgFiles, int width, int height, double fps, QuickTimeWriter.VideoFormat videoFormat, boolean passThrough, String streaming) throws IOException { + File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); + ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Creating Output File...", 0, imgFiles.length); + Graphics2D g = null; + BufferedImage img = null; + BufferedImage prevImg = null; + int[] data = null; + int[] prevData = null; + QuickTimeWriter qtOut = null; + try { + int timeScale = (int) (fps * 100.0); + int duration = 100; + + qtOut = new QuickTimeWriter(videoFormat == QuickTimeWriter.VideoFormat.RAW ? movieFile : tmpFile); + qtOut.addVideoTrack(videoFormat, timeScale, width, height); + qtOut.setSyncInterval(0, 30); + + if (!passThrough) { + img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + data = ((DataBufferInt) img.getRaster().getDataBuffer()).getData(); + prevImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + prevData = ((DataBufferInt) prevImg.getRaster().getDataBuffer()).getData(); + g = img.createGraphics(); + g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + } + int prevImgDuration = 0; + for (int i = 0; i < imgFiles.length && !p.isCanceled(); i++) { + File f = imgFiles[i]; + p.setNote("Processing " + f.getName()); + p.setProgress(i); + + if (passThrough) { + qtOut.writeSample(0, f, duration); + } else { + BufferedImage fImg = ImageIO.read(f); + g.drawImage(fImg, 0, 0, width, height, null); + if (i != 0 && Arrays.equals(data, prevData)) { + prevImgDuration += duration; + } else { + if (prevImgDuration != 0) { + qtOut.writeFrame(0, prevImg, prevImgDuration); + } + prevImgDuration = duration; + System.arraycopy(data, 0, prevData, 0, data.length); + } + } + } + if (prevImgDuration != 0) { + qtOut.writeFrame(0, prevImg, prevImgDuration); + } + if (streaming.equals("fastStart")) { + qtOut.toWebOptimizedMovie(movieFile, false); + tmpFile.delete(); + } else if (streaming.equals("fastStartCompressed")) { + qtOut.toWebOptimizedMovie(movieFile, true); + tmpFile.delete(); + } + qtOut.close(); + qtOut = null; + } finally { + p.close(); + if (g != null) { + g.dispose(); + } + if (img != null) { + img.flush(); + } + if (qtOut != null) { + qtOut.close(); + } + } + } + + /** fixed framerate. */ + /* private void writeVideoOnlyFFR(File movieFile, File[] imgFiles, int width, int height, double fps, QuickTimeWriter.VideoFormat videoFormat, boolean passThrough, String streaming) throws IOException { File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Creating Output File...", 0, imgFiles.length); @@ -649,242 +682,237 @@ public class MovieMakerTool extends javax.swing.JFrame { } } } - */ + */ - private void writeAudioOnly(File movieFile, File audioFile, String streaming) throws IOException { - File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); + private void writeAudioOnly(File movieFile, File audioFile, String streaming) throws IOException { + File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); - int length = (int) Math.min(Integer.MAX_VALUE, audioFile.length()); // file length is used for a rough progress estimate. This will only work for uncompressed audio. - ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Initializing...", 0, length); - AudioInputStream audioIn = null; - QuickTimeWriter qtOut = null; + int length = (int) Math.min(Integer.MAX_VALUE, audioFile.length()); // file length is used for a rough progress estimate. This will only work for uncompressed audio. + ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Initializing...", 0, length); + AudioInputStream audioIn = null; + QuickTimeWriter qtOut = null; - try { - qtOut = new QuickTimeWriter(tmpFile); - if (audioFile.getName().toLowerCase().endsWith(".mp3")) { - audioIn = new MP3AudioInputStream(audioFile); - } else { - audioIn = AudioSystem.getAudioInputStream(audioFile); - } - AudioFormat audioFormat = audioIn.getFormat(); - //System.out.println("QuickTimeMovieMakerMain " + audioFormat); - qtOut.addAudioTrack(audioFormat); - boolean isVBR = audioFormat.getProperty("vbr") != null && ((Boolean) audioFormat.getProperty("vbr")).booleanValue(); - int asSize = audioFormat.getFrameSize(); - int nbOfFramesInBuffer = isVBR ? 1 : Math.max(1, 1024 / asSize); - int asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); - //System.out.println(" frameDuration=" + asDuration); - long count = 0; - byte[] audioBuffer = new byte[asSize * nbOfFramesInBuffer]; - for (int bytesRead = audioIn.read(audioBuffer); bytesRead - != -1; bytesRead = audioIn.read(audioBuffer)) { - if (bytesRead != 0) { - int framesRead = bytesRead / asSize; - qtOut.writeSamples(0, framesRead, audioBuffer, 0, bytesRead, asDuration); - count += bytesRead; - p.setProgress((int) count); - } - if (isVBR) { - audioFormat = audioIn.getFormat(); - if (audioFormat == null) { - break; - } - asSize = audioFormat.getFrameSize(); - asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); - if (audioBuffer.length < asSize) { - audioBuffer = new byte[asSize]; - } - } - } - audioIn.close(); - audioIn = null; - if (streaming.equals("fastStart")) { - qtOut.toWebOptimizedMovie(movieFile, false); - tmpFile.delete(); - } else if (streaming.equals("fastStartCompressed")) { - qtOut.toWebOptimizedMovie(movieFile, true); - tmpFile.delete(); - } - qtOut.close(); - qtOut = null; - } catch (UnsupportedAudioFileException e) { - IOException ioe = new IOException(e.getMessage()); - ioe.initCause(e); - throw ioe; - } finally { - p.close(); - if (audioIn != null) { - audioIn.close(); - } - if (qtOut != null) { - qtOut.close(); - } + try { + qtOut = new QuickTimeWriter(tmpFile); + if (audioFile.getName().toLowerCase().endsWith(".mp3")) { + audioIn = new MP3AudioInputStream(audioFile); + } else { + audioIn = AudioSystem.getAudioInputStream(audioFile); + } + AudioFormat audioFormat = audioIn.getFormat(); + //System.out.println("QuickTimeMovieMakerMain " + audioFormat); + qtOut.addAudioTrack(audioFormat); + boolean isVBR = audioFormat.getProperty("vbr") != null && ((Boolean) audioFormat.getProperty("vbr")).booleanValue(); + int asSize = audioFormat.getFrameSize(); + int nbOfFramesInBuffer = isVBR ? 1 : Math.max(1, 1024 / asSize); + int asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); + //System.out.println(" frameDuration=" + asDuration); + long count = 0; + byte[] audioBuffer = new byte[asSize * nbOfFramesInBuffer]; + for (int bytesRead = audioIn.read(audioBuffer); bytesRead + != -1; bytesRead = audioIn.read(audioBuffer)) { + if (bytesRead != 0) { + int framesRead = bytesRead / asSize; + qtOut.writeSamples(0, framesRead, audioBuffer, 0, bytesRead, asDuration); + count += bytesRead; + p.setProgress((int) count); } - } - - private void writeVideoAndAudio(File movieFile, File[] imgFiles, File audioFile, int width, int height, double fps, QuickTimeWriter.VideoFormat videoFormat, boolean passThrough, String streaming) throws IOException { - File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); - ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Creating Output File...", 0, imgFiles.length); - AudioInputStream audioIn = null; - QuickTimeWriter qtOut = null; - BufferedImage imgBuffer = null; - Graphics2D g = null; - - try { - // Determine audio format - if (audioFile.getName().toLowerCase().endsWith(".mp3")) { - audioIn = new MP3AudioInputStream(audioFile); - } else { - audioIn = AudioSystem.getAudioInputStream(audioFile); - } - AudioFormat audioFormat = audioIn.getFormat(); - boolean isVBR = audioFormat.getProperty("vbr") != null && ((Boolean) audioFormat.getProperty("vbr")).booleanValue(); - - // Determine duration of a single sample - int asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); - int vsDuration = 100; - // Create writer - qtOut = new QuickTimeWriter(videoFormat == QuickTimeWriter.VideoFormat.RAW ? movieFile : tmpFile); - qtOut.addAudioTrack(audioFormat); // audio in track 0 - qtOut.addVideoTrack(videoFormat, (int) (fps * vsDuration), width, height); // video in track 1 - - // Create audio buffer - int asSize; - byte[] audioBuffer; - if (isVBR) { - // => variable bit rate: create audio buffer for a single frame - asSize = audioFormat.getFrameSize(); - audioBuffer = new byte[asSize]; - } else { - // => fixed bit rate: create audio buffer for half a second - asSize = audioFormat.getChannels() * audioFormat.getSampleSizeInBits() / 8; - audioBuffer = new byte[(int) (qtOut.getMediaTimeScale(0) / 2 * asSize)]; - } - - // Create video buffer - if (!passThrough) { - imgBuffer = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); - g = imgBuffer.createGraphics(); - g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - } // Main loop - int movieTime = 0; - int imgIndex = 0; - boolean isAudioDone = false; - while ((imgIndex < imgFiles.length || !isAudioDone) && !p.isCanceled()) { - // Advance movie time by half a second (we interleave twice per second) - movieTime += qtOut.getMovieTimeScale() / 2; - - // Advance audio to movie time + 1 second (audio must be ahead of video by 1 second) - while (!isAudioDone && qtOut.getTrackDuration(0) < movieTime + qtOut.getMovieTimeScale()) { - int len = audioIn.read(audioBuffer); - if (len == -1) { - isAudioDone = true; - } else { - qtOut.writeSamples(0, len / asSize, audioBuffer, 0, len, asDuration); - } - if (isVBR) { - // => variable bit rate: format can change at any time - audioFormat = audioIn.getFormat(); - if (audioFormat == null) { - break; - } - asSize = audioFormat.getFrameSize(); - asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); - if (audioBuffer.length < asSize) { - audioBuffer = new byte[asSize]; - } - } - } - - // Advance video to movie time - while (imgIndex < imgFiles.length && qtOut.getTrackDuration(1) < movieTime) { - // catch up with video time - p.setProgress(imgIndex); - p.setNote("Processing " + imgFiles[imgIndex].getName()); - if (passThrough) { - qtOut.writeSample(1, imgFiles[imgIndex], vsDuration); - } else { - BufferedImage fImg = ImageIO.read(imgFiles[imgIndex]); - if (fImg == null) { - continue; - } - g.drawImage(fImg, 0, 0, width, height, null); - fImg.flush(); - qtOut.writeFrame(1, imgBuffer, vsDuration); - } - ++imgIndex; - } - } - if (streaming.equals("fastStart")) { - qtOut.toWebOptimizedMovie(movieFile, false); - tmpFile.delete(); - } else if (streaming.equals("fastStartCompressed")) { - qtOut.toWebOptimizedMovie(movieFile, true); - tmpFile.delete(); - } - qtOut.close(); - qtOut = null; - } catch (UnsupportedAudioFileException e) { - IOException ioe = new IOException(e.getMessage()); - ioe.initCause(e); - throw ioe; - } finally { - p.close(); - if (qtOut != null) { - qtOut.close(); - } - if (audioIn != null) { - audioIn.close(); - - } - if (g != null) { - g.dispose(); - - - } - if (imgBuffer != null) { - imgBuffer.flush(); - - - } + if (isVBR) { + audioFormat = audioIn.getFormat(); + if (audioFormat == null) { + break; + } + asSize = audioFormat.getFrameSize(); + asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); + if (audioBuffer.length < asSize) { + audioBuffer = new byte[asSize]; + } } + } + audioIn.close(); + audioIn = null; + if (streaming.equals("fastStart")) { + qtOut.toWebOptimizedMovie(movieFile, false); + tmpFile.delete(); + } else if (streaming.equals("fastStartCompressed")) { + qtOut.toWebOptimizedMovie(movieFile, true); + tmpFile.delete(); + } + qtOut.close(); + qtOut = null; + } catch (UnsupportedAudioFileException e) { + IOException ioe = new IOException(e.getMessage()); + ioe.initCause(e); + throw ioe; + } finally { + p.close(); + if (audioIn != null) { + audioIn.close(); + } + if (qtOut != null) { + qtOut.close(); + } } + } - /** - * @param args the command line arguments - */ - public static void main(String args[]) { - java.awt.EventQueue.invokeLater(new Runnable() { - public void run() { - MovieMakerTool m = new MovieMakerTool(); - m.setVisible(true); - m.pack(); + private void writeVideoAndAudio(File movieFile, File[] imgFiles, File audioFile, int width, int height, double fps, QuickTimeWriter.VideoFormat videoFormat, boolean passThrough, String streaming) throws IOException { + File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp"); + ProgressMonitor p = new ProgressMonitor(MovieMakerTool.this, "Creating " + movieFile.getName(), "Creating Output File...", 0, imgFiles.length); + AudioInputStream audioIn = null; + QuickTimeWriter qtOut = null; + BufferedImage imgBuffer = null; + Graphics2D g = null; + + try { + // Determine audio format + if (audioFile.getName().toLowerCase().endsWith(".mp3")) { + audioIn = new MP3AudioInputStream(audioFile); + } else { + audioIn = AudioSystem.getAudioInputStream(audioFile); + } + AudioFormat audioFormat = audioIn.getFormat(); + boolean isVBR = audioFormat.getProperty("vbr") != null && ((Boolean) audioFormat.getProperty("vbr")).booleanValue(); + + // Determine duration of a single sample + int asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); + int vsDuration = 100; + // Create writer + qtOut = new QuickTimeWriter(videoFormat == QuickTimeWriter.VideoFormat.RAW ? movieFile : tmpFile); + qtOut.addAudioTrack(audioFormat); // audio in track 0 + qtOut.addVideoTrack(videoFormat, (int) (fps * vsDuration), width, height); // video in track 1 + + // Create audio buffer + int asSize; + byte[] audioBuffer; + if (isVBR) { + // => variable bit rate: create audio buffer for a single frame + asSize = audioFormat.getFrameSize(); + audioBuffer = new byte[asSize]; + } else { + // => fixed bit rate: create audio buffer for half a second + asSize = audioFormat.getChannels() * audioFormat.getSampleSizeInBits() / 8; + audioBuffer = new byte[(int) (qtOut.getMediaTimeScale(0) / 2 * asSize)]; + } + + // Create video buffer + if (!passThrough) { + imgBuffer = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + g = imgBuffer.createGraphics(); + g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + } // Main loop + int movieTime = 0; + int imgIndex = 0; + boolean isAudioDone = false; + while ((imgIndex < imgFiles.length || !isAudioDone) && !p.isCanceled()) { + // Advance movie time by half a second (we interleave twice per second) + movieTime += qtOut.getMovieTimeScale() / 2; + + // Advance audio to movie time + 1 second (audio must be ahead of video by 1 second) + while (!isAudioDone && qtOut.getTrackDuration(0) < movieTime + qtOut.getMovieTimeScale()) { + int len = audioIn.read(audioBuffer); + if (len == -1) { + isAudioDone = true; + } else { + qtOut.writeSamples(0, len / asSize, audioBuffer, 0, len, asDuration); + } + if (isVBR) { + // => variable bit rate: format can change at any time + audioFormat = audioIn.getFormat(); + if (audioFormat == null) { + break; } - }); + asSize = audioFormat.getFrameSize(); + asDuration = (int) (audioFormat.getSampleRate() / audioFormat.getFrameRate()); + if (audioBuffer.length < asSize) { + audioBuffer = new byte[asSize]; + } + } + } + + // Advance video to movie time + while (imgIndex < imgFiles.length && qtOut.getTrackDuration(1) < movieTime) { + // catch up with video time + p.setProgress(imgIndex); + p.setNote("Processing " + imgFiles[imgIndex].getName()); + if (passThrough) { + qtOut.writeSample(1, imgFiles[imgIndex], vsDuration); + } else { + BufferedImage fImg = ImageIO.read(imgFiles[imgIndex]); + if (fImg == null) { + continue; + } + g.drawImage(fImg, 0, 0, width, height, null); + fImg.flush(); + qtOut.writeFrame(1, imgBuffer, vsDuration); + } + ++imgIndex; + } + } + if (streaming.equals("fastStart")) { + qtOut.toWebOptimizedMovie(movieFile, false); + tmpFile.delete(); + } else if (streaming.equals("fastStartCompressed")) { + qtOut.toWebOptimizedMovie(movieFile, true); + tmpFile.delete(); + } + qtOut.close(); + qtOut = null; + } catch (UnsupportedAudioFileException e) { + IOException ioe = new IOException(e.getMessage()); + ioe.initCause(e); + throw ioe; + } finally { + p.close(); + if (qtOut != null) { + qtOut.close(); + } + if (audioIn != null) { + audioIn.close(); + } + if (g != null) { + g.dispose(); + } + if (imgBuffer != null) { + imgBuffer.flush(); + } } - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLabel aboutLabel; - private javax.swing.JButton chooseImageFolderButton; - private javax.swing.JButton chooseSoundFileButton; - private javax.swing.JComboBox compressionBox; - private javax.swing.JLabel compressionLabel; - private javax.swing.JButton createMovieButton; - private javax.swing.JRadioButton fastStartCompressedRadio; - private javax.swing.JRadioButton fastStartRadio; - private javax.swing.JTextField fpsField; - private javax.swing.JLabel fpsLabel; - private javax.swing.JTextField heightField; - private javax.swing.JLabel heightLabel; - private javax.swing.JTextField imageFolderField; - private javax.swing.JLabel imageFolderHelpLabel; - private javax.swing.JRadioButton noPreparationRadio; - private javax.swing.JCheckBox passThroughCheckBox; - private javax.swing.JTextField soundFileField; - private javax.swing.JLabel soundFileHelpLable; - private javax.swing.ButtonGroup streamingGroup; - private javax.swing.JLabel streamingLabel; - private javax.swing.JTextField widthField; - private javax.swing.JLabel widthLabel; - // End of variables declaration//GEN-END:variables + } + +// /** +// * @param args the command line arguments +// */ + public static void main(String args[]) { + java.awt.EventQueue.invokeLater(new Runnable() { + public void run() { + MovieMakerTool m = new MovieMakerTool(); + m.init(null); + m.setVisible(true); +// m.pack(); + } + }); + } + + private JLabel aboutLabel; + private JButton chooseImageFolderButton; + private JButton chooseSoundFileButton; + private JComboBox compressionBox; + private JLabel compressionLabel; +// private JRadioButton fastStartCompressedRadio; +// private JRadioButton fastStartRadio; + private JTextField fpsField; + private JLabel fpsLabel; + private JTextField heightField; + private JLabel heightLabel; + private JTextField imageFolderField; + private JLabel imageFolderHelpLabel; +// private JRadioButton noPreparationRadio; + private JCheckBox passThroughCheckBox; + private JTextField soundFileField; + private JLabel soundFileHelpLable; +// private ButtonGroup streamingGroup; +// private JLabel streamingLabel; + private JTextField widthField; + private JLabel widthLabel; +// private JLabel copyrightLabel; + private JButton createMovieButton; }