diff --git a/Makefile b/Makefile index 56e6f8f..ba37f12 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,10 @@ PROG = ustreamer all: $(SOURCES) $(PROG) +regen: + tools/make-jpg-h.py src/data/blank.jpg src/data/blank.h BLANK 640 480 + + $(PROG): $(OBJECTS) $(CC) $(LIBS) $(LDFLAGS) $(OBJECTS) -o $@ diff --git a/make-blank-h.py b/make-blank-h.py deleted file mode 100755 index 9e1c4a8..0000000 --- a/make-blank-h.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python3 - - -# ===== -def main(): - with open("blank.jpg", "rb") as jpg_file: - jpg_data = jpg_file.read() - - rows = [[]] - for ch in jpg_data: - if len(rows[-1]) > 20: - rows.append([]) - rows[-1].append(hex(ch)) - - text = ",\n\t".join(", ".join(row) for row in rows) - text = "const unsigned char BLANK_JPG_DATA[] = {\n\t" + text + "\n};" - text = "const unsigned long BLANK_JPG_SIZE = %d;\n\n" % (len(jpg_data)) + text - text = "const unsigned BLANK_JPG_HEIGHT = 480;\n\n" + text - text = "const unsigned BLANK_JPG_WIDTH = 640;\n" + text - - with open("src/blank.h", "w") as h_file: - h_file.write(text) - - -# ===== -if __name__ == "__main__": - main() diff --git a/src/blank.h b/src/data/blank.h similarity index 100% rename from src/blank.h rename to src/data/blank.h diff --git a/blank.jpg b/src/data/blank.jpg similarity index 100% rename from blank.jpg rename to src/data/blank.jpg diff --git a/src/http.c b/src/http.c index 932e594..b329f8d 100644 --- a/src/http.c +++ b/src/http.c @@ -18,7 +18,7 @@ #include "stream.h" #include "http.h" -#include "blank.h" +#include "data/blank.h" #define BOUNDARY "boundarydonotcross" diff --git a/tools/make-jpg-h.py b/tools/make-jpg-h.py new file mode 100755 index 0000000..10802f0 --- /dev/null +++ b/tools/make-jpg-h.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python3 + + +import sys + + +# ===== +def main(): + assert len(sys.argv) == 6, "%s " % (sys.argv[0]) + + src = sys.argv[1] + dest = sys.argv[2] + prefix = sys.argv[3] + width = int(sys.argv[4]) + height = int(sys.argv[5]) + + with open(src, "rb") as jpg_file: + jpg_data = jpg_file.read() + + rows = [[]] + for ch in jpg_data: + if len(rows[-1]) > 20: + rows.append([]) + rows[-1].append(hex(ch)) + + text = ",\n\t".join(", ".join(row) for row in rows) + text = "const unsigned char %s_JPG_DATA[] = {\n\t%s\n};" % (prefix, text) + text = "const unsigned long %s_JPG_SIZE = %d;\n\n" % (prefix, len(jpg_data)) + text + text = "const unsigned %s_JPG_HEIGHT = %d;\n\n" % (prefix, height) + text + text = "const unsigned %s_JPG_WIDTH = %d;\n" % (prefix, width) + text + + with open(dest, "w") as h_file: + h_file.write(text) + + +# ===== +if __name__ == "__main__": + main()