summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-03-19 20:14:26 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-19 20:14:26 (UTC)
commitb6859c0f505b79a246955ab06763392871459e22 (patch) (side-by-side diff)
treefd85af38d44c7ff5af1eb687d6446d8c49a19bc8
parent5ca0d6a85c438ea75dc2795aca5176e3b31e89f0 (diff)
downloadiii-b6859c0f505b79a246955ab06763392871459e22.zip
iii-b6859c0f505b79a246955ab06763392871459e22.tar.gz
iii-b6859c0f505b79a246955ab06763392871459e22.tar.bz2
iii-extract-riff-chunk manpage and more date bumps
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/iii-extract-riff-chunk.179
-rw-r--r--doc/iiid.8.in2
-rw-r--r--src/iii-extract-riff-chunk.cc2
4 files changed, 82 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e171b0b..63079ee 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
-man_MANS=iiid.8
+man_MANS=iiid.8 iii-extract-riff-chunk.1
doc_DATA = 000000000000.conf
pkglib_SCRIPTS = on-upload-photo.bash tag-photo.bash
clean-local:
rm -f iiid.8
diff --git a/doc/iii-extract-riff-chunk.1 b/doc/iii-extract-riff-chunk.1
new file mode 100644
index 0000000..5a9afeb
--- a/dev/null
+++ b/doc/iii-extract-riff-chunk.1
@@ -0,0 +1,79 @@
+.TH iii-extract-riff-chunk 1 "March 19th, 2011" "iii" "Klever Group (http://www.klever.net/)"
+.hla en
+
+.SH NAME
+
+iii-extract-riff-chunk \- utility to extract chunks from RIFF files
+
+.SH SYNOPSYS
+
+\fBiii-extract-riff-chunk\fR
+[\fB-h\fR] [\fB--help\fR] [\fB--usage\fR]
+[\fB-V\fR] [\fB--version\fR]
+[\fB-L\fR] [\fB--license\fR]
+[\fB-1\fR] [\fB--first\fR]
+<avi-file> <chunk-path>
+
+.SH DESCRIPTION
+
+The utility is designed to assist in extracting chunk from RIFF files. The main
+(and only) reason why it was developed is to sort video files created by camera
+by date.
+
+.SH OPTIONS
+
+.TP
+\fB-1\fR, \fB--first\fR
+Stop after extracting the first matching chunk.
+.TP
+\fB-h\fR, \fB--help\fR, \fB--usage\fR
+Display short usage instructions and exit.
+.TP
+\fB-V\fR, \fB--version\fR
+Report version and exit.
+.TP
+\fB-L\fR, \fB--license\fR
+Show licensing terms.
+
+.SH EXAMPLE
+
+The command line invokation
+
+\fBiii-extract-riff-chunk DSC_0001.AVI '/RIFF.AVI /LIST.ncdt/nctg'\fR
+| dd bs=1 skip=82 count=19 2>/dev/null
+
+produces output
+
+YYYY:MM:DD HH:MM:SS
+
+at least for my Nikon D90 recorded AVI files.
+
+.SH AUTHOR
+
+Written by Michael Krelin <hacker@klever.net>
+
+.SH COPYRIGHT
+
+Copyright (c) 2009-2011 Klever Group (http://www.klever.net/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+.SH BUGS
+
+You tell me. Send reports to <iii-bugs@klever.net>
diff --git a/doc/iiid.8.in b/doc/iiid.8.in
index 533ed18..30476f7 100644
--- a/doc/iiid.8.in
+++ b/doc/iiid.8.in
@@ -1,25 +1,25 @@
-.TH iiid 8 "March 8th, 2009" "iiid(8)" "Klever Group (http://www.klever.net/)"
+.TH iiid 8 "March 8th, 2009" "iii" "Klever Group (http://www.klever.net/)"
.hla en
.SH NAME
iiid \- An eye-fi card management daemon
.SH SYNOPSYS
\fBiiid\fR
[\fB-h\fR] [\fB--help\fR] [\fB--usage\fR]
[\fB-V\fR] [\fB--version\fR]
[\fB-L\fR] [\fB--license\fR]
[\fB-p\fR \fIport\fR] [\fB--port=\fR\fIport\fR]
.SH DESCRIPTION
iiid daemon is a minimalistic open source eye-fi management daemon
implementation. It is listening for incoming connections and accepts files from
eye-fi card, optionally invoking scripts to sort out files or send out
notifications.
.SH OPTIONS
.TP
diff --git a/src/iii-extract-riff-chunk.cc b/src/iii-extract-riff-chunk.cc
index 3a06db2..d53170d 100644
--- a/src/iii-extract-riff-chunk.cc
+++ b/src/iii-extract-riff-chunk.cc
@@ -1,42 +1,42 @@
/* vim:set sw=8 nosi noai cin cino=:0,l1,g0: */
#include <stdint.h>
#include <stdlib.h>
#include <getopt.h>
#include <cstring>
#include <iostream>
#include <fstream>
#include <stdexcept>
#include <cassert>
#include <list>
#include <string>
#include <iterator>
#include "config.h"
#define PHEADER \
PACKAGE " Version " VERSION "\n" \
- "Copyright (c) 2009-2010 Klever Group"
+ "Copyright (c) 2009-2011 Klever Group"
typedef uint32_t fourcc_type;
enum fourcc_value {
fourcc_RIFF = 0x46464952, fourcc_AVI = 0x20495641, fourcc_LIST = 0x5453494c,
fourcc_hdrl = 0x6c726468, fourcc_strl = 0x6c727473,
fourcc_ncdt = 0x7464636e, fourcc_ncvr = 0x7276636e, fourcc_nctg = 0x6774636e, fourcc_ncth = 0x6874636e
};
fourcc_type str2fourcc(const char *str) {
fourcc_type rv = 0;
return *(fourcc_type*)strncpy((char*)&rv,str,sizeof(rv));
}
const std::string fourcc2str(fourcc_type fcc) {
char rv[sizeof(fcc)+1];
*(fourcc_type*)rv = fcc;
rv[sizeof(fcc)]=0;
return rv;
}
#pragma pack(1)
struct riff_sized_head {
fourcc_type fourcc;
uint32_t size;
};