author | Zhi Zhou <zhi.zhou@amlogic.com> | 2017-11-08 02:45:57 (GMT) |
---|---|---|
committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2017-11-09 03:12:21 (GMT) |
commit | 6a53ae689996668ee42ce735214fb3de3c62389b (patch) | |
tree | 496df2be1c91a28d7741f1094d9584955a2c8fd8 | |
parent | 01d3b87c1c4c96f45a3ba00ff171080703c44172 (diff) | |
download | media-ref-o-20171115.zip media-ref-o-20171115.tar.gz media-ref-o-20171115.tar.bz2 |
media: merged some from n-amlogic [2/2[
PD#146719
media: fixed amlogic license
PD#144802 Revert exec amavutils when set
output mode complete or timeout. commit ee259661
Change-Id: I570748e1a5217cb682f59266b139162f41565b03
57 files changed, 581 insertions, 15 deletions
@@ -0,0 +1,23 @@ +// Copyright (C) 2015 Amlogic, Inc. All rights reserved. +// +// All information contained herein is Amlogic confidential. +// +// This software is provided to you pursuant to Software License +// Agreement (SLA) with Amlogic Inc ("Amlogic"). This software may be +// used only in accordance with the terms of this agreement. +// +// Redistribution and use in source and binary forms, with or without +// modification is strictly prohibited without prior written permission +// from Amlogic. +// +// 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 THE COPYRIGHT +// OWNER OR CONTRIBUTORS 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. diff --git a/amavutils/Amsyswrite.cpp b/amavutils/Amsyswrite.cpp index eb711b5..3d895e6 100644 --- a/amavutils/Amsyswrite.cpp +++ b/amavutils/Amsyswrite.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef NO_USE_SYSWRITE #define LOG_TAG "amSystemWrite" diff --git a/amavutils/Amvideocaptools.c b/amavutils/Amvideocaptools.c index 60f132d..d66e134 100644 --- a/amavutils/Amvideocaptools.c +++ b/amavutils/Amvideocaptools.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "AmAvutls" #include <stdlib.h> diff --git a/amavutils/Amvideoutils.c b/amavutils/Amvideoutils.c index 67393e1..f39278b 100644 --- a/amavutils/Amvideoutils.c +++ b/amavutils/Amvideoutils.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "amavutils" @@ -39,7 +49,6 @@ #define PPSCALER_RECT "/sys/class/ppmgr/ppscaler_rect" #define WINDOW_AXIS_PATH_FB1 "/sys/class/graphics/fb1/window_axis" #define FREE_SCALE_AXIS_PATH_FB1 "/sys/class/graphics/fb1/free_scale_axis" -#define PROC_SETMODE_COMPLETE "sys.setmode.complete" //set this prop to true, when set outputmode complete static int rotation = 0; static int disp_width = 1920; @@ -453,19 +462,6 @@ void set_scale(int x, int y, int w, int h, int *dst_x, int *dst_y, int *dst_w, i int amvideo_utils_set_virtual_position(int32_t x, int32_t y, int32_t w, int32_t h, int rotation) { LOG_FUNCTION_NAME - - //this code block ensure to exec this func, when system_control setSourceOutputMode complete or Timeout. - for (int i = 0; i < 20; i++) { - char value[PROPERTY_VALUE_MAX] = {0}; - property_get(PROC_SETMODE_COMPLETE, value, "null"); - if (!strcmp(value, "true") || !strcmp(value, "null")) { - break; - } else { - LOGI("wait set outputmode complete, SLEEP 50ms!"); - usleep(50000); - } - } - //for osd rotation, need convert the axis first int osd_rotation = amdisplay_utils_get_osd_rotation(); if (osd_rotation > 0) { diff --git a/amavutils/amaudioutils.c b/amavutils/amaudioutils.c index 5db821d..798521b 100644 --- a/amavutils/amaudioutils.c +++ b/amavutils/amaudioutils.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "AmAvutls" #include <stdlib.h> diff --git a/amavutils/amconfigutils.c b/amavutils/amconfigutils.c index a1d6978..9b0b1e0 100644 --- a/amavutils/amconfigutils.c +++ b/amavutils/amconfigutils.c @@ -1,4 +1,14 @@ /* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + +/* libplayer's configs. changed to HASH and list for fast get,set... diff --git a/amavutils/amdisplayutils.c b/amavutils/amdisplayutils.c index 3a3a43d..af8e5a3 100644 --- a/amavutils/amdisplayutils.c +++ b/amavutils/amdisplayutils.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "amavutils" diff --git a/amavutils/amdrmutils.c b/amavutils/amdrmutils.c index aae8354..7d3ba2b 100644 --- a/amavutils/amdrmutils.c +++ b/amavutils/amdrmutils.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "amdrmutils" diff --git a/amavutils/amsufaceutils.cpp b/amavutils/amsufaceutils.cpp index 9e2b310..027a1fe 100644 --- a/amavutils/amsufaceutils.cpp +++ b/amavutils/amsufaceutils.cpp @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ #include "utils/Log.h" #include <android/native_window.h> #include "Amsufaceutils.h" @@ -5,7 +13,6 @@ namespace android { - int InitVideoSurfaceTexture(const sp<IGraphicBufferProducer>& bufferProducer) { sp<ANativeWindow> mNativeWindow = NULL; diff --git a/amavutils/amsysfsutils.c b/amavutils/amsysfsutils.c index 230e233..c095250 100644 --- a/amavutils/amsysfsutils.c +++ b/amavutils/amsysfsutils.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "amavutils" diff --git a/amavutils/amthreadpool.c b/amavutils/amthreadpool.c index 073c854..6014663 100644 --- a/amavutils/amthreadpool.c +++ b/amavutils/amthreadpool.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #include <amthreadpool.h> #include <itemlist.h> diff --git a/amavutils/include/Amavutils.h b/amavutils/include/Amavutils.h index 7fc46f2..96912b1 100644 --- a/amavutils/include/Amavutils.h +++ b/amavutils/include/Amavutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMAV_UTILS_H #define AMAV_UTILS_H diff --git a/amavutils/include/Amdisplayutils.h b/amavutils/include/Amdisplayutils.h index a27c9cb..ee75c4b 100644 --- a/amavutils/include/Amdisplayutils.h +++ b/amavutils/include/Amdisplayutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMDISPLAY_UTILS_H #define AMDISPLAY_UTILS_H diff --git a/amavutils/include/Amsufaceutils.h b/amavutils/include/Amsufaceutils.h index fb21de1..ba47c9d 100644 --- a/amavutils/include/Amsufaceutils.h +++ b/amavutils/include/Amsufaceutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMSURFACE_UTILS_HEADER_SS #define AMSURFACE_UTILS_HEADER_SS diff --git a/amavutils/include/Amsysfsutils.h b/amavutils/include/Amsysfsutils.h index 3584ac4..de97d5a 100644 --- a/amavutils/include/Amsysfsutils.h +++ b/amavutils/include/Amsysfsutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMSYSFS_UTILS_H #define AMSYSFS_UTILS_H diff --git a/amavutils/include/Amsyswrite.h b/amavutils/include/Amsyswrite.h index b456002..49970a8 100644 --- a/amavutils/include/Amsyswrite.h +++ b/amavutils/include/Amsyswrite.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMSYSWRITE_UTILS_H #define AMSYSWRITE_UTILS_H diff --git a/amavutils/include/Amvideocap.h b/amavutils/include/Amvideocap.h index 92ad575..00f0fca 100644 --- a/amavutils/include/Amvideocap.h +++ b/amavutils/include/Amvideocap.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef __AMVIDEOCAP_HEADHER_ #define __AMVIDEOCAP_HEADHER_ #define AMVIDEOCAP_IOC_MAGIC 'V' diff --git a/amavutils/include/Amvideocaptools.h b/amavutils/include/Amvideocaptools.h index 597c82f..e6263c0 100644 --- a/amavutils/include/Amvideocaptools.h +++ b/amavutils/include/Amvideocaptools.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMVIDEOCAP_TOOLS_HEAD #define AMVIDEOCAP_TOOLS_HEAD #include "Amvideocap.h" diff --git a/amavutils/include/Amvideoutils.h b/amavutils/include/Amvideoutils.h index 7913374..bfc207d 100644 --- a/amavutils/include/Amvideoutils.h +++ b/amavutils/include/Amvideoutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMVIDEO_UTILS_H #define AMVIDEO_UTILS_H diff --git a/amavutils/include/amaudioutils.h b/amavutils/include/amaudioutils.h index ff2307f..e8aa68a 100644 --- a/amavutils/include/amaudioutils.h +++ b/amavutils/include/amaudioutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMAUDIO_UTILS_H #define AMAUDIO_UTILS_H diff --git a/amavutils/include/amconfigutils.h b/amavutils/include/amconfigutils.h index cbdd0bc..cf8e12d 100644 --- a/amavutils/include/amconfigutils.h +++ b/amavutils/include/amconfigutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef FF_CONFIGS_H__ #define FF_CONFIGS_H__ diff --git a/amavutils/include/amdrmutils.h b/amavutils/include/amdrmutils.h index f78eb56..6a45b43 100644 --- a/amavutils/include/amdrmutils.h +++ b/amavutils/include/amdrmutils.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMDRM_UTILS_H #define AMDRM_UTILS_H diff --git a/amavutils/include/ammodule.h b/amavutils/include/ammodule.h index ed70539..4713641 100644 --- a/amavutils/include/ammodule.h +++ b/amavutils/include/ammodule.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef ANDROID_INCLUDE_AMMODULE_H #define ANDROID_INCLUDE_AMMODULE_H diff --git a/amavutils/include/amthreadpool.h b/amavutils/include/amthreadpool.h index 4b6eabf..e7bb4e0 100644 --- a/amavutils/include/amthreadpool.h +++ b/amavutils/include/amthreadpool.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AM_LIBPLAYER_THREAD_POOL #define AM_LIBPLAYER_THREAD_POOL #include <pthread.h> diff --git a/amavutils/include/audio_ctl.h b/amavutils/include/audio_ctl.h index 8b18caf..f9e0405 100644 --- a/amavutils/include/audio_ctl.h +++ b/amavutils/include/audio_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AUDIO_CTL_H #define AUDIO_CTL_H diff --git a/amavutils/include/itemlist.h b/amavutils/include/itemlist.h index 940d538..d8f5caa 100644 --- a/amavutils/include/itemlist.h +++ b/amavutils/include/itemlist.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef _PLAYER_ITEMLIST_H_ #define _PLAYER_ITEMLIST_H_ diff --git a/amavutils/include/list.h b/amavutils/include/list.h index f67a84b..e54a1cf 100644 --- a/amavutils/include/list.h +++ b/amavutils/include/list.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef LIST_HEADERS_H #define LIST_HEADERS_H diff --git a/amavutils/include/media_ctl.h b/amavutils/include/media_ctl.h index 8f75276..fcb459b 100644 --- a/amavutils/include/media_ctl.h +++ b/amavutils/include/media_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef MEDIA_CTL_H #define MEDIA_CTL_H diff --git a/amavutils/include/sub_ctl.h b/amavutils/include/sub_ctl.h index c634596..fbbe03c 100644 --- a/amavutils/include/sub_ctl.h +++ b/amavutils/include/sub_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef SUB_CTL_H #define SUB_CTL_H diff --git a/amavutils/include/tsync_ctl.h b/amavutils/include/tsync_ctl.h index 27320e8..b04d2f4 100644 --- a/amavutils/include/tsync_ctl.h +++ b/amavutils/include/tsync_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef TSYNC_CTL_H #define TSYNC_CTL_H diff --git a/amavutils/include/vfm_ctl.h b/amavutils/include/vfm_ctl.h index 81ac586..8273d2e 100644 --- a/amavutils/include/vfm_ctl.h +++ b/amavutils/include/vfm_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef VFM_CTL_H #define VFM_CTL_H #ifdef __cplusplus diff --git a/amavutils/include/video_ctl.h b/amavutils/include/video_ctl.h index a08fd11..0994747 100644 --- a/amavutils/include/video_ctl.h +++ b/amavutils/include/video_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef VIDEO_CTL_H #define VIDEO_CTL_H #ifdef __cplusplus diff --git a/amavutils/itemlist.c b/amavutils/itemlist.c index 6035784..40e2db3 100644 --- a/amavutils/itemlist.c +++ b/amavutils/itemlist.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + /******************************************** * name : player_itemlis.c * function: item fifo manage for muti threads diff --git a/amavutils/mediaconfig/configs_api.h b/amavutils/mediaconfig/configs_api.h index a6a72aa..5bb243f 100644 --- a/amavutils/mediaconfig/configs_api.h +++ b/amavutils/mediaconfig/configs_api.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMLOGIC_MEDIA_CONFIG_API__ #define AMLOGIC_MEDIA_CONFIG_API__ #include <linux/ioctl.h> diff --git a/amavutils/mediaconfig/media_config.cpp b/amavutils/mediaconfig/media_config.cpp index 479e525..cfc27ea 100644 --- a/amavutils/mediaconfig/media_config.cpp +++ b/amavutils/mediaconfig/media_config.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "meda_config_hw" #include <stdlib.h> #include <stdio.h> diff --git a/amavutils/mediaconfig/media_config.h b/amavutils/mediaconfig/media_config.h index 2436d51..416cf49 100644 --- a/amavutils/mediaconfig/media_config.h +++ b/amavutils/mediaconfig/media_config.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef MEDIA_CONFIG_API___ #define MEDIA_CONFIG_API___ int media_config_list(char *val, int len); diff --git a/amavutils/mediaconfig/media_config_hw.cpp b/amavutils/mediaconfig/media_config_hw.cpp index 59879dd..bacbc35 100644 --- a/amavutils/mediaconfig/media_config_hw.cpp +++ b/amavutils/mediaconfig/media_config_hw.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "meda_config_hw" #include <stdlib.h> diff --git a/amavutils/mediaconfig/media_config_hw.h b/amavutils/mediaconfig/media_config_hw.h index 6535ac8..9a1f672 100644 --- a/amavutils/mediaconfig/media_config_hw.h +++ b/amavutils/mediaconfig/media_config_hw.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef MEDIA_CONFIG_HW___ #define MEDIA_CONFIG_HW___ #include <stdlib.h> diff --git a/amavutils/mediactl/audio_ctl.cpp b/amavutils/mediactl/audio_ctl.cpp index 15923ec..bbe5295 100644 --- a/amavutils/mediactl/audio_ctl.cpp +++ b/amavutils/mediactl/audio_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "media_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/mediactl/common_ctl.cpp b/amavutils/mediactl/common_ctl.cpp index 8ba5016..525a9d8 100644 --- a/amavutils/mediactl/common_ctl.cpp +++ b/amavutils/mediactl/common_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "media_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/mediactl/common_ctl.h b/amavutils/mediactl/common_ctl.h index 8f1e2f6..82db258 100644 --- a/amavutils/mediactl/common_ctl.h +++ b/amavutils/mediactl/common_ctl.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef COMMON_CTL_H #define COMMON_CTL_H diff --git a/amavutils/mediactl/media_ctl.cpp b/amavutils/mediactl/media_ctl.cpp index 3f7397a..eb79508 100644 --- a/amavutils/mediactl/media_ctl.cpp +++ b/amavutils/mediactl/media_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "media_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/mediactl/sub_ctl.cpp b/amavutils/mediactl/sub_ctl.cpp index d0ce249..1b2d52d 100644 --- a/amavutils/mediactl/sub_ctl.cpp +++ b/amavutils/mediactl/sub_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "media_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/mediactl/tsync_ctl.cpp b/amavutils/mediactl/tsync_ctl.cpp index 1a06288..1cbf924 100644 --- a/amavutils/mediactl/tsync_ctl.cpp +++ b/amavutils/mediactl/tsync_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "tsync_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/mediactl/vfm_ctl.cpp b/amavutils/mediactl/vfm_ctl.cpp index 9264665..733a063 100644 --- a/amavutils/mediactl/vfm_ctl.cpp +++ b/amavutils/mediactl/vfm_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "media_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/mediactl/video_ctl.cpp b/amavutils/mediactl/video_ctl.cpp index d6d8a08..080a666 100644 --- a/amavutils/mediactl/video_ctl.cpp +++ b/amavutils/mediactl/video_ctl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #define LOG_TAG "media_ctl" #include <stdio.h> #include <stdlib.h> diff --git a/amavutils/tools/mediactl.cpp b/amavutils/tools/mediactl.cpp index bf71674..53c4c47 100644 --- a/amavutils/tools/mediactl.cpp +++ b/amavutils/tools/mediactl.cpp @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #include <stdio.h> #include <stdlib.h> #include <fcntl.h> diff --git a/amvdec/amlv4l.c b/amvdec/amlv4l.c index 5589f44..0a4691b 100644 --- a/amvdec/amlv4l.c +++ b/amvdec/amlv4l.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #include <stdio.h> #include <fcntl.h> #include <errno.h> diff --git a/amvdec/amlv4l.h b/amvdec/amlv4l.h index 279a3fd..e6c0fce 100644 --- a/amvdec/amlv4l.h +++ b/amvdec/amlv4l.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMLV4L_HEAD_A__ #define AMLV4L_HEAD_A__ #include <amvideo.h> diff --git a/amvdec/amvdec_priv.h b/amvdec/amvdec_priv.h index e242610..11760eb 100644 --- a/amvdec/amvdec_priv.h +++ b/amvdec/amvdec_priv.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMVDEC_PRIV_HEADER__ #define AMVDEC_PRIV_HEADER__ diff --git a/amvdec/amvideo.c b/amvdec/amvideo.c index 3aaa469..495227e 100644 --- a/amvdec/amvideo.c +++ b/amvdec/amvideo.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/amvdec/include/amvideo.h b/amvdec/include/amvideo.h index 1b5f8af..ab1b842 100644 --- a/amvdec/include/amvideo.h +++ b/amvdec/include/amvideo.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef AMVDEC_AMVIDEO_HEADER_SS #define AMVDEC_AMVIDEO_HEADER_SS #include <stdlib.h> diff --git a/amvdec/include/ionvideo.h b/amvdec/include/ionvideo.h index 4ff2908..2ab1c94 100644 --- a/amvdec/include/ionvideo.h +++ b/amvdec/include/ionvideo.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef IONVDEC_AMVIDEO_HEADER_SS #define IONVDEC_AMVIDEO_HEADER_SS #include <stdlib.h> diff --git a/amvdec/ionv4l.c b/amvdec/ionv4l.c index 12f2e07..b7f3f4e 100644 --- a/amvdec/ionv4l.c +++ b/amvdec/ionv4l.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #include <stdio.h> #include <fcntl.h> #include <errno.h> diff --git a/amvdec/ionv4l.h b/amvdec/ionv4l.h index c687cc0..eae164c 100644 --- a/amvdec/ionv4l.h +++ b/amvdec/ionv4l.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef IONV4L_HEAD_A__ #define IONV4L_HEAD_A__ #include <ionvideo.h> diff --git a/amvdec/ionvdec_priv.h b/amvdec/ionvdec_priv.h index 767eefe..7bd2a15 100644 --- a/amvdec/ionvdec_priv.h +++ b/amvdec/ionvdec_priv.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #ifndef IONVDEC_PRIV_HEADER__ #define IONVDEC_PRIV_HEADER__ diff --git a/amvdec/ionvideo.c b/amvdec/ionvideo.c index 7832731..4660363 100644 --- a/amvdec/ionvideo.c +++ b/amvdec/ionvideo.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2014 Amlogic, Inc. All rights reserved. + * + * This source code is subject to the terms and conditions defined in the + * file 'LICENSE' which is part of this source code package. + * + * Description: + */ + + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> |