[flvmeta] 7 new revisions pushed by marc.noi...@gmail.com on 2012-04-29 19:41 GMT

[flv...@googlecode.com]

7 new revisions:

Revision: fd8ab0ae5686
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 02:33:40 2012
Log: Added author and contact information to the man page.
http://code.google.com/p/flvmeta/source/detail?r=fd8ab0ae5686

Revision: 78be7d957f65
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 09:37:44 2012
Log: Added an option to link flvmeta to the version of libyaml
installed on...
http://code.google.com/p/flvmeta/source/detail?r=78be7d957f65

Revision: e36ce944061c
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 11:48:40 2012
Log: Fixed Windows build.
http://code.google.com/p/flvmeta/source/detail?r=e36ce944061c

Revision: 1c3500e7957f
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 11:49:47 2012
Log: Removed the deprecated `ERROR_SAME_FILE' error.
http://code.google.com/p/flvmeta/source/detail?r=1c3500e7957f

Revision: 2cb1e807af4f
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 11:50:39 2012
Log: Completed man page.
http://code.google.com/p/flvmeta/source/detail?r=2cb1e807af4f

Revision: f89a9f874dfd
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 12:39:28 2012
Log: Added missing files to the top Makefile.am.
http://code.google.com/p/flvmeta/source/detail?r=f89a9f874dfd

Revision: 84e096784ccb
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 12:40:32 2012
Log: Updated miscellaneous files.
http://code.google.com/p/flvmeta/source/detail?r=84e096784ccb

==============================================================================
Revision: fd8ab0ae5686
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 02:33:40 2012
Log: Added author and contact information to the man page.

http://code.google.com/p/flvmeta/source/detail?r=fd8ab0ae5686

Modified:
/man/flvmeta.1.md

=======================================
--- /man/flvmeta.1.md Mon Apr 23 06:57:23 2012
+++ /man/flvmeta.1.md Sun Apr 29 02:33:40 2012
@@ -258,6 +258,16 @@

# AUTHOR

+Marc Noirot \<marc....@gmail.com\>
+
# COPYRIGHT

+Copyright 2007-2012 Marc Noirot
+
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR
+PURPOSE.
+
# CONTACT
+
+Please report bugs to \<flvmeta-d...@googlegroups.com\>

==============================================================================
Revision: 78be7d957f65
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 09:37:44 2012
Log: Added an option to link flvmeta to the version of libyaml
installed on the system.
Cleaned up CMake files.

http://code.google.com/p/flvmeta/source/detail?r=78be7d957f65

Added:
/FindLibYaml.cmake
Modified:
/CMakeLists.txt
/src/CMakeLists.txt

=======================================
--- /dev/null
+++ /FindLibYaml.cmake Sun Apr 29 09:37:44 2012
@@ -0,0 +1,13 @@
+# CMake module to search for the libyaml library
+# (library for parsing YAML files)
+# If it's found it sets LIBYAML_FOUND to TRUE
+# and following variables are set:
+# LIBYAML_INCLUDE_DIR
+# LIBYAML_LIBRARY
+
+FIND_PATH(LIBYAML_INCLUDE_DIR NAMES yaml.h)
+FIND_LIBRARY(LIBYAML_LIBRARIES NAMES yaml libyaml)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Yaml DEFAULT_MSG LIBYAML_LIBRARIES
LIBYAML_INCLUDE_DIR)
+MARK_AS_ADVANCED(LIBYAML_INCLUDE_DIR LIBYAML_LIBRARIES)
=======================================
--- /CMakeLists.txt Mon Apr 23 06:57:23 2012
+++ /CMakeLists.txt Sun Apr 29 09:37:44 2012
@@ -4,6 +4,8 @@
set(FLVMETA_VERSION "1.1")
set(FLVMETA_STABLE no)

+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_MODULE_PATH})
+
# check whether we're in an instable branch
if(FLVMETA_STABLE)
message(STATUS "Set flvmeta version to ${FLVMETA_VERSION}")
@@ -11,10 +13,12 @@
# if so, check for svnversion, and retrieve current revision
find_program(GIT "git")
if(GIT)
- execute_process(COMMAND "${GIT}" rev-parse --short HEAD
- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
- OUTPUT_VARIABLE GIT_RELEASE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(
+ COMMAND "${GIT}" rev-parse --short HEAD
+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ OUTPUT_VARIABLE GIT_RELEASE
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
set(FLVMETA_VERSION "${FLVMETA_VERSION}-g${GIT_RELEASE}")
message(STATUS "Set unstable flvmeta version to ${FLVMETA_VERSION}")
unset(GIT CACHE)
@@ -31,6 +35,12 @@
set(PACKAGE_VERSION "${FLVMETA_VERSION}")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

+# build options
+set(
+ FLVMETA_USE_SYSTEM_LIBYAML FALSE
+ CACHE BOOL "Build flvmeta by linking it to the currently installed
version of libyaml"
+)
+
#platform tests
include(CheckFunctionExists)
include(CheckIncludeFile)
@@ -70,9 +80,11 @@
# large file support
check_function_exists("fseeko" HAVE_FSEEKO)
if(HAVE_FSEEKO)
- execute_process(COMMAND getconf LFS_CFLAGS
+ execute_process(
+ COMMAND getconf LFS_CFLAGS
OUTPUT_VARIABLE LFS_CFLAGS
- ERROR_QUIET)
+ ERROR_QUIET
+ )
if(LFS_CFLAGS)
add_definitions(${LFS_CFLAGS})
endif(LFS_CFLAGS)
=======================================
--- /src/CMakeLists.txt Tue Jun 21 01:19:08 2011
+++ /src/CMakeLists.txt Sun Apr 29 09:37:44 2012
@@ -46,23 +46,34 @@
include_directories(compat)
endif(WIN32)

+add_executable(flvmeta ${flvmeta_src})
+
# libyaml
+if(FLVMETA_USE_SYSTEM_LIBYAML)
+ # search for libyaml on the system, link with it
+ find_package(libyaml REQUIRED)
+ include_directories(${LIBYAML_INCLUDE_DIR})
+ target_link_libraries(flvmeta ${LIBYAML_LIBRARIES})
+else(FLVMETA_USE_SYSTEM_LIBYAML)
+ # use bundled version of libyaml
+ include_directories(libyaml)
+ add_subdirectory(libyaml)
+ target_link_libraries(flvmeta yaml)
+endif(FLVMETA_USE_SYSTEM_LIBYAML)

# static build
-if (WIN32)
+if(WIN32)
add_definitions(-DYAML_DECLARE_STATIC)
-endif (WIN32)
-
-include_directories(libyaml)
-add_subdirectory(libyaml)
-
-add_executable(flvmeta ${flvmeta_src})
-target_link_libraries(flvmeta yaml)
+endif(WIN32)

if(WIN32)
- install(TARGETS flvmeta
- RUNTIME DESTINATION .)
+ install(
+ TARGETS flvmeta
+ RUNTIME DESTINATION .
+ )
else(WIN32)
- install(TARGETS flvmeta
- RUNTIME DESTINATION bin)
+ install(
+ TARGETS flvmeta
+ RUNTIME DESTINATION bin
+ )
endif(WIN32)

==============================================================================
Revision: e36ce944061c
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 11:48:40 2012
Log: Fixed Windows build.

http://code.google.com/p/flvmeta/source/detail?r=e36ce944061c

Modified:
/src/CMakeLists.txt

=======================================
--- /src/CMakeLists.txt Sun Apr 29 09:37:44 2012
+++ /src/CMakeLists.txt Sun Apr 29 11:48:40 2012
@@ -46,6 +46,11 @@
include_directories(compat)
endif(WIN32)

+# static build
+if(WIN32)
+ add_definitions(-DYAML_DECLARE_STATIC)
+endif(WIN32)
+
add_executable(flvmeta ${flvmeta_src})

# libyaml
@@ -61,11 +66,6 @@
target_link_libraries(flvmeta yaml)
endif(FLVMETA_USE_SYSTEM_LIBYAML)

-# static build
-if(WIN32)
- add_definitions(-DYAML_DECLARE_STATIC)
-endif(WIN32)
-
if(WIN32)
install(
TARGETS flvmeta

==============================================================================
Revision: 1c3500e7957f
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 11:49:47 2012
Log: Removed the deprecated `ERROR_SAME_FILE' error.

