Merge pull request #333 (one empty line as separator)

added Ogg recipe

code_of_conduct.md

@@ -43,8 +43,8 @@ incident.
 
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+version 1.4.1, available at
+[https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[homepage]: https://www.contributor-covenant.org/
+[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

index.html

@@ -219,7 +219,7 @@
     <div class="hiding">
       <h3>Rewrap DV video to .dv file</h3>
       <p><code>ffmpeg -i <i>input_file</i> -f rawvideo -c:v copy <i>output_file.dv</i></code></p>
-      <p>This script will take a video that is encoded in the <a href="https://en.wikipedia.org/wiki/DV">DV Codec</a> but wrapped in a different container (such as MOV) and rewrap it into a raw DV file (with the .dv extension). Since DV files potentially contain a great deal of provenance metadata within the DV stream, it is necessary to rewrap files in this method to avoid unintentional stripping of this metadata.</p>
+      <p>This script will take a video that is encoded in the <a href="https://en.wikipedia.org/wiki/DV" target="_blank">DV Codec</a> but wrapped in a different container (such as MOV) and rewrap it into a raw DV file (with the .dv extension). Since DV files potentially contain a great deal of provenance metadata within the DV stream, it is necessary to rewrap files in this method to avoid unintentional stripping of this metadata.</p>
       <dl>
         <dt>ffmpeg</dt><dd>starts the command</dd>
         <dt>-i <i>input_file</i></dt><dd>path and name of the input file</dd>
@@ -412,6 +412,26 @@
     </div>
     <!-- ends Transcode to H.265 -->
 
+    <!-- Transcode to Ogg/Theora -->
+    <label class="recipe" for="transcode_ogg">Transcode to an Ogg Theora</label>
+    <input type="checkbox" id="transcode_ogg">
+    <div class="hiding">
+      <h3>Transcode to Ogg/Theora</h3>
+      <p><code>ffmpeg -i <i>input_file</i> -acodec libvorbis -b:v 690k <i>output_file</i></code></p>
+      <p>This command takes an input file and transcodes it to Ogg/Theora in an .ogv wrapper with 690k video bitrate.</p>
+      <p><b>Note:</b> FFmpeg must be installed with support for Ogg Theora. If you are using Homebrew, you can check with <code>brew info ffmpeg</code> and then update it with <code>brew upgrade ffmpeg --with-theora --with-libvorbis</code> if necessary.</p>
+      <dl>
+        <dt>ffmpeg</dt><dd>starts the command</dd>
+        <dt>-i <i>input file</i></dt><dd>path, name and extension of the input file</dd>
+        <dt>-acodec libvorbis</dt><dd>tells FFmpeg to encode the audio using libvorbis</dd>
+        <dt>-b:v 690k</dt><dd>specifies the 690k video bitrate</dd>
+        <dt><i>output file</i></dt><dd>path, name and extension of the output file (make sure to include the <code>.ogv</code> filename suffix)</dd>
+      </dl>
+      <p>This recipe is based on <a href="http://paulrouget.com/e/converttohtml5video">Paul Rouget's recipes</a>.</p>
+      <p class="link"></p>
+    </div>
+    <!-- ends Transcode to Ogg/Theora -->
+
     <p>&nbsp;</p>
     <!-- Here comes audio-only transcoding -->
 
@@ -984,7 +1004,7 @@
       <p>You can speed up or slow down a file using the <code>fps</code> and <code>atempo</code> filters (see also the <a href="https://amiaopensource.github.io/ffmprovisr/#modify_speed">Modify speed</a> command).</p>
       <p>Here's an example of the full command, in which input_1 is 30fps, input_2 is 25fps, and 25fps is the desired output speed.</p>
       <p><code>ffmpeg -i input_1.avi -i input_2.mp4 -filter_complex "[0:v:0] fps=fps=25 [video_to_25fps]; [0:a:0] atempo=(25/30) [audio_to_25fps]; [video_to_25fps] [audio_to_25fps] [1:v:0] [1:a:0] concat=n=2:v=1:a=1 [video_out] [audio_out]" -map "[video_out]" -map "[audio_out]" <i>output_file</i></code></p>
-      <p>Note that the <code>fps</code> filter will drop or repeat frames as necessary in order to achieve the desired frame rate - see the FFmpeg <a href="https://ffmpeg.org/ffmpeg-filters.html#fps-1">fps docs</a> for more details.</p>
+      <p>Note that the <code>fps</code> filter will drop or repeat frames as necessary in order to achieve the desired frame rate - see the FFmpeg <a href="https://ffmpeg.org/ffmpeg-filters.html#fps-1" target="_blank">fps docs</a> for more details.</p>
       <p>For more information, see the <a href="https://trac.ffmpeg.org/wiki/Concatenate#differentcodec" target="_blank">FFmpeg wiki page on concatenating files of different types</a>.</p>
       <p class="link"></p>
     </div>
@@ -2043,7 +2063,7 @@
     <input type="checkbox" id="game_of_life">
     <div class="hiding">
       <h3>Conway's Game of Life</h3>
-      <p>Simulates <a href="https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life">Conway's Game of Life</a></p>
+      <p>Simulates <a href="https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life" target="_blank">Conway's Game of Life</a></p>
       <p><code>ffplay -f lavfi life=s=300x200:mold=10:r=60:ratio=0.1:death_color=#C83232:life_color=#00ff00,scale=1200:800</code></p>
       <dl>
         <dt>ffplay</dt><dd>starts the command</dd>
@@ -2364,29 +2384,29 @@
       <div class="hiding">
         <h3>About ImageMagick</h3>
         <p>ImageMagick is a free and open-source software suite for displaying, converting, and editing raster image and vector image files.</p>
-        <p>It's official website can be found <a href="https://www.imagemagick.org/script/index.php">here</a>.</p>
-        <p>Another great resource with lots of supplemental explanations of filters is available at <a href="http://www.fmwconcepts.com/imagemagick/index.php">Fred's ImageMagick Scripts</a>.</p>
+        <p>It's official website can be found <a href="https://www.imagemagick.org/script/index.php" target="_blank">here</a>.</p>
+        <p>Another great resource with lots of supplemental explanations of filters is available at <a href="http://www.fmwconcepts.com/imagemagick/index.php" target="_blank">Fred's ImageMagick Scripts</a>.</p>
         <p>Unlike many other command line tools, ImageMagick isn't summoned by calling its name. Rather, ImageMagick installs links to several more specific commands: <code>convert</code>, <code>montage</code>, and <code>mogrify</code>, to name a few.</p>
         <p class="link"></p>
       </div>
       <!-- End About ImageMagick -->
 
-      <!-- Resize to width -->
-      <label class="recipe" for="im_resize">Resizes image to specific pixel width</label>
-      <input type="checkbox" id="im_resize">
+      <!-- Compare two images -->
+      <label class="recipe" for="im_compare">Compare two images</label>
+      <input type="checkbox" id="im_compare">
       <div class="hiding">
-        <h3>Resize to width</h3>
-        <p><code>convert <i>input_file.ext</i> -resize 750 <i>output_file.ext</i></code></p>
-        <p>This script will also convert the file format, if the output has a different file extension than the input.</p>
+        <h3>Compare two images</h3>
+        <p><code>compare -metric ae <i>image1.ext image2.ext</i> null:</code></p>
+        <p>Compares two images to each other.</p>
         <dl>
-          <dt>convert</dt><dd>starts the command</dd>
-          <dt>-i <i>input_file.ext</i></dt><dd>path and name of the input file</dd>
-          <dt>-resize 750</dt><dd>resizes the image to 750 pixels wide, retaining aspect ratio</dd>
-          <dt><i>output_file.ext</i></dt><dd>path and name of the output file</dd>
+          <dt>compare</dt><dd>starts the command</dd>
+          <dt>-metric ae</dt><dd>applies the absolute error count metric, returning the number of different pixels. <a href="https://www.imagemagick.org/script/command-line-options.php#metric" target="_blank">Other parameters</a> are available for image comparison.</dd>
+          <dt><i>image1.ext image2.ext</i></dt><dd>takes two images as input</dd>
+          <dt>null:</dt><dd>throws away the comparison image that would be generated</dd>
         </dl>
         <p class="link"></p>
       </div>
-      <!-- ends Resize to width -->  
+      <!-- ends Compare two images -->  
 
       <!-- Create thumbnails -->
       <label class="recipe" for="im_thumbs">Create thumbnails of images</label>
@@ -2425,6 +2445,58 @@
       </div>
       <!-- ends Create grid of images --> 
 
+      <!-- Get file signature data -->
+      <label class="recipe" for="im_sig_data">Get file signature data</label>
+      <input type="checkbox" id="im_sig_data">
+      <div class="hiding">
+        <h3>Get file signature data</h3>
+        <p><code>convert -verbose <i>input_file.ext</i> | grep -i signature </code></p>
+        <p>Gets signature data from an image file, which is a hash that can be used to uniquely identify the image.</p>
+        <dl>
+          <dt>convert</dt><dd>starts the command</dd>
+          <dt>-verbose</dt><dd>sets verbose flag for collecting the most data</dd>
+          <dt><i>input_file.ext</i></dt><dd>path and name of image file</dd>
+          <dt>|</dt><dd>pipe the data into something else</dd>
+          <dt>grep</dt><dd>starts the grep command</dd>
+          <dt>-i signature</dt><dd>ignore case and search for the phrase "signature"</dd>
+        </dl>
+        <p class="link"></p>
+      </div>
+      <!-- ends Get file signature data -->  
+
+      <!-- Remove exif data -->
+      <label class="recipe" for="im_strip">Removes exif metadata</label>
+      <input type="checkbox" id="im_strip">
+      <div class="hiding">
+        <h3>Remove exif data</h3>
+        <p><code>mogrify -path ./stripped/ -strip *.jpg</code></p>
+        <p>Removes (strips) exif data and moves clean files to a new folder.</p>
+        <dl>
+          <dt>mogrify</dt><dd>starts the command</dd>
+          <dt>-path ./stripped/</dt><dd>sets directory within current directory called "stripped"</dd>
+          <dt>-strip</dt><dd>removes exif metadata</dd>
+          <dt>*.jpg</dt><dd>applies command to all .jpgs in current folder</dd>
+        </dl>
+        <p class="link"></p>
+      </div>
+      <!-- ends Remove exif data -->  
+
+      <!-- Resize to width -->
+      <label class="recipe" for="im_resize">Resizes image to specific pixel width</label>
+      <input type="checkbox" id="im_resize">
+      <div class="hiding">
+        <h3>Resize to width</h3>
+        <p><code>convert <i>input_file.ext</i> -resize 750 <i>output_file.ext</i></code></p>
+        <p>This script will also convert the file format, if the output has a different file extension than the input.</p>
+        <dl>
+          <dt>convert</dt><dd>starts the command</dd>
+          <dt>-i <i>input_file.ext</i></dt><dd>path and name of the input file</dd>
+          <dt>-resize 750</dt><dd>resizes the image to 750 pixels wide, retaining aspect ratio</dd>
+          <dt><i>output_file.ext</i></dt><dd>path and name of the output file</dd>
+        </dl>
+        <p class="link"></p>
+      </div>
+      <!-- ends Resize to width -->  
 
     </div>
   </div><!-- ends "content" -->
@@ -2447,7 +2519,7 @@ Change the above data-target field, the hover-over description, the button text,
 <!-- ends sample example -->
 
 <footer class="footer">
-  <p>Made with ♥ at <a href="https://wiki.curatecamp.org/index.php/Association_of_Moving_Image_Archivists_%26_Digital_Library_Federation_Hack_Day_2015" target="_blank">AMIA #AVhack15</a>! Contribute to the project via <a href="https://github.com/amiaopensource/ffmprovisr">our GitHub page</a>!</p>
+  <p>Made with ♥ at <a href="https://wiki.curatecamp.org/index.php/Association_of_Moving_Image_Archivists_%26_Digital_Library_Federation_Hack_Day_2015" target="_blank">AMIA #AVhack15</a>! Contribute to the project via <a href="https://github.com/amiaopensource/ffmprovisr" target="_blank">our GitHub page</a>!</p>
 </footer>
 </div><!-- ends "grid" -->
 </body>

readme.md

@@ -44,7 +44,7 @@ You can read our contributor code of conduct [here](https://github.com/amiaopens
 
 ## Maintainers
 
-[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol), [Reto Kromer](https://github.com/retokromer) and [Andrew Weaver](https://github.com/privatezero)
+[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol) and [Andrew Weaver](https://github.com/privatezero)
 
 ## Contributors
 * Gathered using [octohatrack](https://github.com/LABHR/octohatrack)