frameworks: change gpl license to amlogic license [4/4]

PD# 160531

change gpl license to amlogic license

Change-Id: I892b87c1c7bbbcd097ec6e5cce25b625efc1e42f

8 files changed, 50 insertions, 137 deletions

diff --git a/core/java/com/droidlogic/app/MediaPlayerClient.java b/core/java/com/droidlogic/app/MediaPlayerClient.java
index 75c3e17..3035fbc 100644
--- a/core/java/com/droidlogic/app/MediaPlayerClient.java
+++ b/core/java/com/droidlogic/app/MediaPlayerClient.java
@@ -1,21 +1,11 @@
 /*
- * AMLOGIC Media Player client.
+ * Copyright (c) 2014 Amlogic, Inc. All rights reserved.
  *
- * 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 named License,
- * or 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+ * This source code is subject to the terms and conditions defined in the
+ * file 'LICENSE' which is part of this source code package.
  *
  * Author:  XiaoLiang.Wang <xiaoliang.wang@amlogic.com>
+ *
  * Date: 20160205
  */
 package com.droidlogic.app;
diff --git a/core/java/com/droidlogic/app/MediaPlayerExt.java b/core/java/com/droidlogic/app/MediaPlayerExt.java
index d926db7..c53e136 100644
--- a/core/java/com/droidlogic/app/MediaPlayerExt.java
+++ b/core/java/com/droidlogic/app/MediaPlayerExt.java
@@ -1,19 +1,9 @@
 /*
  * AMLOGIC Media Player.
  *
- * 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 named License,
- * or any later version.
+ * This source code is subject to the terms and conditions defined in the
+ * file 'LICENSE' which is part of this source code package.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
  *
  * Author:  Wang Jian <jian.wang@amlogic.com>
  * Modified: XiaoLiang.Wang <xiaoliang.wang@amlogic.com 20151202>
diff --git a/services/imageplayer/RGBPicture.h b/services/imageplayer/RGBPicture.h
index 06ecf1d..0b4da5a 100644
--- a/services/imageplayer/RGBPicture.h
+++ b/services/imageplayer/RGBPicture.h
@@ -45,40 +45,35 @@ typedef struct rgb565 {
     short r:5;

 } rc_rgb565_t;

 

-#pragma pack(1) // 按照1字节方式进行对齐

+#pragma pack(1)

 typedef struct

 {

-    unsigned short  bf_type;/*位图文件的类型，必须为BMP(0-1字节)*/

-    unsigned long   bf_size;/*位图文件的大小，以字节为单位(2-5字节)*/

-    unsigned short  bf_reserved1;/*位图文件保留字，必须为0(6-7字节)*/

-    unsigned short  bf_reserved2; /*位图文件保留字，必须为0(8-9字节)*/

-    unsigned long   bf_offbits; /* 位图数据的起始位置，以相对于位图(10-13字节)*/

+    unsigned short  bf_type;

+    unsigned long   bf_size;

+    unsigned short  bf_reserved1;

+    unsigned short  bf_reserved2;

+    unsigned long   bf_offbits;

 }BmpFileHeader_t;

 

 typedef struct

 {

-    unsigned long   bi_size; /* 本结构所占用字节数(14-17字节)*/

-    unsigned long   bi_width;/*位图的宽度，以像素为单位(18-21字节)*/

-    unsigned long   bi_height;/* 位图的高度，以像素为单位(22-25字节)*/

-

-    unsigned short  bi_planes;/* 目标设备的级别，必须为1(26-27字节)*/

-    unsigned short  bi_bitcount;/* 每个像素所需的位数，必须是1(双色),(28-29字节)

-                                4(16色)，8(256色)或24(真彩色)之一*/

-

-    unsigned long   bi_compression; /*位图压缩类型，必须是 0(不压缩),(30-33字节)

-                                    1(BI_RLE8压缩类型)或2(BI_RLE4压缩类型)或者3(BI_BITFIELDS)*/

-

-    unsigned long   bi_sizeimage;/*位图的大小，以字节为单位(34-37字节)*/

-    unsigned long   bi_xpelspermeter;/* 位图水平分辨率，每米像素数(38-41字节)*/

-    unsigned long   bi_ypelspermeter;/*位图垂直分辨率，每米像素数(42-45字节)*/

-    unsigned long   bi_clrused;/*位图实际使用的颜色表中的颜色数(46-49字节)*/

-    unsigned long   bi_clrimportant;/* 位图显示过程中重要的颜色数(50-53字节)*/

+    unsigned long   bi_size;

+    unsigned long   bi_width;

+    unsigned long   bi_height;

+

+    unsigned short  bi_planes;

+    unsigned short  bi_bitcount;

+

+    unsigned long   bi_compression;

+

+    unsigned long   bi_sizeimage;

+    unsigned long   bi_xpelspermeter;

+    unsigned long   bi_ypelspermeter;

+    unsigned long   bi_clrused;

+    unsigned long   bi_clrimportant;

 }BmpInfoHeader_t;

 

 /*

-颜色表中rgb_color_table_t结构数据的个数有bi_bitcount来确定:

-当biBitCount=1,4,8时，分别有2,16,256个表项;

-当biBitCount=16时，bi_compression = BI_BITFIELDS时有三组掩码:0xf800, 0x7e0, 0x1f

     PhotoRGBColorTable_t bmp_colors[3];

 

     bmp_colors[0].rgb_blue      =   0;

@@ -93,16 +88,15 @@ typedef struct
     bmp_colors[2].rgb_green     =   0;

     bmp_colors[2].rgb_red       =   0;

     bmp_colors[2].rgb_reserved  =   0;

-当biBitCount=24时，没有颜色表项。

 */

 typedef struct//color table

 {

-    unsigned char rgb_blue;// 蓝色的亮度(值范围为0-255)

-    unsigned char rgb_green; // 绿色的亮度(值范围为0-255)

-    unsigned char rgb_red; // 红色的亮度(值范围为0-255)

-    unsigned char rgb_reserved;// 保留，必须为0

+    unsigned char rgb_blue;

+    unsigned char rgb_green;

+    unsigned char rgb_red;

+    unsigned char rgb_reserved;

 }BmpColorTable_t;