http://code.google.com/p/flvmeta/source/detail?r=1c3500e7957f

Modified:
/src/flvmeta.c
/src/flvmeta.h

=======================================
--- /src/flvmeta.c Fri Apr 20 06:18:25 2012
+++ /src/flvmeta.c Sun Apr 29 11:49:47 2012
@@ -397,7 +397,6 @@
case ERROR_OPEN_WRITE: fprintf(stderr, "%s: cannot open %s for
writing\n", argv[0], options.output_file); break;
case ERROR_INVALID_TAG: fprintf(stderr, "%s: invalid FLV
tag\n", argv[0]); break;
case ERROR_WRITE: fprintf(stderr, "%s: unable to write
to %s\n", argv[0], options.output_file); break;
- case ERROR_SAME_FILE: fprintf(stderr, "%s: input file and
output file must be different\n", argv[0]); break;
}
}

=======================================
--- /src/flvmeta.h Tue Apr 3 02:23:47 2012
+++ /src/flvmeta.h Sun Apr 29 11:49:47 2012
@@ -44,13 +44,12 @@
#define ERROR_OPEN_WRITE 6
#define ERROR_INVALID_TAG 7
#define ERROR_WRITE 8
-#define ERROR_SAME_FILE 9

/* invalid flv file reported by the check command (one or more errors) */
-#define ERROR_INVALID_FLV_FILE 10
+#define ERROR_INVALID_FLV_FILE 9

/* stop file parsing without error */
-#define FLVMETA_DUMP_STOP_OK 11
+#define FLVMETA_DUMP_STOP_OK 10

/* commands */
#define FLVMETA_DEFAULT_COMMAND 0

==============================================================================
Revision: 2cb1e807af4f
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 11:50:39 2012
Log: Completed man page.

http://code.google.com/p/flvmeta/source/detail?r=2cb1e807af4f

Modified:
/man/flvmeta.1.md

=======================================
--- /man/flvmeta.1.md Sun Apr 29 02:33:40 2012
+++ /man/flvmeta.1.md Sun Apr 29 11:50:39 2012
@@ -62,9 +62,9 @@
By default, if no command is specified, **flvmeta** will implicitely
choose the
command to use according to the presence of *INPUT_FILE* and *OUTPUT_FILE*.

-If only *INPUT_FILE* is present, the `--dump` command will be executed.
-
-If both *INPUT_FILE* and *OUTPUT_FILE* are present, the `--update` command
+If only *INPUT_FILE* is present, the **\--dump** command will be executed.
+
+If both *INPUT_FILE* and *OUTPUT_FILE* are present, the **\--update**
command
will be executed.

Here is a list of the supported commands:
@@ -74,7 +74,7 @@
Dump a textual representation of the first _onMetaData_ tag found in
*INPUT_FILE* to standard output. The default format is XML, unless
specified otherwise.
-It is also possible to specify another event via the `--event` option,
+It is also possible to specify another event via the **\--event** option,
such as _onLastSecond_.

## -F, \--full-dump
@@ -89,8 +89,8 @@
the codecs used in the file. The exit code will be set to a non-zero value
if there is at least one error in the file.

-The output format can either be plain text or XML using the `--xml` option.
-It can also be disabled altogether using the `--quiet` option if you are
+The output format can either be plain text or XML using the **\--xml**
option.
+It can also be disabled altogether using the **\--quiet** option if you are
only interested in the exit status.

Messages are divided into four specific levels of increasing importance:
@@ -103,7 +103,7 @@
* **fatal**: messages that inform of errors that make further file reading
impossible therefore ending parsing completely

-The `--level` option allows to limit the display of messages to a minimum
+The **\--level** option allows to limit the display of messages to a
minimum
level among those, for example if the user is only interested in error
messages and above.

@@ -155,16 +155,16 @@
file.

By default, an _onLastSecond_ tag will be inserted, unless the
-`--no-last-second` option is specified.
+**\--no-last-second** option is specified.

Normally overwritten by the update process, the existing metadata found in
-the input file can be preserved by the `--preserve` option.
-
-It is also possible to insert custom string values with the `--add` option,
+the input file can be preserved by the **\--preserve** option.
+
+It is also possible to insert custom string values with the **\--add**
option,
which can be specified multiple times.

By default, the update operation is performed without output, unless the
-`--verbose` option is specified, or the `--print-metadata` is used to
+**\--verbose** option is specified, or the **\--print-metadata** is used to
print the newly written metadata to the standard output.

# OPTIONS
@@ -189,7 +189,7 @@

-e *EVENT*, \--event=*EVENT*
: specify the event to dump instead of _onMetaData_, for example
- _onLastSecond_.
+ _onLastSecond_

## CHECK

@@ -248,10 +248,55 @@

# FORMATS

+The various XML formats used by **flvmeta** are precisely described by the
+following XSD schemas:
+
+* http://schemas.flvmeta.org/flv.xsd: describes the general organization
of FLV
+ files
+* http://schemas.flvmeta.org/Amf0.xsd: describes an XML representation of
the
+ Adobe(TM) AMF0 serialization format
+* http://schemas.flvmeta.org/report.xsd: describes the XML output format
of the
+ **\--check** **\--xml** command
+
# EXAMPLES

+**flvmeta example.flv**
+
+Prints the onMetadata tag contents of example.flv as XML output.
+
+**flvmeta example.flv out.flv**
+
+Creates a file named out.flv containing updated metadata and an
onLastSecond
+tag from the exemple.flv file.
+
+**flvmeta \--check \--xml \--level=error example.flv**
+
+Checks the validity of the example.flv file and prints the error report to
+stdout in XML format, displaying only errors and fatal errors.
+
+**flvmeta \--full-dump \--yaml example.flv**
+
+Prints the full contents of example.flv as YAML format to stdout.
+
+**flvmeta \--update \--no-last-second \--show-metadata \--json
example.flv**
+
+Performs an in-place update of example.flv by inserting computed onMetadata
+without an onLastSecond tag, and prints the newly inserted metadata on
stdout
+as JSON.
+
# EXIT STATUS

+* **0** flvmeta exited without error
+* **1** an error occured when trying to open an input file
+* **2** the input file was not recognized as an FLV file
+* **3** an end-of-file condition was encountered unexpectedly
+* **4** a memory allocation error occured during the run of the program
+* **5** an empty tag was encountered in an input file
+* **6** an error occured when trying to open an output file
+* **7** an invalid tag was encountered in an input file
+* **8** an error was encountered while writing an output file
+* **9** the **\--check** command reported an invalid file (one or more
errors)
+
# BUGS

**flvmeta** does not support encrypted FLV files yet.

==============================================================================
Revision: f89a9f874dfd
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 12:39:28 2012
Log: Added missing files to the top Makefile.am.

http://code.google.com/p/flvmeta/source/detail?r=f89a9f874dfd

Modified:
/Makefile.am

=======================================
--- /Makefile.am Mon Apr 23 06:57:23 2012
+++ /Makefile.am Sun Apr 29 12:39:28 2012
@@ -4,4 +4,7 @@

SUBDIRS = src tests schemas $(MAN_SUBDIR)
EXTRA_DIST = autogen.sh \
- CMakeLists.txt
+ CMakeLists.txt \
+ .gitignore \
+ config-cmake.h.in \
+ FindLibYaml.cmake

==============================================================================
Revision: 84e096784ccb
Author: Marc Noirot <marc....@gmail.com>
Date: Sun Apr 29 12:40:32 2012
Log: Updated miscellaneous files.

http://code.google.com/p/flvmeta/source/detail?r=84e096784ccb

Modified:
/ChangeLog
/NEWS
/TODO

=======================================
--- /ChangeLog Tue Apr 13 06:06:18 2010
+++ /ChangeLog Sun Apr 29 12:40:32 2012
@@ -3,4 +3,7 @@
Please see the change list at :
http://code.google.com/p/flvmeta/source/list

-If you are a package maintainer for a given distribution which policy
states that a ChangeLog file must be appropriately filled with relevant
information, you can use the `svn2cl' tool which can be found at
http://arthurdejong.org/svn2cl/ to generate the ChangeLog file from the
Subversion logs.
+If you are a package maintainer for a given distribution which policy
states
+that a ChangeLog file must be appropriately filled with relevant
information,
+you can use the `git2cl' tool which can be found at
+http://josefsson.org/git2cl/ to generate the ChangeLog file from the Git
logs.
=======================================
--- /NEWS Tue Nov 22 11:17:58 2011
+++ /NEWS Sun Apr 29 12:40:32 2012
@@ -1,6 +1,4 @@
-Version 1.1 (2011-??-??)
- - Beta release. All features should be considered relatively
- stable unless explicitely stated otherwise.
+Version 1.2.0 (2012-04-30)
- Added proper command line handling and help.
- Added the possibility to overwrite the input file
when the output file is not specified or when both files
=======================================
--- /TODO Thu Apr 12 02:07:34 2012
+++ /TODO Sun Apr 29 12:40:32 2012
@@ -7,8 +7,6 @@
to translate it in several languages.
If you want to contribute, send an email to
flvmeta-d...@googlegroups.com.

-Man page (infotex).
-
Complete verbose mode.

Fix onLastSecond insertion, which should be before the last second.