Compare commits

...

280 Commits

Author SHA1 Message Date
Ashley
b2d5fcadf3 Merge pull request #315 from amiaopensource/italic
use italic
2018-03-30 11:40:13 -04:00
Reto Kromer
05395f4670 use italic 2018-03-30 10:01:48 +02:00
Ashley
078d20824c Merge pull request #314 from amiaopensource/imagemagick
adds imagemagick section
2018-03-29 13:32:00 -04:00
Ashley Blewer
44c8661e96 subs amp for escaped amp 2018-03-29 13:28:00 -04:00
Ashley Blewer
13bc9bef10 adds imagemagick section 2018-03-29 11:46:02 -04:00
Katherine Frances Nagels
585e0e1f18 Add info on concatenating files of different framerates (#308) 2018-02-18 20:29:35 +01:00
Katherine Frances Nagels
1ef6c3305b Concatenate files of different resolutions (#307) 2018-02-10 09:31:48 +01:00
Katherine Frances Nagels
9c4da4102a Merge pull request #306 from amiaopensource/style
unify coding style
2018-02-10 19:25:31 +13:00
Reto Kromer
c47a7a534f unify coding style 2018-02-10 06:53:13 +01:00
Reto Kromer
4d8fdc9f4e uniform coding style 2018-02-10 06:50:06 +01:00
Reto Kromer
ae590706b0 Merge pull request #305 (Code style: add enclosing quotation marks)
Code style: add enclosing quotation marks
2018-02-10 06:45:22 +01:00
kfrn
e84f0a9fb6 Code style: add enclosing quotation marks 2018-02-10 12:20:21 +13:00
Reto Kromer
e2850d38c0 simplify code (#304) 2018-02-09 21:22:31 +01:00
Reto Kromer
8927478efb Merge pull request #303 (uniform syntax) 2018-02-09 17:06:52 +01:00
Reto Kromer
3c815b1f3b uniform syntax 2018-02-09 16:20:26 +01:00
Ashley
58aa0549ff Merge pull request #301 from amiaopensource/css
replace tabs by spaces
2018-02-05 11:00:11 -05:00
Ashley
4a83b45e7e Merge pull request #302 from amiaopensource/html
fix HTML5
2018-02-05 10:59:59 -05:00
Reto Kromer
f6b44c56ce fix HTML5 2018-02-04 20:58:14 +01:00
Reto Kromer
8149aa163c replace tabs by spaces 2018-02-04 20:45:25 +01:00
Reto Kromer
94f935198f Merge pull request #300 (add alias) 2018-01-25 18:44:17 +01:00
Reto Kromer
c04c9ff12f add alias 2018-01-25 15:55:21 +01:00
Reto Kromer
64787edd4e Merge pull request #299 (Add explanation about input files for join_different_files recipe) 2018-01-25 10:41:06 +01:00
kfrn
f995e8b483 Improve explanation about input files for join_different_files recipe 2018-01-25 18:28:18 +13:00
Katherine Frances Nagels
dea85d1e47 Merge pull request #297 from amiaopensource/uniform_style
uniform style
2018-01-25 07:47:24 +13:00
Reto Kromer
e9fd3fd002 uniform style 2018-01-24 13:16:28 +01:00
Katherine Frances Nagels
debc510205 New recipe: concat files of different types (+ a few fixups) (#296) 2018-01-24 13:10:22 +01:00
Andrew Weaver
32260c405f Add stream md5s (#294) 2018-01-05 18:26:10 +01:00
Reto Kromer
d142564f36 add note about quantisation rates and MD5 (#293) 2017-12-31 09:16:48 +01:00
Reto Kromer
d41674a267 fix typo 2017-12-28 07:07:40 +01:00
Reto Kromer
99450e61de a little housekeeping
- use secure protocol whenever possible
- alignment
2017-12-24 13:19:54 +01:00
Ashley
1fec9b21c8 Merge pull request #290 from amiaopensource/embed-subs
adds embedded subtitles command c/o @federicomenaquintero #289
2017-12-11 09:43:46 -05:00
Ashley Blewer
42189e5b94 capitalize container/sub formats 2017-12-11 09:22:22 -05:00
Ashley
929f92a52a Merge pull request #291 from amiaopensource/mod-strip-metadata
consistent aliases used for strip metadata
2017-12-11 09:16:26 -05:00
Ashley Blewer
02e2f11718 consistent aliases used for strip metadata 2017-12-10 21:41:57 -05:00
Ashley Blewer
10636e24e2 adds embedded subtitles command c/o @federicomenaquintero #289 2017-12-10 21:38:55 -05:00
Reto Kromer
61b890d31c delete double spaces 2017-12-05 21:05:51 +01:00
Reto Kromer
85a79d2eb5 Merge pull request #288 (delete useless spaces) 2017-12-05 21:00:30 +01:00
Reto Kromer
b5ec56174a delete useless spaces 2017-12-05 20:51:45 +01:00
Ashley
f0e0cf8ed3 Merge pull request #286 from amiaopensource/life
adds game of life to test files
2017-12-04 14:31:08 -05:00
Ashley
5c1c336d77 adds extra linebreak 2017-12-04 14:30:35 -05:00
Ashley
d71793583e Merge pull request #285 from amiaopensource/link-to-site-locally
links to website permalink even when loading locally
2017-12-04 14:26:54 -05:00
Ashley
6705bdf41d Merge pull request #282 from amiaopensource/smpte-sine
smpte_sinewave should not end in .wav
2017-12-04 14:26:38 -05:00
Ashley
25e779a59f Merge pull request #284 from amiaopensource/streaming-vs-saving
explains difference between streaming w ffplay and saving w ffmpeg
2017-12-03 21:10:48 -05:00
Ashley
ba0852a957 Merge pull request #287 from amiaopensource/http-patch
link without http wasn't cutting it; threw error
2017-12-03 21:10:25 -05:00
Ashley
88024c040f link without http wasn't cutting it; threw error 2017-12-03 20:02:32 -05:00
Ashley Blewer
3d9b9edf1c adds game of life to test files 2017-12-03 13:31:03 -05:00
Ashley Blewer
c0326ad7d9 links to website permalink even when loading locally 2017-12-03 12:14:33 -05:00
Ashley Blewer
0cb6827b39 explains difference between streaming w ffplay and saving w ffmpeg 2017-12-03 11:52:51 -05:00
Reto Kromer
0d68614c04 Merge pull request #283 (removes extra colon in BRNG recipe description) 2017-12-03 00:08:36 +01:00
Ashley
1e86b70ba4 removes extra colon in BRNG recipe description 2017-12-01 17:55:54 -05:00
Ashley
ced142a215 Merge pull request #281 from amiaopensource/rm-breakall
lifts the break-all and sets a max-width on code for long lines
2017-11-30 16:52:15 -05:00
Ashley
bf301daa71 smpte_sinewave should not end in .wav 2017-11-30 16:23:24 -05:00
Ashley Blewer
278ac2baae allows code to break for small screens only 2017-11-28 16:16:50 -05:00
Ashley Blewer
10b8e4c941 lifts the break-all and sets a max-width on code for long lines 2017-11-28 16:06:43 -05:00
Ashley
1d1b3e4eac Merge pull request #280 from amiaopensource/andrew
adds andrew as maintainer
2017-11-28 14:11:16 -05:00
Ashley Blewer
5a3e437d76 adds andrew as maintainer 2017-11-28 12:38:41 -05:00
Ashley
75a7aa1299 Merge pull request #278 from amiaopensource/modern_HTML
use modern HTML
2017-11-13 15:57:46 +01:00
Reto Kromer
cf13529485 use modern HTML 2017-11-13 15:31:07 +01:00
Katherine Frances Nagels
7c03ae2f80 Add recipes for merging files & cropping video (#277) 2017-11-05 20:13:29 +01:00
Ashley
affae48547 Merge pull request #275 from amiaopensource/break-lines-for-code-blocks
breaks long long lines for code and dt blocks
2017-11-01 11:37:22 -04:00
Ashley Blewer
11ab1ae731 breaks long long lines for code and dt blocks 2017-10-31 22:57:57 -04:00
Ashley
6b324152ac Merge pull request #273 from kfrn/gh-pages
Add max width on example images
2017-10-31 10:45:37 -04:00
kfrn
edaa0a3443 Merge branch 'gh-pages' of https://github.com/amiaopensource/ffmprovisr into gh-pages 2017-10-31 23:33:53 +13:00
kfrn
133f81db8e Add max width on example images 2017-10-31 23:32:32 +13:00
Ashley
634f72213b Merge pull request #272 from kfrn/gh-pages
Fix sizing issue at large resolutions
2017-10-30 22:40:05 -04:00
kfrn
94049d2338 Include CSS grid-template-areas on largest media query 2017-10-31 00:11:42 +13:00
Ashley
46356c3b98 Merge pull request #271 from kfrn/gh-pages
Add entry on stream mapping
2017-10-29 14:27:26 -04:00
kfrn
53d3cf8a74 Add entry on stream mapping 2017-10-30 00:26:37 +13:00
Katherine Frances Nagels
46ffb01181 Merge pull request #269 from kfrn/gh-pages
Remove max width for content <div>
2017-10-23 13:02:59 +13:00
kfrn
fe937d7e4a Remove max width for content <div> 2017-10-23 12:52:44 +13:00
Reto Kromer
2cc48104b1 Merge pull request #268 (nits) 2017-10-19 20:09:49 +02:00
Reto Kromer
7e7942149e nits
- capitalise abbreviation
- uniformise style
2017-10-19 19:42:31 +02:00
Ashley
35a217c20b Merge pull request #265 from amiaopensource/bye-bootstrap
removes reliance on bootstrap; moves necessary code to css/js
2017-10-19 13:16:52 -04:00
Ashley Blewer
ac0697f1c4 gives ID to about section 2017-10-19 09:55:10 -04:00
Ashley Blewer
44ee05bcaf adjust slightly-off alignment near bottom of doc 2017-10-19 08:25:06 -04:00
Ashley Blewer
2e3c0b861b moves links to bottom of recipes, moves flip video image to vid properties 2017-10-19 08:18:47 -04:00
Ashley Blewer
f34858d644 re-fix js for links and firefox sizing weirdness 2017-10-18 20:56:35 -04:00
Ashley Blewer
c18a193973 patches link to command javascript 2017-10-18 17:17:55 -04:00
Ashley Blewer
8cce1275a8 name=one is unnecessary code 2017-10-18 17:14:22 -04:00
Ashley Blewer
fa08a2dbe8 gets more specific about FF word-break bug 2017-10-18 17:09:04 -04:00
Ashley Blewer
09e637e6c4 fix sizing/wordbreak malfunction in firefox 2017-10-18 16:39:26 -04:00
Ashley Blewer
5cb449afcc reduces font-weight and letter-spacing in ToC/recipes 2017-10-18 16:27:54 -04:00
Ashley Blewer
b0f2b62767 breaks lines at word for firefox 2017-10-18 16:25:56 -04:00
Ashley Blewer
48a51a6f6a removes reliance on bootstrap; moves necessary code to css/js 2017-10-18 16:02:04 -04:00
Ashley
c552ffe699 Merge pull request #264 from amiaopensource/patch-create-video-div
patch error in create vid div
2017-10-18 13:38:06 -04:00
Ashley Blewer
f4850a6010 patch error in create vid div 2017-10-18 13:33:21 -04:00
Ashley
0bddb123e1 Merge pull request #263 from amiaopensource/cleans-hover-css
cleans up hover css, keeps text white on hover
2017-10-18 12:34:05 -04:00
Ashley Blewer
66139ce781 cleans up hover css, keeps text white on hover 2017-10-18 12:00:37 -04:00
Ashley
921b75bb2e Merge pull request #262 from amiaopensource/turn-buttons-into-div-rows
changes buttons into div-rows
2017-10-18 11:51:42 -04:00
Ashley Blewer
1e705b4914 add cursor:pointer and adjust transition speed 2017-10-17 21:43:50 -04:00
Ashley Blewer
cf8756ced7 adds position:relative; for the vhs in ToC 2017-10-17 21:17:50 -04:00
Ashley Blewer
c6a579a0bf changes buttons into div-rows 2017-10-17 21:03:04 -04:00
Ashley
494993d4c2 Merge pull request #261 from kfrn/gh-pages
More page reorg: thumbnails/GIFs, audio recipes
2017-10-17 18:29:33 -04:00
kfrn
a472a09597 Move Repair AV Sync recipe into audio section; delete repair section 2017-10-18 08:22:52 +13:00
kfrn
05460bde51 More page reorg: thumbnails/GIFs, audio recipes
- Recipes about creating thumbnails or GIFs now grouped together in the section "Create thumbnails or GIFs"
- New section: "Change or view audio properties". This replaces the previous section "Normalize/equalize audio", combining the recipes that were in that section with other audio recipes.
- Access mp3 with copyright notice recipe moved to "Change codec" section.
2017-10-18 08:15:24 +13:00
Ashley
0c32e03f3a Merge pull request #260 from kfrn/gh-pages
Reorder several sections of the page
2017-10-17 09:58:35 -04:00
kfrn
1ac02df52a Reorder several sections of the page 2017-10-17 18:51:26 +13:00
Ashley
24b8c5ac35 Merge pull request #259 from kfrn/gh-pages
Styling changes
2017-10-15 13:30:45 -04:00
kfrn
9fceb27952 Use same styling for ToC heading & info panel heading 2017-10-15 14:38:36 +13:00
kfrn
1e9629051f Styling changes: sizes/spacing, ToC b'ground, media q for desktop 2017-10-15 13:32:45 +13:00
Katherine Frances Nagels
b5e95143ca Merge pull request #258 from amiaopensource/btn-and-wordbreak
Moves CSS around, fixes overflow error on small devices
2017-10-15 11:26:28 +13:00
Ashley Blewer
0a2e1ca63a moves visual style to local css, simplifies button style to one class, breaks words on small screens 2017-10-14 14:00:28 -04:00
Ashley
21a019612c Merge pull request #256 from amiaopensource/toc-buttons
turns ToC buttons into div link table
2017-10-14 09:18:36 -04:00
Ashley Blewer
80ba7cfaa6 turns ToC buttons into div link table 2017-10-13 23:16:45 -04:00
Ashley
132a00f9e7 Merge pull request #255 from kfrn/gh-pages
More reorg
2017-10-13 19:41:41 -04:00
kfrn
d73ae6a382 New section: perceptual hashing to compare video content 2017-10-14 11:38:26 +13:00
kfrn
f427a05c89 Move 'Record and Live-Stream simultaneously' to 'Other' section
It's not an ideal home for it, but I think it doesn't really belong in the 'Advanced concepts' section, being a command rather than a concept.

I've also made a few small edits to the text of the command.
2017-10-14 11:33:53 +13:00
Ashley
3555a692dc Merge pull request #253 from amiaopensource/rm-modal-extras
we dont need tabindex or role:dialog without the modal
2017-10-13 13:59:14 -04:00
Ashley
11bf8d4de2 Merge branch 'gh-pages' into rm-modal-extras 2017-10-13 13:57:15 -04:00
Ashley
4ccf83b953 Merge pull request #252 from amiaopensource/shorten-button-names
shortens button names
2017-10-13 13:55:46 -04:00
Ashley Blewer
f6be6aa37e we dont need tabindex or role:dialog without the modal 2017-10-13 13:21:20 -04:00
Ashley Blewer
04432d0323 shortens button names 2017-10-13 12:48:37 -04:00
Ashley
ea323d4b01 Merge pull request #250 from amiaopensource/moves-cc-img
moves cc-by img into repo
2017-10-13 09:49:06 -04:00
Ashley
082f9a1175 Merge pull request #248 from amiaopensource/modals-go-inline
modals go inline instead of popup
2017-10-13 09:48:56 -04:00
Ashley Blewer
04776428c8 moves cc-by img into repo 2017-10-12 22:47:58 -04:00
Ashley Blewer
b1f7f5cad4 modals go inline instead of popup 2017-10-12 22:14:47 -04:00
Ashley
6d41096dd5 Merge pull request #247 from amiaopensource/fr-to-perc
changes fractions to percentages in grid template
2017-10-12 22:01:38 -04:00
Ashley
77c31a7c5c Merge pull request #246 from bastibeckr/gh-pages
Add stream-and-record command
2017-10-12 19:29:09 -04:00
Basti Becker
0c9086d70d Update requested changes
Fix HTML, some typos and improve some explanations. Thanks for review.
2017-10-12 12:49:35 +02:00
Ashley Blewer
2b6dfac5b0 changes fractions to percentages in grid template 2017-10-11 21:02:13 -04:00
Basti Becker
ba21f8b88d Add stream-and-record command
I wanted to contribute my livestream-and-record command to this great
collection.
2017-10-11 20:12:39 +02:00
Katherine Frances Nagels
b483acdb6d Merge pull request #244 from kfrn/gh-pages
Fix typo
2017-10-10 21:04:10 +13:00
kfrn
d91fb336b9 Fix typo 2017-10-10 21:02:13 +13:00
Katherine Frances Nagels
97f62ae600 Merge pull request #243 from amiaopensource/make-bigger
initial redesign: grow ffmprovsr
2017-10-10 19:37:16 +13:00
Ashley Blewer
98d2459b79 bring back the charset meta 2017-10-09 09:46:35 -04:00
Ashley Blewer
719e3a73f5 typos in css, again 2017-10-09 09:17:43 -04:00
Ashley Blewer
439f1933da typos in css 2017-10-09 09:16:21 -04:00
Reto Kromer
0f52cde91a info for other OS (#242) 2017-10-09 15:12:39 +02:00
Ashley Blewer
8a14c6e5fb initial redesign: grow ffmprovsr 2017-10-09 09:05:58 -04:00
Katherine Frances Nagels
8c04a58949 Merge pull request #241 from amiaopensource/rm-junk
removes junk that accidentally came into ffmprovisr
2017-10-09 21:43:36 +13:00
Ashley Blewer
6e93313528 removes junk that accidentally came into ffmprovisr 2017-10-08 22:19:46 -04:00
Katherine Frances Nagels
b7bc7218b8 Merge pull request #240 from kfrn/gh-pages
Reorganise some recipes + add filtergraph explanation 'command'
2017-10-08 10:39:35 +13:00
kfrn
7ec21fb6d2 Both info sections at top of page; consistent naming 2017-10-08 09:19:05 +13:00
kfrn
1e2b2dd18f Add target="_blank"s to links; correct to Set Stream Properties recipe
I've replaced the links in the Set Stream Properties recipe with a more specific link.
Also, according to the docs, the correct flag is -color_primaries, not -color_primary.
2017-10-08 01:05:36 +13:00
kfrn
9d4e18e6ef Improve descriptions; ffmpeg → FFmpeg as appropriate
Consistently use FFmpeg to refer to the program and ffmpeg for the command line invocation of the program.
Add another example to the 'asic structure of an FFmpeg command explanation.
Add a note on filter order to the Filtergraph explanation.
2017-10-08 00:47:31 +13:00
kfrn
61681c8dd3 Add basic command explanation; relocate filtergraph explanation
- New section at top: 'Getting started with ffmpeg'. Added basic command explanation under this heading.
- New section at bottom: 'Advanced ffmpeg concepts'. Filtergraph explanation moved there.
2017-10-07 21:35:05 +13:00
kfrn
71e68b5e2e Add filtergraph explanation in new ffmpeg concepts section 2017-10-07 16:02:08 +13:00
kfrn
872eec2aa7 Reorg items: section for GIFs, 'Modify speed' under 'Change Properties' 2017-10-07 14:57:40 +13:00
Katherine Frances Nagels
863f70054d Merge pull request #239 from kfrn/gh-pages
Add basic rewrap command
2017-10-07 10:15:58 +13:00
kfrn
16c8d68e39 Add note on terminology 2017-10-07 00:21:29 +13:00
kfrn
08593bb221 Add basic rewrap command 2017-10-07 00:06:29 +13:00
Ashley
516a78d397 Merge pull request #236 from kfrn/gh-pages
Create more subheadings and reorganise commands
2017-10-04 16:52:10 -04:00
kfrn
89ea7a28bd Rename heading; move recipe; fix broken recipe
- Move 'Set stream properties' to the 'Change video properties' section.
- Heading change: 'Create a video' to 'Create a video from images'. (In the ToC, it's 'Create a video from image(s) and audio')
- 'View Subprogram Info' is fixed (data-target now matches the new ID).
- Consistent capitalisation
2017-10-05 08:59:35 +13:00
kfrn
763e9c594f Add missing </div>; remove comment 2017-10-04 23:11:03 +13:00
kfrn
fd7528a6bd Add 'contents' section at the top of the page
These links wrap a <button> tag and use the "btn" class. To distinguish them from the command buttons that trigger the modals, I've given them a different colour scheme and a different emoji prefix.
2017-10-04 22:22:20 +13:00
kfrn
efd9e55b66 Command name change: 'View Format Info' to 'View ffmpeg subprogram info'
'View format info' seemed to me to be poorly named, what this command actually does is to give details of various libraries, muxers, encoders, etc. 'View ffmpeg subprogram info' may not itself be a totally correct nomenclature, but it's a bit closer to the practical meaning, I think.

Also: a couple of minor text changes.
2017-10-04 21:44:14 +13:00
kfrn
da94557324 Reorganise ffmpeg commands under more/different subheadings 2017-10-04 21:39:18 +13:00
kfrn
f5887473f3 Merge branch 'gh-pages' of https://github.com/amiaopensource/ffmprovisr into gh-pages 2017-10-04 18:20:11 +13:00
Katherine Frances Nagels
17ea63f7b9 Merge pull request #234 from amiaopensource/refactor-headers
refactors headers to be more semantically correct
2017-10-04 09:11:52 +13:00
Ashley Blewer
d7db07bcab refactors headers to be more semantically correct 2017-10-03 12:35:33 -04:00
Katherine Frances Nagels
e92a1cf713 Merge pull request #232 from amiaopensource/html5
cleanup HTML5 code
2017-10-03 07:51:58 +13:00
Reto Kromer
96903f018c cleanup HTML5 2017-10-02 17:45:00 +02:00
Reto Kromer
fcc95ce518 Merge pull request #231 (missing quotes in link) 2017-10-02 15:34:48 +02:00
Reto Kromer
8c349b8282 missing quotes in link 2017-10-02 15:20:27 +02:00
Katherine Frances Nagels
93627e0da2 Stylistic changes; expansion on a small number of commands (#230) 2017-10-02 15:13:57 +02:00
kfrn
593bb63e23 Cleanups: bold post-heading colons, ffmpeg → ffplay/ffprobe as approp.
In several places, ffprobe or ffplay commands said ffmpeg in the command breakdown. This is because of me doing a sloppy cut & paste in a previous commit in this PR.

Previously, colons succeeding a bold 'Notes' mini-heading were not themselves also bold. Reto noted this, and the Chicago Manual of Style does indicate that such colons should also be in bold.
2017-10-03 02:05:00 +13:00
kfrn
3a58b6ae82 Style: add spaces in long filtergraphs; only use italics for inputs
In filtergraphs that are reasonably long or unwieldy, I've added a space after each comma for readability.
In ffmpeg commands, italics should denote user inputs/outputs. Where italics had been used for 'regular' variables (i.e., not an input/output file or a variable for which the user must explicitly choose the value), I've deleted them.

These are stylistic changes that, I think, make things more readable and/or more uniform.
2017-10-03 01:31:23 +13:00
kfrn
11848054a3 Break out commands into subsegments
I've elaborated further on certain commands, and added lines for opening and closing quotation marks for others.
There are also some minor style fixes.
2017-10-03 00:34:47 +13:00
kfrn
c0e9a05e1d Fix-ups: inline links, grammar corrections, etc
I've also moved the link to Dinah Handel's NDSR blog (http://ndsr.nycdigital.org/diving-in-head-first/) next to a different subcommand that it more directly relates to.
2017-10-02 23:41:27 +13:00
Ashley
7cbdd6a074 Merge pull request #229 from kfrn/gh-pages
Downsize large GIFs + add favicon
2017-09-20 10:57:08 -04:00
kfrn
fa1cda441e Add VHS tape favicon 2017-09-19 21:02:22 +12:00
kfrn
7d07c3818a Replace large GIFs with smaller versions 2017-09-19 18:02:23 +12:00
Reto Kromer
3374812782 Merge pull request #225 (check if connected to the web) 2017-08-25 19:01:26 +02:00
Reto Kromer
9c871d760a better description 2017-08-25 16:25:40 +02:00
Reto Kromer
22fa09470b new version 2017-08-25 15:53:28 +02:00
Reto Kromer
9bae51d6a4 delete space 2017-08-25 15:17:38 +02:00
Reto Kromer
b598ed1040 check if connected to the web 2017-08-25 15:15:04 +02:00
Katherine Frances Nagels
23148d4721 Merge pull request #224 from amiaopensource/rectangular
change `modified_e_weighted` to `rectangular`
2017-08-24 11:47:12 +12:00
Reto Kromer
df422912d6 change modified_e_weighted to rectangular 2017-08-23 13:54:21 +02:00
Katherine Frances Nagels
e5f6f5cf2d Merge pull request #223 from amiaopensource/HTML_fixes
HTML fixes
2017-08-21 19:47:33 +12:00
Reto Kromer
96c382943b HTML fixes 2017-08-21 09:41:50 +02:00
Katherine Frances Nagels
ef6e5d07dc Merge pull request #222 from jamessam/gh-pages
add note about dither methods to the audio recipes.
2017-08-21 12:49:09 +12:00
jamessam
bf260c2ee2 redo explanations 2017-08-20 16:48:31 -07:00
jamessam
7f1a765dd8 add note about dither methods to the audio recipes. Recently, I noticed a strange pheonomenon with the previous dither method where the FFMPEG resampler would greatly increase the gain. 2017-08-20 15:46:41 -07:00
Kieran O'Leary
6c85518288 Merge pull request #221 from amiaopensource/kieranjol-typo
split audio/video tracks - match command line with explanation
2017-08-16 01:14:01 +01:00
Kieran O'Leary
63abcd36d0 split audio/video tracks - match command line with explanation
explanation said `0✌️0`, command line said `0:v`
2017-08-16 01:09:00 +01:00
Kieran O'Leary
905b75547b batch processing mac/linux: adds find command - for #207 (#220) 2017-08-15 17:53:47 +02:00
Reto Kromer
7aa124c3d1 fix closing tag 2017-08-08 18:06:07 +02:00
Ashley
50185eb04e Merge pull request #219 from amiaopensource/wordbreak-in-ff
sets wordbreak in firefox for long code
2017-08-07 16:44:12 -04:00
Katherine Frances Nagels
975766188f Merge pull request #218 from amiaopensource/weaver-branch
add sample rate flag to loudnorm
2017-08-08 08:43:58 +12:00
Ashley Blewer
fd1d596f50 sets wordbreak in firefox for long code 2017-08-07 15:25:15 -04:00
Andrew Weaver
18a80c10f1 add sample rate flag 2017-08-07 11:23:41 -07:00
Ashley
c6f7593d65 Merge pull request #217 from amiaopensource/phase-shift
adds audio phase shift command #195
2017-08-07 13:46:06 -04:00
Ashley Blewer
e6962b3ca4 uses word rotating instead of shifting, as it is more specific 2017-08-07 13:44:06 -04:00
Ashley Blewer
0ba25be082 removes spaces from pan= command command command 2017-08-07 13:40:54 -04:00
Ashley Blewer
e4611d8b6b removes spaces from pan= command 2017-08-07 13:39:45 -04:00
Reto Kromer
d609a9b943 guillemets (#216) 2017-08-07 19:33:44 +02:00
Ashley Blewer
d132e86f1d adds audio phase shift command #195 2017-08-07 13:30:35 -04:00
Ashley
e1e1060904 Merge pull request #215 from amiaopensource/ydif-scene-detection
adds ffprobe command for csv of timecode/ydif #213
2017-08-07 13:11:35 -04:00
Ashley Blewer
8b5fa8aa6a adds ffprobe command for csv of timecode/ydif #213 2017-08-07 12:32:54 -04:00
Reto Kromer
7bd05a8163 Merge pull request #214 (typos) 2017-07-29 21:09:12 +02:00
Reto Kromer
126fb1d284 typos 2017-07-29 14:26:47 +02:00
Reto Kromer
9799316c19 Merge pull request #212 (-an not needed) 2017-07-21 20:21:41 +02:00
Reto Kromer
6e4ed74841 -an not needed 2017-07-21 19:33:59 +02:00
Reto Kromer
0a6204264c Merge pull request #210 from kfrn/gh-pages
Normalise filename extensions (except VOB) to lower-case
2017-07-15 09:36:17 +02:00
Kieran O'Leary
c835746c24 change codec explanation for field order (#205)
* change codec explanation for field order

* add ffv1
2017-07-15 09:35:41 +02:00
kfrn
86e53b92c8 Normalise filename extensions (except VOB) to lower-case 2017-07-15 13:39:57 +12:00
Katherine Frances Nagels
41423e0917 Merge pull request #202 from amiaopensource/colorspace-link
convert colourspace - fix ffmpeg link
2017-07-15 11:51:12 +12:00
Reto Kromer
9a0875b692 use official naming 2017-07-14 10:57:41 +02:00
Reto Kromer
0473e85448 Merge pull request #203 from amiaopensource/trimming-map 2017-07-14 10:31:34 +02:00
Reto Kromer
b57349a3ec > should be encoded (#201) 2017-07-13 12:31:56 +02:00
Kieran O'Leary
9f3b56305c Merge pull request #204 from amiaopensource/aspect-ration
fixes aspect ration typo
2017-07-13 09:46:34 +01:00
Kieran O'Leary
5593b86ab7 fixes aspect ration typo 2017-07-12 23:33:37 +01:00
Kieran O'Leary
3544828fb1 adds -map 0 to trimming recipes, #196 2017-07-12 23:28:03 +01:00
Kieran O'Leary
c8691285cc convert colourspace - fix ffmpeg link 2017-07-12 22:56:07 +01:00
bturkus
e4a660967b Update index.html 2017-07-12 22:31:04 +02:00
bturkus
86138a55e1 Update index.html 2017-07-12 22:31:04 +02:00
bturkus
4c14af3209 add eia608 gif 2017-07-12 22:31:04 +02:00
Reto Kromer
8d18077af5 Merge pull request #198 from amiaopensource/update 2017-07-08 20:10:06 +02:00
Reto Kromer
8871868eda Merge pull request #199 from amiaopensource/little_changes 2017-07-08 17:01:07 +02:00
Reto Kromer
e1fb86ec94 Merge pull request #200 from amiaopensource/little_changes-1 2017-07-08 17:00:41 +02:00
Reto Kromer
7fe503d324 uniform 2017-07-08 12:48:15 +02:00
Reto Kromer
513631c80b uniform 2017-07-08 12:48:02 +02:00
Reto Kromer
22ff2368ad uniform 2017-07-08 11:19:09 +02:00
Kieran O'Leary
c81827d98f temporal difference - typo fix 2017-06-17 17:23:14 +01:00
Reto Kromer
19d249a09b Merge pull request #194 from amiaopensource/structure 2017-05-22 16:07:40 +02:00
Ashley
04abe26b53 updates contributors list (#193) 2017-05-22 15:59:43 +02:00
Ashley
ab3a8b25cf adds strip metadata recipe (#192)
- adds strip metadata recipe
2017-05-22 15:48:15 +02:00
Reto Kromer
40e8f8c73c move "Repair" 2017-05-22 14:51:17 +02:00
Ashley
129540fbfc Merge pull request #191 from amiaopensource/licence
CC BY 4.0
2017-05-20 18:47:53 -04:00
Reto Kromer
8578f01e1c CC BY 4.0 2017-05-20 18:43:23 +02:00
Reto Kromer
0158a85a4b HTML5 tweaks 2017-05-20 10:53:30 +02:00
Reto Kromer
cc724200d1 Merge pull request #189 from pjotrek-b/gh-pages
Added command for splitting into segments (segment muxer).
2017-05-18 10:30:45 +02:00
Peter B
0c03f57df6 Added printf-number examples and fixed requested changes. 2017-05-18 10:24:13 +02:00
Reto Kromer
659e920e0b Merge pull request #187 from amiaopensource/offline
add comment
2017-05-18 07:04:52 +02:00
Reto Kromer
2037ec922f Merge pull request #188 from amiaopensource/readme
update installation instructions
2017-05-18 07:04:05 +02:00
Reto Kromer
c745152f8e fix error 2017-05-17 19:27:19 +02:00
Peter B
e12bbb0c6d Added command for splitting into segments (segment muxer). 2017-05-17 18:53:04 +02:00
Reto Kromer
2c0e555dc1 update installation instructions 2017-05-17 18:50:29 +02:00
Reto Kromer
ed81a16458 Merge pull request #186 from amiaopensource/uniform_spacing
uniform spacing
2017-05-13 15:59:53 +02:00
Reto Kromer
172657b1bb add comment 2017-05-13 07:04:10 +02:00
Reto Kromer
7af1a3de2c uniform spacing 2017-05-13 06:48:57 +02:00
Reto Kromer
3f76abc053 Merge pull request #185 from amiaopensource/update-load-script
add query for default browser
2017-05-09 19:30:27 +02:00
Andrew Weaver
e3d11b3e7c add query for default browser 2017-05-09 11:45:28 -04:00
Reto Kromer
dbe9e1a049 Merge pull request #183 from amiaopensource/HTML5
fix HTML5
2017-05-09 11:32:21 +02:00
Reto Kromer
0fe609a683 Merge pull request #184 from kfrn/gh-pages
Minor wording amendment
2017-05-09 11:28:10 +02:00
kfrn
704a87f22c Minor wording amendment 2017-05-09 20:46:51 +12:00
Reto Kromer
b1a5f14e8c uniformise typography
vu en passant
2017-05-08 20:32:00 +02:00
Reto Kromer
55b34452f7 fix HTML5
- delete not opened closing tag
- uniform wells
2017-05-08 16:38:28 +02:00
Andrew Weaver
18e2c17ab4 Script to open ffmprovisr when installed via homebrew (#181)
- script for opening ffmprovisr from terminal
2017-05-05 17:37:50 +02:00
Andrew Weaver
e4309d6664 add audio bitscope (#180)
* add audio bitscope

* alphabetical

* ch ch ch ch changes
2017-05-04 19:58:24 +02:00
Andrew Weaver
750810d392 Loudness/RIAA Curve (#179)
- start normalization section
- add RIAA
2017-05-03 04:58:20 +02:00
Reto Kromer
b2a04d138f Merge pull request #177 from kfrn/gh-pages
Tweak wording of readme
2017-04-19 10:15:32 +02:00
kfrn
b53f6c9984 Amend formatting & wording 2017-04-19 20:13:17 +12:00
kfrn
64a362314c Tweak wording of readme 2017-04-19 19:33:51 +12:00
Reto Kromer
2a71179776 Merge pull request #175 from amiaopensource/script_folder
scripts folder
2017-04-18 19:38:56 +02:00
Reto Kromer
77e346c067 Merge pull request #176 from amiaopensource/signature-examples
Add examples for using new Signature filter
2017-04-17 20:28:55 +02:00
Andrew Weaver
b995fb05c5 FFmpeg -> ffmpeg 2017-04-17 14:27:58 -04:00
Andrew Weaver
d30741e378 add generate fingerprint
wording
2017-04-17 14:11:26 -04:00
Andrew Weaver
e3b01e2aa8 add compare fingerprints 2017-04-17 13:40:18 -04:00
Reto Kromer
750a763157 more coherent output prompt 2017-04-17 11:46:46 +02:00
Reto Kromer
0a6e5a4a7a more coherent output prompt 2017-04-17 11:46:10 +02:00
Reto Kromer
54a8ab6057 plural 2017-04-17 07:58:26 +02:00
Reto Kromer
e762c7dc42 plural 2017-04-17 07:57:49 +02:00
Reto Kromer
cb7f001444 plural 2017-04-17 07:55:58 +02:00
Reto Kromer
89039f55b3 [WIP] update readme
- add maintainers
- add link to PR
- move licence at the end

Remarks:
- It needs more work by an English native.
- The section `AVHack Team` could be called `History` and start with Ashley’s first release.
2017-04-17 07:52:12 +02:00
Reto Kromer
59e6c6d879 correct link 2017-04-17 07:05:07 +02:00
Reto Kromer
195bc5446e script folder 2017-04-17 07:04:00 +02:00
Reto Kromer
a1cc5a4428 update date 2017-04-17 07:00:48 +02:00
Reto Kromer
58663a869f script folder 2017-04-17 07:00:15 +02:00
Reto Kromer
05d16367f0 script folder 2017-04-17 06:58:14 +02:00
Reto Kromer
9477bcfe0a Merge pull request #173 from amiaopensource/weaver-branch
add script for comparing audio framemd5
2017-04-16 16:56:05 +02:00
aweaver
ad439d3b78 version 2017-04-16 07:53:28 -07:00
aweaver
736b01e426 caveat about transcode 2017-04-16 07:40:00 -07:00
Ashley
57166fe61d Merge pull request #174 from amiaopensource/don_t_leave_ffmprovisr
external link opens a new window
2017-04-16 10:25:08 -04:00
aweaver
ec26d2038a urls and quotes 2017-04-16 07:17:27 -07:00
aweaver
321d998b5a name,filter and spaces 2017-04-16 07:01:40 -07:00
Reto Kromer
009670eed1 external link opens a new window
- add missing `target="_blank"`
- uniform `href` before `target` (easier to maintain)
2017-04-16 10:17:43 +02:00
aweaver
d3a941a725 add script for audio 2017-04-15 14:02:23 -07:00
Reto Kromer
d334d7b4de HTML cleanup
before new release
2017-04-14 08:31:40 +02:00
Reto Kromer
d08cf349f6 Merge pull request #172 from pjotrek-b/text
Split "change formats" into separate categories
2017-04-13 19:11:34 +02:00
Peter B
b5b06021b0 Rearranged aspect-ratio conversions to be next to each other. 2017-04-13 16:24:17 +02:00
Peter B
e0ceeb0d73 Split "change formats" into: rewrap,transcode,formats 2017-04-13 16:23:09 +02:00
Reto Kromer
dc47dbc618 Merge pull request #170 from pjotrek-b/avsync
Added AV sync repair option (aresample/async)
2017-04-13 15:42:46 +02:00
Reto Kromer
28ae979652 Merge pull request #171 from pjotrek-b/gh-pages
Fixed outdated link to ffmpeg filters paragaph.
2017-04-13 15:32:38 +02:00
Peter B
0e2a2c2bfe Fixed outdated link to ffmpeg filters paragaph. 2017-04-13 15:00:21 +02:00
Peter B
388b107a3f Added AV sync repair option (aresample/async) 2017-04-13 14:43:35 +02:00
Reto Kromer
117ebf506d Merge pull request #167 from pjotrek-b/gh-pages
Added framemd5 for audio.
2017-04-13 12:33:05 +02:00
Peter B
9356f9af93 Added testvideo with image + sound (SMPTE bars) 2017-04-13 11:10:41 +02:00
Peter B
4d2d5c7c81 Added framemd5 for audio. 2017-04-13 10:35:42 +02:00
20 changed files with 2718 additions and 1944 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,17 +1,146 @@
html, body {
line-height: 1.5;
font-size: 16px;
color: #888888;
background-color: #060606;
margin: 0;
word-break: break-word;
}
.grid {
display: grid;
align-content: center;
grid-template-areas:
"header"
"sidebar"
"content"
"footer";
}
.header {
grid-area: header;
text-align: center;
}
.content {
grid-area: content;
}
.sidebar {
grid-area: sidebar;
}
.footer {
grid-area: footer;
text-align: center;
}
@media only screen and (max-width: 999px) {
.grid {
grid-template-columns: 1fr;
grid-template-areas:
"header"
"sidebar"
"content"
"footer";
}
code {
word-break: break-all;
}
}
@media only screen and (min-width: 1000px) {
.grid {
grid-gap: 1rem;
grid-template-columns: 25% auto;
grid-template-areas:
"header header"
"sidebar content"
"footer footer";
}
}
@media only screen and (min-width: 1500px) {
.grid {
max-width: 70%;
margin: 0 auto;
grid-template-areas:
"header header"
"sidebar content"
"footer footer";
}
}
a {
color: #91cf91;
}
a:hover {
color: #5cb85c;
}
a:visited {
color: #449d44;
}
.license img {
max-width: 10em;
display: inline;
}
h1, h2, h3, h4, h5, h6 {
font-family: 'Montserrat', sans-serif;
}
h1 {
letter-spacing: 0.1em;
font-size: 7vw;
}
h2 {
font-size: 1.5em;
margin: 5px 8px 8px 8px;
}
.heading {
font-size: 2em;
margin: 6px 0px 12px 0px;
}
h3 {
font-size: 1.5em;
}
h4 {
font-size: 1.2em;
}
.intro-lead {
font-family: 'Montserrat', sans-serif;
font-size: 1em;
}
code {
word-break: break-all;
padding: 2px 4px;
color: #c7254e;
background-color: #f9f2f4;
border-radius: 4px;
word-wrap: break-word;
max-width: 800px;
white-space: normal;
display: inline-block;
}
dd {
padding-left:24px;
padding-left: 24px;
}
dt {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
word-break: break-all;
word-wrap: break-word;
white-space: normal;
display: inline-block;
}
img {
@@ -22,13 +151,17 @@ img {
}
.sample-image {
margin: 0 auto;
margin-bottom: 18px;
max-width: 500px;
text-align: center;
}
h1 {
letter-spacing:8px;
font-size:86px;
line-height:120px;
.sample-image-small {
margin: 0 auto;
margin-bottom: 18px;
max-width: 250px;
text-align: center;
}
div {
@@ -36,46 +169,67 @@ div {
color: white;
}
.btn {
margin: 8px;
display: inline-block;
vertical-align: middle;
-webkit-transform: translateZ(0);
transform: translateZ(0);
box-shadow: 0 0 1px rgba(0, 0, 0, 0);
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-moz-osx-font-smoothing: grayscale;
position: relative;
padding-left: 2.5em;
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
.sidebar a {
text-decoration: none;
}
.btn:before {
.recipe, .contents-list {
color: white;
background-color: #383838;
padding: 14px;
font-family: "Montserrat";
letter-spacing: 0.05em;
border: 1px solid black;
cursor: pointer;
position: relative;
padding-left: 2.8em;
transition: all .5s ease-out;
}
.contents-list {
font-size: 0.9em;
}
nav .heading {
word-break: normal;
}
.recipe {
display: block;
width: 90%;
}
.recipe:hover, .contents-list:hover {
background-color: #449d44;
}
.recipe:before {
content: "💫";
}
.contents-list:before {
content: "📼";
}
.recipe:before, .contents-list:before {
position: absolute;
left: 1em;
padding: 0 1px;
-webkit-transform: translateZ(0);
transform: translateZ(0);
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-property: transform;
transition-property: transform;
-webkit-transition-timing-function: ease-out;
transition-timing-function: ease-out;
padding-right: 1em;
}
.btn:hover:before, .btn:focus:before, .btn:active:before {
-webkit-transform: scale(1.3) translateZ(0);
transform: scale(1.3) translateZ(0);
.recipe:hover:before, .recipe:focus:before, .recipe:active:before {
transform: scale(1.5) translateX(0.1em);
transition: 0.5s;
}
.contents-list:hover:before, .contents-list:focus:before, .contents-list:active:before {
transform: scale(1.8) translateX(0.3em);
transition: 0.5s;
}
.codeblock {
font-family: monospace
padding: 2px 4px;
font-size: 90%;
color: #c7254e;
background-color: #f9f2f4;
border-radius: 4px;
@@ -89,14 +243,29 @@ div {
font-size: 90%;
}
@media only screen and (min-width: 576px) {
img {
max-width: 60%;
}
.well {
padding: 1em;
margin-bottom: 0.5em;
background-color: #151515;
border: 1px solid #030303;
border-radius: 8px;
box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
}
@media only screen and (min-width: 992px) {
img {
width: 100%;
}
.hiding {
opacity: 0;
height: 0;
overflow: hidden;
}
input {
position: absolute;
left: -999em;
}
input[type=checkbox]:checked + div {
opacity: 1;
height: auto;
overflow: hidden;
transition: opacity .5s linear, height .5s linear;
}

BIN
img/16_32_abitscope.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 MiB

BIN
img/cc.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

BIN
img/crop_example_orig.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 KiB

BIN
img/eia608_captions.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
img/life.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 MiB

BIN
img/vhs.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

4148
index.html

File diff suppressed because it is too large Load Diff

6
js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -1,28 +1,21 @@
$(document).ready(function() {
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
// open modal window if a hash is found in URL
// open recipe window if a hash is found in URL
if(window.location.hash) {
$(window.location.hash).modal('show');
// add direct link to modal window
$(".link").empty();
$(".link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
id = window.location.hash
console.log(id.substring(1))
document.getElementById(id.substring(1)).checked = true;
$('html, body').animate({ scrollTop: $(id).offset().top}, 1000);
$(id).closest('div').find('.link').empty();
$(id).closest('div').find('.link').append("<small>Link to this command: <a href='https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"'>https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"</a></small>");
}
// add hash to URL when modal is opened
$('span[data-toggle="modal"]').on("click", function(){
window.location.hash = $(this).attr("data-target");
// add direct link to modal window
$(".link").empty();
$(".link").append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
});
// remove hash from URL when modal is closed
$(document).on('hide.bs.modal', function (e) {
history.pushState("", document.title, window.location.pathname);
// add hash URL when recipe is opened
$('label[class="recipe"]').on("click", function(){
id = $(this).attr("for");
window.location.hash = ('#' + id)
$('#' + id).closest('div').find('.link').empty();
$('#' + id).closest('div').find('.link').append("<small>Link to this command: <a href='https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"'>https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"</a></small>");
});
});

View File

@@ -1,37 +1,55 @@
# [ffmprovisr](http://amiaopensource.github.io/ffmprovisr)
Repository of useful FFmpeg command lines for archivists! [AMIA hackday](http://wiki.curatecamp.org/index.php/Association_of_Moving_Image_Archivists_%26_Digital_Library_Federation_Hack_Day_2015) edition.
Repository of useful FFmpeg command lines for archivists!
## What is this?
Project Objective: To facilitate better understanding of FFmpeg through collaborative sharing of useful scripts and detailed flag-level description of how each script works so archivists can copy-paste and produce their own scripts but also understand how and why they work.
#### Project Objective
To facilitate better understanding of FFmpeg through collaborative sharing of useful scripts and detailed flag-level description of how each script works, so archivists can copy-paste and produce their own scripts, but also understand how and why they work.
## How do I see it?
Code stuff in the gh-pages branch (the default primary branch). Readme is right here. The site is live and lives on github pages. You can see it [here](http://amiaopensource.github.io/ffmprovisr), or you can download a [release](https://github.com/amiaopensource/ffmprovisr/releases) and use it locally.
The code is found in the gh-pages branch (the default primary branch). Readme is right here. You can see the site live on [GitHub pages](http://amiaopensource.github.io/ffmprovisr).
You can also install the latest [release](https://github.com/amiaopensource/ffmprovisr/releases) on your computer with the command:
```
brew install amiaopensource/amiaos/ffmprovisr
```
and then call it locally with the command:
```
ffmprovisr
```
This works currently under macOS, Linux and the Linux subsystem on Windows. On classic Windows you can install the last [release](https://github.com/amiaopensource/ffmprovisr/releases) manually and the open `index.html` in a browser.
## How do I contribute?
You are welcome to edit the codebase yourself or just supply the information and ask it to be added to the site.
You are welcome to edit the codebase yourself, or just supply the information and ask it to be added to the site.
To contribute to this project directly (and more quickly), clone this repository and create a new branch (`git checkout -b your-branch-name`) and add or modify a new block in index.html. Then submit a pull request and someone can review and integrate your code. There is a commented-out sample available at the bottom of index.html that can be used to build your own block.
#### Edit codebase
If you are having trouble with the coding it yourself or with github, feel free to [submit an issue](https://github.com/amiaopensource/ffmprovisr/issues) with the kind of command you would like to see added to the site.
To contribute to this project directly (and more quickly), clone this repository and create a new branch (`git checkout -b your-branch-name`) and add or modify a new block in `index.html`. Then [submit a pull request](https://github.com/amiaopensource/ffmprovisr/pulls) and the maintainers will review and integrate your code. There is a commented-out sample block available at the bottom of `index.html` that can be as a guideline for your command.
#### Make a request
If you are having trouble with coding it yourself or with GitHub, feel free to [submit an issue](https://github.com/amiaopensource/ffmprovisr/issues) with the kind of command you would like to see added to the site.
#### General help
If you want to help but don't have a new script to add, you can help us by testing out the scripts available, by refining or clarifying the documentation, or [creating an issue](https://github.com/amiaopensource/ffmprovisr/issues) for anything that sounds confusing and requires clarification.
## License
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://amiaopensource.github.io/ffmprovisr/" property="cc:attributionName" rel="cc:attributionURL">ffmprovisr</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/amiaopensource/ffmprovisr" rel="dct:source">https://github.com/amiaopensource/ffmprovisr</a>.
## Code of Conduct
You can read our contributor code of conduct [here](https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/code_of_conduct.md).
## 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)
## Contributors
* Gathered using [octohatrack](https://github.com/LABHR/octohatrack)
GitHub Contributors:
*GitHub Contributors*:
ablwr (Ashley)
dericed (Dave Rice)
edsu (Ed Summers)
@@ -40,39 +58,52 @@ kfrn (Katherine Frances Nagels)
kgrons (Kathryn Gronsbell)
kieranjol (Kieran O'Leary)
llogan (Lou)
pjotrek-b (Peter B.)
privatezero (Andrew Weaver)
retokromer (Reto Kromer)
rfraimow
All Contributors:
*All Contributors*:
ablwr (Ashley)
audiovisualopen
brainwane (Sumana Harihareswara)
bturkus
dericed (Dave Rice)
edsu (Ed Summers)
Fizz24
jamessam (Jim)
jamessam (Jim Sam)
jfarbowitz (Jonathan Farbowitz)
jronallo (Jason Ronallo)
kellyhaydon (metacynic)
kfrn (Katherine Frances Nagels)
kgrons (Kathryn Gronsbell)
kieranjol (Kieran O'Leary)
llogan (Lou)
mulvya
pjotrek-b (Peter B.)
privatezero (Andrew Weaver)
retokromer (Reto Kromer)
rfraimow
richardpl (Paul B Mahol)
todrobbins (Tod Robbins)
Repo: amiaopensource/ffmprovisr
GitHub Contributors: 11
All Contributors: 18
GitHub Contributors: 12
All Contributors: 22
## AVHack Team:
## AVHack Team
[Ashley Blewer](https://github.com/ablwr), Eddy Colloton, Rebecca Dillmeier, [Jonathan Farbowitz](https://github.com/jfarbowitz), Rebecca Fraimow, Samuel Gutterman, Kelly Haydon, [Reto Kromer](https://github.com/retokromer), Nicole Martin, [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol), Catriona Schlosser, Ben Turkus
[Association of Moving Image Archivists & Digital Library Federation Hack Day 2015](http://wiki.curatecamp.org/index.php/Association_of_Moving_Image_Archivists_%26_Digital_Library_Federation_Hack_Day_2015)
[Ashley Blewer](https://github.com/ablwr), [Eddy Colloton](https://github.com/eddycolloton), Rebecca Dillmeier, [Jonathan Farbowitz](https://github.com/jfarbowitz), [Rebecca Fraimow](https://github.com/rfraimow), Samuel Gutterman, [Kelly Haydon](https://github.com/kellyhaydon), [Reto Kromer](https://github.com/retokromer), Nicole Martin, [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol), Catriona Schlosser, [Ben Turkus](https://github.com/bturkus)
## Sister projects
[Script Ahoy](http://dd388.github.io/crals/): Community Resource for Archivists and Librarians Scripting
[sourcecaster](https://datapraxis.github.io/sourcecaster/): helps you use the command line to work through common challenges that come up when working with digital primary sources.
## License
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png"></a><br>
This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://amiaopensource.github.io/ffmprovisr/" property="cc:attributionName" rel="cc:attributionURL">ffmprovisr</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.<br>
Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/amiaopensource/ffmprovisr" rel="dct:source">https://github.com/amiaopensource/ffmprovisr</a>.

48
check_framemd5.sh → scripts/check_audio_framemd5.sh Normal file → Executable file
View File

@@ -1,19 +1,19 @@
#!/usr/bin/env bash
SCRIPT=$(basename "${0}")
VERSION='2016-12-31'
AUTHOR='ffmprovisr'
RED='\033[1;31m'
BLUE='\033[1;34m'
NC='\033[0m'
VERSION="2018-02-10"
AUTHOR="ffmprovisr"
RED="\033[1;31m"
BLUE="\033[1;34m"
NC="\033[0m"
if [[ ${OSTYPE} = "cygwin" ]] || [ ! $(which diff) ]; then
if [[ "${OSTYPE}" = "cygwin" ]] || [[ ! "$(which diff)" ]]; then
echo -e "${RED}Error: 'diff' is not installed by default. Please install 'diffutils' from Cygwin.${NC}"
exit 1
fi
_output_prompt(){
cat <<EOF
Usage: ${SCRIPT} [-h] | [ -i <av_file> -m <md5_file> ]
Usage: ${SCRIPT} -i <av_file> -m <md5_file> | -h
EOF
exit 1
}
@@ -21,18 +21,16 @@ EOF
_output_help(){
cat <<EOF
Syntax:
${SCRIPT}
Prompts a short help message.
${SCRIPT} -h
This help.
${SCRIPT} -i <av_file> -m <md5_file>
Pass to the script the audio-visual file and the corresponding MD5
file to check.
${SCRIPT} -h
This help.
Dependency:
ffmpeg
About:
Version: ${VERSION}
Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/check_framemd5.sh
Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/scripts/check_audio_framemd5.sh
EOF
exit 0
}
@@ -40,11 +38,11 @@ EOF
unset input_file
unset input_hash
while getopts ":hi:m:" opt; do
while getopts ":i:m:h" opt; do
case "${opt}" in
i) input_file=${OPTARG} ;;
m) input_hash=${OPTARG} ;;
h) _output_help ;;
i) input_file=$OPTARG ;;
m) input_hash=$OPTARG ;;
:) echo -e "${RED}Error: option -${OPTARG} requires an argument${NC}" ; _output_prompt ;;
*) echo -e "${RED}Error: bad option -${OPTARG}${NC}" ; _output_prompt ;;
esac
@@ -54,21 +52,23 @@ done
echo -e "${BLUE}Please wait...${NC}"
unset md5_tmp
if [[ $OSTYPE = "cygwin" ]]; then
md5_tmp=""${USERPROFILE}/$(basename ${input_hash}).tmp""
md5_tmp="${USERPROFILE}/$(basename "${input_hash}").tmp"
else
md5_tmp="${HOME}/$(basename ${input_hash}).tmp"
md5_tmp="${HOME}/$(basename "${input_hash}").tmp"
fi
$(ffmpeg -i ${input_file} -loglevel 0 -f framemd5 -an ${md5_tmp})
# Find audio frame size for hash calculation
unset sample_rate
sample_rate=$(grep -v '^#' "${input_hash}" | head -n 1 | tr -d ' ' | cut -d',' -f4)
ffmpeg -i "${input_file}" -loglevel 0 -af "asetnsamples=n='$sample_rate'" -f framemd5 -vn "${md5_tmp}"
[[ ! -f ${md5_tmp} ]] && { echo -e "${RED}Error: '${input_file}' is not a valid audio-visual file.${NC}" ; _output_prompt ; }
unset old_file
unset tmp_file
old_file=$(grep -v '^#' ${input_hash})
tmp_file=$(grep -v '^#' ${md5_tmp})
old_file=$(grep -v '^#' "${input_hash}")
tmp_file=$(grep -v '^#' "${md5_tmp}")
if [[ "${old_file}" = "${tmp_file}" ]]; then
echo -e "${BLUE}'$(basename ${input_file})' matches '$(basename ${input_hash})'${NC}"
rm "${md5_tmp}"
echo -e "${BLUE}'$(basename "${input_file}")' matches '$(basename "${input_hash}")'${NC}"
else
echo -e "${RED}The following differences were detected between '$(basename ${input_file})' and '$(basename ${input_hash})':${NC}"
echo -e "${RED}The following differences were detected between '$(basename "${input_file}")' and '$(basename "${input_hash}")':${NC}"
diff "${input_hash}" "${md5_tmp}"
rm "${md5_tmp}"
fi
rm "${md5_tmp}"

View File

@@ -0,0 +1,71 @@
#!/usr/bin/env bash
SCRIPT=$(basename "${0}")
VERSION="2018-02-10"
AUTHOR="ffmprovisr"
RED="\033[1;31m"
BLUE="\033[1;34m"
NC="\033[0m"
if [[ "${OSTYPE}" = "cygwin" ]] || [[ ! "$(which diff)" ]]; then
echo -e "${RED}Error: 'diff' is not installed by default. Please install 'diffutils' from Cygwin.${NC}"
exit 1
fi
_output_prompt(){
cat <<EOF
Usage: ${SCRIPT} -i <av_file> -m <md5_file> | -h
EOF
exit 1
}
_output_help(){
cat <<EOF
Syntax:
${SCRIPT} -i <av_file> -m <md5_file>
Pass to the script the audio-visual file and the corresponding MD5
file to check.
${SCRIPT} -h
This help.
Dependency:
ffmpeg
About:
Version: ${VERSION}
Website: https://github.com/amiaopensource/ffmprovisr/blob/gh-pages/scripts/check_video_framemd5.sh
EOF
exit 0
}
unset input_file
unset input_hash
while getopts ":i:m:h" opt; do
case "${opt}" in
i) input_file=${OPTARG} ;;
m) input_hash=${OPTARG} ;;
h) _output_help ;;
:) echo -e "${RED}Error: option -${OPTARG} requires an argument${NC}" ; _output_prompt ;;
*) echo -e "${RED}Error: bad option -${OPTARG}${NC}" ; _output_prompt ;;
esac
done
[[ -z "${#}" || ! ${input_file} || ! ${input_hash} ]] && _output_prompt
echo -e "${BLUE}Please wait...${NC}"
unset md5_tmp
if [[ "${OSTYPE}" = "cygwin" ]]; then
md5_tmp="${USERPROFILE}/$(basename "${input_hash}").tmp"
else
md5_tmp="${HOME}/$(basename "${input_hash}").tmp"
fi
ffmpeg -i "${input_file}" -loglevel 0 -f framemd5 -an "${md5_tmp}"
[[ ! -f "${md5_tmp}" ]] && { echo -e "${RED}Error: '${input_file}' is not a valid audio-visual file.${NC}" ; _output_prompt ; }
unset old_file
unset tmp_file
old_file=$(grep -v '^#' "${input_hash}")
tmp_file=$(grep -v '^#' "${md5_tmp}")
if [[ "${old_file}" = "${tmp_file}" ]]; then
echo -e "${BLUE}'$(basename "${input_file}")' matches '$(basename "${input_hash}")'${NC}"
else
echo -e "${RED}The following differences were detected between '$(basename "${input_file}")' and '$(basename "${input_hash}")':${NC}"
diff "${input_hash}" "${md5_tmp}"
fi
rm "${md5_tmp}"

27
scripts/ffmprovisr Executable file
View File

@@ -0,0 +1,27 @@
#!/usr/bin/env bash
# This allows to open the online version of the ffmprovisr, when the computer is
# connected to the Web, and the local version otherwise.
if [[ "$(uname -s)" = "Darwin" ]] ; then
default_browser=$(plutil -convert json ~/Library/Preferences/com.apple.LaunchServices/com.apple.launchservices.secure.plist -r -o - | grep https -b1 | tail -n1 | cut -d'"' -f4)
if ping -c 1 amiaopensource.github.io >/dev/null 2>&1 ; then
ffmprovisr_path='https://amiaopensource.github.io/ffmprovisr/'
else
ffmprovisr_path=$(find /usr/local/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
fi
if [[ -n "${default_browser}" ]] ; then
open -b "${default_browser}" "${ffmprovisr_path}"
else
open "${ffmprovisr_path}"
fi
elif [[ "$(uname -s)" = "Linux" ]] ; then
if ping -c 1 amiaopensource.github.io >/dev/null 2>&1 ; then
ffmprovisr_path='https://amiaopensource.github.io/ffmprovisr/'
else
ffmprovisr_path=$(find ~/.linuxbrew/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
fi
xdg-open "${ffmprovisr_path}"
else
echo "Please locate the 'ffmprovisr' folder, and open the 'index.html' file in a browser."
fi