-#pragma pack() // 取消1字节对齐方式

+#pragma pack()

 

 int RGBA2bmp(char *buf, int width, int height, char* filePath);

 

diff --git a/services/systemcontrol/HDCP/aes.cpp b/services/systemcontrol/HDCP/aes.cpp
index e95e055..2319a22 100644
--- a/services/systemcontrol/HDCP/aes.cpp
+++ b/services/systemcontrol/HDCP/aes.cpp
@@ -1,25 +1,13 @@
 /*
- *  FIPS-197 compliant AES implementation
+ * Copyright (c) 2014 Amlogic, Inc. All rights reserved.
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ * This source code is subject to the terms and conditions defined in the
+ * file 'LICENSE' which is part of this source code package.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
  */
 
+
 /* #include "polarssl/config.h" */
 #define POLARSSL_AES_C
 
diff --git a/services/systemcontrol/HDCP/aes.h b/services/systemcontrol/HDCP/aes.h
index c03053d..8b5c0e5 100644
--- a/services/systemcontrol/HDCP/aes.h
+++ b/services/systemcontrol/HDCP/aes.h
@@ -1,26 +1,12 @@
-/**
- * \file aes.h
- *
- * \brief AES block cipher
- *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+/*
+ * Copyright (c) 2014 Amlogic, Inc. All rights reserved.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ * This source code is subject to the terms and conditions defined in the
+ * file 'LICENSE' which is part of this source code package.
  *
- *  All rights reserved.
- *
- *  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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
  */
+
 #ifndef POLARSSL_AES_H
 #define POLARSSL_AES_H
 
diff --git a/services/systemcontrol/HDCP/sha1.cpp b/services/systemcontrol/HDCP/sha1.cpp
index ae07be8..3d18208 100644
--- a/services/systemcontrol/HDCP/sha1.cpp
+++ b/services/systemcontrol/HDCP/sha1.cpp
@@ -1,28 +1,10 @@
 /*
- *  Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *  based on:
- *  FIPS-180-1 compliant SHA-1 implementation
+ * Copyright (c) 2014 Amlogic, Inc. All rights reserved.
  *
- *  Copyright (C) 2003-2006  Christophe Devine
+ * This source code is subject to the terms and conditions defined in the
+ * file 'LICENSE' which is part of this source code package.
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License, version 2.1 as published by the Free Software Foundation.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA  02110-1301  USA
- */
-/*
- *  The SHA-1 standard was published by NIST in 1993.
- *
- *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
 
 //#include "stdafx.h"
diff --git a/services/systemcontrol/HDCP/sha1.h b/services/systemcontrol/HDCP/sha1.h
index 92b1328..3d37702 100644
--- a/services/systemcontrol/HDCP/sha1.h
+++ b/services/systemcontrol/HDCP/sha1.h
@@ -1,29 +1,12 @@
-/**
- * \file sha1.h
- * based from http://xyssl.org/code/source/sha1/
- *  FIPS-180-1 compliant SHA-1 implementation
- *
- *  Copyright (C) 2003-2006  Christophe Devine
+/*
+ * Copyright (c) 2014 Amlogic, Inc. All rights reserved.
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License, version 2.1 as published by the Free Software Foundation.
+ * This source code is subject to the terms and conditions defined in the
+ * file 'LICENSE' which is part of this source code package.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA   02110-1301  USA
- */
-/*
- *  The SHA-1 standard was published by NIST in 1993.
- *
- *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
+
 #ifndef _SHA1_H
 #define _SHA1_H
 
diff --git a/services/systemcontrol/PQ/include/CSqlite.h b/services/systemcontrol/PQ/include/CSqlite.h
index 691b153..7b8877c 100644
--- a/services/systemcontrol/PQ/include/CSqlite.h
+++ b/services/systemcontrol/PQ/include/CSqlite.h
@@ -89,14 +89,14 @@ public:
         }
 
         int getColumnCount();
-        //瀛楃涓查暱搴﹂棶棰�,寮冪敤
+
         int getString(char *str, int columnIndex)
         {
             if (columnIndex >= mColNums || str == NULL) return -1;
             strcpy(str, mData[mColNums * (mCurRowIndex + 1) + columnIndex]);
             return 0;
         }
-        //涓嶉檺闀垮害,渚濊禆浜嶴tring8
+
         String8 getString(int columnIndex)
         {
             if (columnIndex >= mColNums) return String8("");