changeset 11875:0b3ba15b33ea stable

lic: Update license info in source files of HDR10+-
author Pradeep Ramachandran <pradeep@multicorewareinc.com>
date Tue, 05 Sep 2017 11:21:24 +0530
parents b4a5bcfe29c7
children 2718cb5dd67f 752ed1108fce
files source/dynamicHDR10/BasicStructures.h source/dynamicHDR10/JsonHelper.cpp source/dynamicHDR10/JsonHelper.h source/dynamicHDR10/LICENSE.txt source/dynamicHDR10/SeiMetadataDictionary.cpp source/dynamicHDR10/SeiMetadataDictionary.h source/dynamicHDR10/api.cpp source/dynamicHDR10/hdr10plus.h source/dynamicHDR10/metadataFromJson.cpp source/dynamicHDR10/metadataFromJson.h
diffstat 10 files changed, 108 insertions(+-), 120 deletions(-) [+]
line wrap: on
line diff
--- a/source/dynamicHDR10/BasicStructures.h	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/BasicStructures.h	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       BasicStructures.h
- * @brief                      Defines the structure of metadata parameters
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #ifndef BASICSTRUCTURES_H
--- a/source/dynamicHDR10/JsonHelper.cpp	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/JsonHelper.cpp	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       JsonHelper.cpp
- * @brief                      Helper class for JSON parsing
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #include "JsonHelper.h"
--- a/source/dynamicHDR10/JsonHelper.h	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/JsonHelper.h	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       JsonHelper.h
- * @brief                      Helper class for JSON parsing
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #ifndef JSON_H
--- a/source/dynamicHDR10/LICENSE.txt	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/LICENSE.txt	Tue Sep 05 11:21:24 2017 +0530
@@ -1,13 +1,9 @@
-Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+Copyright (C) 2013-2017 MulticoreWare, Inc
 
-This software is the confidential and proprietary information of Samsung Electronics, Inc. ("Confidential Information").
-You shall not disclose such Confidential Information and shall use it only in accordance with the terms of the license agreement
-you entered into with Samsung.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,5 +12,7 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-MA 02110-1301, USA.
\ No newline at end of file
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+
+This program is also available under a commercial proprietary license.
+For more information, contact us at license @ x265.com.
--- a/source/dynamicHDR10/SeiMetadataDictionary.cpp	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/SeiMetadataDictionary.cpp	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       SeiMetadataDictionary.cpp
- * @brief                      Defines the tagname for each metadata value in a JSON dynamic tone mapping file.
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #include "SeiMetadataDictionary.h"
--- a/source/dynamicHDR10/SeiMetadataDictionary.h	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/SeiMetadataDictionary.h	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       SeiMetadataDictionary.h
- * @brief                      Defines the tagname for each metadata value in a JSON dynamic tone mapping file.
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #ifndef SEIMETADATADICTIONARY_H
--- a/source/dynamicHDR10/api.cpp	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/api.cpp	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       api.cpp
- * @brief                      Implementation of hdr10plus API functions.
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #include "hdr10plus.h"
--- a/source/dynamicHDR10/hdr10plus.h	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/hdr10plus.h	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       hdr10plus.h
- * @brief                      Definition of hdr10plus functions.
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #include <stdint.h>
--- a/source/dynamicHDR10/metadataFromJson.cpp	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/metadataFromJson.cpp	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       metadataFromJson.cpp
- * @brief                      Reads a JSON file and produces a byte array containing the metadata to be embedded in different ways.
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #include "metadataFromJson.h"
--- a/source/dynamicHDR10/metadataFromJson.h	Mon Jul 24 11:15:23 2017 +0530
+++ b/source/dynamicHDR10/metadataFromJson.h	Tue Sep 05 11:21:24 2017 +0530
@@ -1,16 +1,13 @@
 /**
- * @file                       metadataFromJson.h
- * @brief                      Reads a JSON file and produces a byte array containing the metadata to be embedded for a frame.
- * @author                     Daniel Maximiliano Valenzuela, Seongnam Oh.
- * @create date                03/01/2017
- * @version                    0.0.1
+ * Copyright (C) 2013-2017 MulticoreWare, Inc
  *
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
+ * Authors: Bhavna Hariharan <bhavna@multicorewareinc.com>
+ *          Kavitha Sampath <kavitha@multicorewareinc.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +16,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
-
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at license @ x265.com.
 **/
 
 #ifndef METADATAFROMJSON_H