Merge branch 'master' into add-inspect-example

.gitignore

@@ -24,6 +24,7 @@ waf3-*
 .waf3-*
 .lock-*
 build
+build_current
 resolve_symlinks
 resolved_dependencies
 

.travis.yml

@@ -0,0 +1,31 @@
+language: bash
+matrix:
+  include:
+    - name: Linux Ubuntu 16 - g++ 5
+      os: linux
+      dist: xenial
+      compiler: gcc
+    - name: Linux Ubuntu 18 - g++ 7
+      os: linux
+      dist: bionic
+      compiler: gcc
+    - name: Linux Ubuntu 18 - clang 7
+      os: linux
+      dist: bionic
+      compiler: clang
+      env:
+        - CXX=clang++
+    - name: MacOSX 10.14 - XCode 11
+      os: osx
+      osx_image: xcode11
+      compiler: clang
+    - name: Windows - Visual Studio 2017
+      os: windows
+      install:
+        # git bash changes the codepage to 65001 which breaks waf's msvc tool,
+        # so we run the configure step in powershell using the 850 codepage
+        - powershell "chcp 850; python waf configure"
+install:
+  - python waf configure
+script:
+  - python waf build -v --run_tests

LICENSE.rst

@@ -1,7 +1,31 @@
-Copyright (c) 2016, Steinwurf ApS
+Nalu License
+---------------
+nalu is provided under the "BSD (3-clause) License"::
 
-All rights reserved.
+  Copyright (c) 2016, Steinwurf ApS
+  All rights reserved.
 
-THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-The copyright notice above does not evidence any
-actual or intended publication of such source code.
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+      * Neither the name of Steinwurf ApS nor the names of its contributors
+        may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL Steinwurf ApS BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.rst

@@ -2,6 +2,9 @@
 nalu
 ====
 
+.. image:: https://travis-ci.org/steinwurf/nalu.svg?branch=master
+    :target: https://travis-ci.org/steinwurf/nalu
+
 The nalu project contains helper functionality for parsing Annex B H264
 streams.
 
@@ -16,4 +19,4 @@ Usage
 
 The library is header-only, so you just need to set the include path to use it.
 
-See the unit tests in ``test/src/`` for usage/API examples.
+See the unit tests in ``test/src/`` for usage/API examples.

src/nalu/annex_b_nalu.hpp

@@ -1,7 +1,6 @@
 // Copyright Steinwurf ApS 2016.
-// Distributed under the "STEINWURF RESEARCH LICENSE 1.0".
-// See accompanying file LICENSE.rst or
-// http://www.steinwurf.com/licensing
+//
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/annex_b_nalu_parser.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/error.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/error_category.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/error_tags.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 NALU_ERROR_TAG(unused,
                "Reserved! Errors should never be zero :)")

src/nalu/error_type.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/is_error_code_enum.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/make_error_code.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/throw_if_error.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/to_annex_b_nalu.hpp

@@ -1,7 +1,6 @@
 // Copyright Steinwurf ApS 2016.
-// Distributed under the "STEINWURF RESEARCH LICENSE 1.0".
-// See accompanying file LICENSE.rst or
-// http://www.steinwurf.com/licensing
+//
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/to_annex_b_nalus.hpp

@@ -1,7 +1,6 @@
 // Copyright Steinwurf ApS 2016.
-// Distributed under the "STEINWURF RESEARCH LICENSE 1.0".
-// See accompanying file LICENSE.rst or
-// http://www.steinwurf.com/licensing
+//
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/type.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/type_from_header.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

src/nalu/type_tags.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 NALU_TYPE_TAG(0, unspecified0, "Unspecified 0", "non-VCL")
 

src/nalu/type_to_string.hpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #pragma once
 

test/nalu_tests.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <cstdint>
 #include <ctime>

test/src/test_annex_b_nalu.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/annex_b_nalu.hpp>
 

test/src/test_annex_b_nalu_parser.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/annex_b_nalu_parser.hpp>
 

test/src/test_error.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/error.hpp>

test/src/test_error_category.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/error_category.hpp>

test/src/test_error_type.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/error_type.hpp>

test/src/test_is_error_code_enum.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/is_error_code_enum.hpp>
 

test/src/test_make_error_code.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/make_error_code.hpp>

test/src/test_throw_if_error.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/throw_if_error.hpp>

test/src/test_to_annex_b_nalu.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/to_annex_b_nalu.hpp>
 

test/src/test_to_annex_b_nalus.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/to_annex_b_nalus.hpp>
 

test/src/test_type.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/type.hpp>

test/src/test_type_from_header.cpp

@@ -1,9 +1,7 @@
 // Copyright (c) 2016 Steinwurf ApS
 // All Rights Reserved
 //
-// THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF STEINWURF
-// The copyright notice above does not evidence any
-// actual or intended publication of such source code.
+// Distributed under the "BSD License". See the accompanying LICENSE.rst file.
 
 #include <nalu/type_from_header.hpp>