make output directories for ffmpeg

.clang-format

@@ -0,0 +1,113 @@
+Language: Cpp
+
+# list of all options:
+# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+
+Standard: c++17
+AccessModifierOffset: -4
+TabWidth: 4
+IndentWidth: 4
+ConstructorInitializerIndentWidth: 4
+UseTab: Never
+
+# jnl this may be shortened, but this will effect a lot of the formatting
+ColumnLimit: 120
+
+#jnl maybe even 0
+SpacesBeforeTrailingComments: 1
+
+# jnl again, not sure what this does
+ContinuationIndentWidth: 0
+
+# jnl maybe think about this, im not sure
+# should be the same
+BinPackArguments: false
+BinPackParameters: false
+
+# jnl maybe think about this, im not sure
+AlwaysBreakAfterReturnType: None
+
+#https://stackoverflow.com/questions/32970045/how-to-prevent-clang-format-to-add-space-after-comment-char
+CommentPragmas:  '^[^ ]'
+
+#https://stackoverflow.com/questions/39858266/using-clang-format-keep-empty-braces-on-the-same-line
+BreakBeforeBraces: Allman
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+#  BeforeLambdaBody: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: Left
+AlignOperands: false
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+BreakStringLiterals: true
+CompactNamespaces: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: false
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat: false
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+#hmm, this doesn't work for me: IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentPPDirectives: BeforeHash
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+PointerAlignment: Left #jnl i'll fight you over this
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeParens: Never
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: true
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+#hmm, this doesn't work for me: SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+UseCRLF: false

.gitignore

@@ -1,7 +1,7 @@
 # OS or Editor folders
 .DS_Store
-bitmaplib.o
+*.o
 max2sphere
-max2spherebatch.o
 *.data
-max2sphere.o
+.vscode
+testframes

Makefile-Linux

@@ -1,8 +1,8 @@
 CC = gcc
-CFLAGS = -g3 -Wall -Wextra -fPIC -DREPLICATION_ENABLED -DJOURNALING_ENABLED -m64
-INCLUDES = -I/usr/include -I/opt/homebrew/include -I/opt/homebrew/opt/jpeg/include
-LFLAGS = -L/usr/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/jpeg/lib
-LIBS = -ljpeg -lm 
+CFLAGS = -g3 -Wall -Wextra -fPIC -DREPLICATION_ENABLED -DJOURNALING_ENABLED -m64 -O3
+INCLUDES = -I/usr/include -I/opt/homebrew/include -I/opt/homebrew/opt/jpeg/include -I/opt/homebrew/opt/png/include
+LFLAGS = -L/usr/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/jpeg/lib -L/opt/homebrew/opt/png/lib
+LIBS = -ljpeg -lm -lpng
 
 OBJS = max2sphere.o bitmaplib.o
 

README.md

@@ -66,8 +66,9 @@ You will need to first convert a `.360` video to frames and then pass the two co
 
 You can use ffmpeg to split your `.360` video into frames (below at a rate of 1 FPS).
 
-```
-$ ffmpeg -i INPUT.360 -map 0:0 -r 1 -q:v 1 track0/img%d.jpg -map 0:5 -r 1 -q:v 1 track5/img%d.jpg
+```shell
+mkdir track0 track5
+ffmpeg -i INPUT.360 -map 0:0 -r 1 -q:v 1 track0/img%d.jpg -map 0:5 -r 1 -q:v 1 track5/img%d.jpg
 ```
 
 Note: this assumes video tracks are `0:0` and `0:5`. If timelapse mode is used, the tracks are different:

bitmaplib.h

@@ -4,9 +4,9 @@
 #include <math.h>
 
 // Choose formats with external support required
-#define ADDJPEG 
-//#define ADDPNG 
-//#define ADDTIFF 
+#define ADDJPEG
+#define ADDPNG
+//#define ADDTIFF
 //#define ADDEXR
 
 #ifdef ADDJPEG