From c0866a76f950378db0996a938d7301dcdc2d3a22 Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Mon, 13 Jun 2016 09:42:31 +0000 Subject: [PATCH] [comment]: fix company name hand writing error git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@906 6e48237b-75ef-9749-8fc9-41990f28c85a --- inc/mpp_buffer.h | 2 +- inc/mpp_err.h | 2 +- inc/mpp_frame.h | 2 +- inc/mpp_packet.h | 2 +- inc/rk_mpi.h | 2 +- inc/rk_type.h | 9 +---- inc/vpu.h | 3 +- inc/vpu_api.h | 2 +- mpp/base/inc/mpp_buf_slot.h | 2 +- mpp/base/inc/mpp_buffer_impl.h | 2 +- mpp/base/inc/mpp_frame_impl.h | 2 +- mpp/base/inc/mpp_packet_impl.h | 2 +- mpp/base/mpp_buf_slot.cpp | 4 +-- mpp/base/mpp_buffer.cpp | 2 +- mpp/base/mpp_buffer_impl.cpp | 2 +- mpp/base/mpp_frame.cpp | 2 +- mpp/base/mpp_packet.cpp | 2 +- mpp/codec/dec/avs/avsd_impl.h | 4 +-- mpp/codec/dec/avs/avsd_parse.h | 2 +- mpp/codec/dec/h265/h265d_codec.h | 2 +- mpp/codec/dec/h265/h265d_defs.h | 2 +- mpp/codec/dec/h265/h265d_parser.c | 2 +- mpp/codec/dec/h265/h265d_parser.h | 2 +- mpp/codec/dec/h265/h265d_parser2_syntax.c | 2 +- mpp/codec/dec/h265/h265d_ps.c | 2 +- mpp/codec/dec/h265/h265d_refs.c | 2 +- mpp/codec/dec/h265/h265d_sei.c | 2 +- mpp/codec/dec/h265/test/h265d_parser_test.c | 2 +- mpp/codec/dec/m2v/m2vd_parser.h | 2 +- mpp/codec/inc/avsd_api.h | 2 +- mpp/codec/inc/dummy_dec_api.h | 2 +- mpp/codec/inc/dummy_enc_api.h | 2 +- mpp/codec/inc/h264d_api.h | 2 +- mpp/codec/inc/h264e_api.h | 2 +- mpp/codec/inc/h265d_api.h | 2 +- mpp/codec/inc/m2vd_api.h | 2 +- mpp/codec/inc/mpp_dec.h | 2 +- mpp/codec/inc/mpp_enc.h | 2 +- mpp/codec/inc/mpp_parser.h | 2 +- mpp/codec/inc/parser_api.h | 2 +- mpp/codec/inc/vp8d_api.h | 2 +- mpp/codec/inc/vp8e_api.h | 2 +- mpp/codec/inc/vp9d_api.h | 2 +- mpp/codec/mpp_dec.cpp | 2 +- mpp/codec/mpp_enc.cpp | 2 +- mpp/codec/mpp_parser.cpp | 2 +- mpp/common/h265d_syntax.h | 2 +- mpp/common/vp9d_syntax.h | 2 +- mpp/hal/hal_task.cpp | 3 +- mpp/hal/inc/mpp_hal.h | 2 +- mpp/hal/mpp_hal.cpp | 2 +- mpp/hal/rkdec/h264d/hal_h264d_fifo.c | 3 +- mpp/hal/rkdec/h264d/hal_h264d_rkv_pkt.c | 3 +- mpp/hal/rkdec/h264d/hal_h264d_vdpu_pkt.c | 3 +- mpp/hal/rkdec/h265d/cabac.h | 2 +- mpp/hal/rkdec/h265d/hal_h265d_reg.c | 2 +- mpp/hal/rkdec/h265d/hal_h265d_reg.h | 2 +- mpp/hal/rkdec/vp9d/hal_vp9d_reg.h | 2 +- mpp/hal/rkdec/vp9d/hal_vp9d_table.h | 2 +- mpp/hal/vpu/h265d/dxva2_hevc.c | 2 +- mpp/hal/vpu/m2vd/hal_m2vd_reg.c | 2 +- mpp/hal/vpu/m2vd/hal_m2vd_reg.h | 7 ++-- mpp/hal/worker/libvpu/vpu.c | 3 +- mpp/legacy/ppOp.cpp | 17 ++------- mpp/legacy/ppOp.h | 14 ++------ mpp/legacy/vpu_api.cpp | 2 +- mpp/legacy/vpu_api_legacy.cpp | 6 ++-- mpp/legacy/vpu_api_legacy.h | 2 +- mpp/legacy/vpu_mem_legacy.c | 2 +- mpp/legacy/vpu_mem_legacy.h | 2 +- mpp/mpi.cpp | 2 +- mpp/mpi_impl.cpp | 2 +- mpp/mpi_impl.h | 2 +- mpp/mpp.cpp | 9 +---- mpp/mpp.h | 6 +--- mpp/mpp_info.cpp | 2 +- mpp/mpp_info.h | 3 +- mpp/test/avsd_test.c | 38 ++++++++++----------- mpp/test/h264d_test.c | 2 +- mpp/test/mpp_info_test.c | 2 +- mpp/test/vp9d_test.c | 2 +- osal/allocator/allocator_ion.c | 2 +- osal/allocator/allocator_ion.h | 2 +- osal/android/os_allocator.c | 2 +- osal/android/os_env.c | 2 +- osal/android/os_log.c | 2 +- osal/android/os_mem.c | 2 +- osal/inc/mpp_allocator.h | 2 +- osal/inc/mpp_common.h | 2 +- osal/inc/mpp_env.h | 2 +- osal/inc/mpp_list.h | 2 +- osal/inc/mpp_log.h | 2 +- osal/inc/mpp_mem.h | 2 +- osal/inc/mpp_thread.h | 2 +- osal/inc/mpp_time.h | 2 +- osal/linux/os_allocator.c | 2 +- osal/linux/os_env.c | 2 +- osal/linux/os_log.c | 2 +- osal/linux/os_mem.c | 2 +- osal/mpp_allocator.cpp | 2 +- osal/mpp_allocator_impl.h | 2 +- osal/mpp_common.cpp | 2 +- osal/mpp_env.cpp | 2 +- osal/mpp_list.cpp | 2 +- osal/mpp_log.cpp | 2 +- osal/mpp_mem.cpp | 2 +- osal/mpp_thread.cpp | 2 +- osal/mpp_time.cpp | 2 +- osal/os_allocator.h | 2 +- osal/os_env.h | 2 +- osal/os_log.h | 2 +- osal/os_mem.h | 2 +- osal/test/mpp_env_test.c | 2 +- osal/test/mpp_log_test.c | 2 +- osal/test/mpp_mem_test.c | 2 +- osal/test/mpp_thread_test.c | 3 +- osal/window/os_allocator.c | 2 +- osal/window/os_env.c | 2 +- osal/window/os_log.c | 2 +- osal/window/os_mem.c | 2 +- test/mpi_test.c | 2 +- test/mpp_buffer_test.c | 2 +- test/mpp_packet_test.c | 2 +- test/vpu_api_test.c | 2 +- utils/utils.c | 3 +- utils/utils.h | 2 +- 126 files changed, 155 insertions(+), 200 deletions(-) diff --git a/inc/mpp_buffer.h b/inc/mpp_buffer.h index 211cea6d..d0092514 100644 --- a/inc/mpp_buffer.h +++ b/inc/mpp_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inc/mpp_err.h b/inc/mpp_err.h index b98f1f7f..f604174c 100644 --- a/inc/mpp_err.h +++ b/inc/mpp_err.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inc/mpp_frame.h b/inc/mpp_frame.h index e77a551c..9d933b3c 100644 --- a/inc/mpp_frame.h +++ b/inc/mpp_frame.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inc/mpp_packet.h b/inc/mpp_packet.h index 96efbc33..30b17404 100644 --- a/inc/mpp_packet.h +++ b/inc/mpp_packet.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inc/rk_mpi.h b/inc/rk_mpi.h index d616d74b..a8d132ff 100644 --- a/inc/rk_mpi.h +++ b/inc/rk_mpi.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inc/rk_type.h b/inc/rk_type.h index 4110d468..146d5f89 100644 --- a/inc/rk_type.h +++ b/inc/rk_type.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,6 @@ * limitations under the License. */ -/* - * File : rk_type.h - * Description : type definition - * Author : Jian Huan - * Date : 2010-11-23 21:48:40 - */ - #ifndef __RK_TYPE_H__ #define __RK_TYPE_H__ diff --git a/inc/vpu.h b/inc/vpu.h index b1f171f5..75b7a121 100644 --- a/inc/vpu.h +++ b/inc/vpu.h @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/inc/vpu_api.h b/inc/vpu_api.h index e76b0116..1ee4a295 100644 --- a/inc/vpu_api.h +++ b/inc/vpu_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/inc/mpp_buf_slot.h b/mpp/base/inc/mpp_buf_slot.h index 696d9a82..d618203f 100644 --- a/mpp/base/inc/mpp_buf_slot.h +++ b/mpp/base/inc/mpp_buf_slot.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/inc/mpp_buffer_impl.h b/mpp/base/inc/mpp_buffer_impl.h index ac66c364..2ad0842e 100644 --- a/mpp/base/inc/mpp_buffer_impl.h +++ b/mpp/base/inc/mpp_buffer_impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/inc/mpp_frame_impl.h b/mpp/base/inc/mpp_frame_impl.h index 523142e9..68476756 100644 --- a/mpp/base/inc/mpp_frame_impl.h +++ b/mpp/base/inc/mpp_frame_impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/inc/mpp_packet_impl.h b/mpp/base/inc/mpp_packet_impl.h index a49dc395..e3e4a6b9 100644 --- a/mpp/base/inc/mpp_packet_impl.h +++ b/mpp/base/inc/mpp_packet_impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/mpp_buf_slot.cpp b/mpp/base/mpp_buf_slot.cpp index 9ea00c03..4953cc9e 100644 --- a/mpp/base/mpp_buf_slot.cpp +++ b/mpp/base/mpp_buf_slot.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -642,7 +642,7 @@ RK_S32 mpp_buf_slot_get_used_size(MppBufSlots slots) MppBufSlotEntry *slot = impl->slots; for (i = 0; i < impl->buf_count; i++, slot++) { if (slot->status.on_used) { - buf_slot_dbg(BUF_SLOT_DBG_BUF_UESD, "[BUF_USED] buf_fd=%08x", mpp_buffer_get_fd(slot->buffer)); + buf_slot_dbg(BUF_SLOT_DBG_BUF_UESD, "[BUF_USED] buf_fd=%08x", mpp_buffer_get_fd(slot->buffer)); used_size++; } } diff --git a/mpp/base/mpp_buffer.cpp b/mpp/base/mpp_buffer.cpp index 1946eb75..81f12495 100644 --- a/mpp/base/mpp_buffer.cpp +++ b/mpp/base/mpp_buffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/mpp_buffer_impl.cpp b/mpp/base/mpp_buffer_impl.cpp index e7a1c454..68e71b29 100644 --- a/mpp/base/mpp_buffer_impl.cpp +++ b/mpp/base/mpp_buffer_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/mpp_frame.cpp b/mpp/base/mpp_frame.cpp index 6d2a595b..7f7651fd 100644 --- a/mpp/base/mpp_frame.cpp +++ b/mpp/base/mpp_frame.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/base/mpp_packet.cpp b/mpp/base/mpp_packet.cpp index 7b04ebb3..656a94a0 100644 --- a/mpp/base/mpp_packet.cpp +++ b/mpp/base/mpp_packet.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/avs/avsd_impl.h b/mpp/codec/dec/avs/avsd_impl.h index fd797ce2..91a568b1 100644 --- a/mpp/codec/dec/avs/avsd_impl.h +++ b/mpp/codec/dec/avs/avsd_impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif void avsd_test_main(int argc, char **argv); diff --git a/mpp/codec/dec/avs/avsd_parse.h b/mpp/codec/dec/avs/avsd_parse.h index 4099d05c..ec6a21d5 100644 --- a/mpp/codec/dec/avs/avsd_parse.h +++ b/mpp/codec/dec/avs/avsd_parse.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_codec.h b/mpp/codec/dec/h265/h265d_codec.h index 8f121d92..19e3a844 100644 --- a/mpp/codec/dec/h265/h265d_codec.h +++ b/mpp/codec/dec/h265/h265d_codec.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_defs.h b/mpp/codec/dec/h265/h265d_defs.h index 60f726ac..ba60a135 100644 --- a/mpp/codec/dec/h265/h265d_defs.h +++ b/mpp/codec/dec/h265/h265d_defs.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_parser.c b/mpp/codec/dec/h265/h265d_parser.c index 5b0bd97a..f3084eca 100644 --- a/mpp/codec/dec/h265/h265d_parser.c +++ b/mpp/codec/dec/h265/h265d_parser.c @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_parser.h b/mpp/codec/dec/h265/h265d_parser.h index 207d5b3b..494dd49e 100644 --- a/mpp/codec/dec/h265/h265d_parser.h +++ b/mpp/codec/dec/h265/h265d_parser.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_parser2_syntax.c b/mpp/codec/dec/h265/h265d_parser2_syntax.c index b148c31d..35c2e831 100644 --- a/mpp/codec/dec/h265/h265d_parser2_syntax.c +++ b/mpp/codec/dec/h265/h265d_parser2_syntax.c @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_ps.c b/mpp/codec/dec/h265/h265d_ps.c index cc3e1f99..e8a88f95 100644 --- a/mpp/codec/dec/h265/h265d_ps.c +++ b/mpp/codec/dec/h265/h265d_ps.c @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_refs.c b/mpp/codec/dec/h265/h265d_refs.c index 680427b5..949af26b 100644 --- a/mpp/codec/dec/h265/h265d_refs.c +++ b/mpp/codec/dec/h265/h265d_refs.c @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/h265d_sei.c b/mpp/codec/dec/h265/h265d_sei.c index b625f539..5146bef9 100644 --- a/mpp/codec/dec/h265/h265d_sei.c +++ b/mpp/codec/dec/h265/h265d_sei.c @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/h265/test/h265d_parser_test.c b/mpp/codec/dec/h265/test/h265d_parser_test.c index 47c80079..b6585a10 100644 --- a/mpp/codec/dec/h265/test/h265d_parser_test.c +++ b/mpp/codec/dec/h265/test/h265d_parser_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/dec/m2v/m2vd_parser.h b/mpp/codec/dec/m2v/m2vd_parser.h index 00a2c21b..7d7b01e6 100644 --- a/mpp/codec/dec/m2v/m2vd_parser.h +++ b/mpp/codec/dec/m2v/m2vd_parser.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/avsd_api.h b/mpp/codec/inc/avsd_api.h index 957875f0..1fcafb68 100644 --- a/mpp/codec/inc/avsd_api.h +++ b/mpp/codec/inc/avsd_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/dummy_dec_api.h b/mpp/codec/inc/dummy_dec_api.h index c110dc14..a16957e4 100644 --- a/mpp/codec/inc/dummy_dec_api.h +++ b/mpp/codec/inc/dummy_dec_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/dummy_enc_api.h b/mpp/codec/inc/dummy_enc_api.h index e3e73b90..32246935 100644 --- a/mpp/codec/inc/dummy_enc_api.h +++ b/mpp/codec/inc/dummy_enc_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/h264d_api.h b/mpp/codec/inc/h264d_api.h index d449b514..c48ca5c0 100644 --- a/mpp/codec/inc/h264d_api.h +++ b/mpp/codec/inc/h264d_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/h264e_api.h b/mpp/codec/inc/h264e_api.h index 90949d83..86caee47 100644 --- a/mpp/codec/inc/h264e_api.h +++ b/mpp/codec/inc/h264e_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/h265d_api.h b/mpp/codec/inc/h265d_api.h index 58d15363..15e25a87 100644 --- a/mpp/codec/inc/h265d_api.h +++ b/mpp/codec/inc/h265d_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/m2vd_api.h b/mpp/codec/inc/m2vd_api.h index 09525b01..5571abe3 100644 --- a/mpp/codec/inc/m2vd_api.h +++ b/mpp/codec/inc/m2vd_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/mpp_dec.h b/mpp/codec/inc/mpp_dec.h index 2eeee8d1..01517ac4 100644 --- a/mpp/codec/inc/mpp_dec.h +++ b/mpp/codec/inc/mpp_dec.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/mpp_enc.h b/mpp/codec/inc/mpp_enc.h index d320897b..f863ec2e 100644 --- a/mpp/codec/inc/mpp_enc.h +++ b/mpp/codec/inc/mpp_enc.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/mpp_parser.h b/mpp/codec/inc/mpp_parser.h index d4be0da8..9845ac24 100644 --- a/mpp/codec/inc/mpp_parser.h +++ b/mpp/codec/inc/mpp_parser.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/parser_api.h b/mpp/codec/inc/parser_api.h index fe8ed868..c9058f89 100644 --- a/mpp/codec/inc/parser_api.h +++ b/mpp/codec/inc/parser_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/vp8d_api.h b/mpp/codec/inc/vp8d_api.h index f0fd46cf..3f514ee8 100644 --- a/mpp/codec/inc/vp8d_api.h +++ b/mpp/codec/inc/vp8d_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/vp8e_api.h b/mpp/codec/inc/vp8e_api.h index 71c6a1fc..f8d624f6 100644 --- a/mpp/codec/inc/vp8e_api.h +++ b/mpp/codec/inc/vp8e_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/inc/vp9d_api.h b/mpp/codec/inc/vp9d_api.h index eb5e68a3..54c100e9 100644 --- a/mpp/codec/inc/vp9d_api.h +++ b/mpp/codec/inc/vp9d_api.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/mpp_dec.cpp b/mpp/codec/mpp_dec.cpp index d06c633c..56a8517f 100644 --- a/mpp/codec/mpp_dec.cpp +++ b/mpp/codec/mpp_dec.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/mpp_enc.cpp b/mpp/codec/mpp_enc.cpp index 8c61c0d9..c3550ace 100644 --- a/mpp/codec/mpp_enc.cpp +++ b/mpp/codec/mpp_enc.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/codec/mpp_parser.cpp b/mpp/codec/mpp_parser.cpp index f033c7f9..1d1c0d1b 100644 --- a/mpp/codec/mpp_parser.cpp +++ b/mpp/codec/mpp_parser.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/common/h265d_syntax.h b/mpp/common/h265d_syntax.h index 709fe22f..674e3c9c 100644 --- a/mpp/common/h265d_syntax.h +++ b/mpp/common/h265d_syntax.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/common/vp9d_syntax.h b/mpp/common/vp9d_syntax.h index 18cac57a..9691c512 100644 --- a/mpp/common/vp9d_syntax.h +++ b/mpp/common/vp9d_syntax.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/hal_task.cpp b/mpp/hal/hal_task.cpp index 08d41cf2..1838dbf4 100644 --- a/mpp/hal/hal_task.cpp +++ b/mpp/hal/hal_task.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #define MODULE_TAG "hal_task" #include diff --git a/mpp/hal/inc/mpp_hal.h b/mpp/hal/inc/mpp_hal.h index 1d423edb..54f1adf4 100644 --- a/mpp/hal/inc/mpp_hal.h +++ b/mpp/hal/inc/mpp_hal.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/mpp_hal.cpp b/mpp/hal/mpp_hal.cpp index d2489a91..cfe176b3 100644 --- a/mpp/hal/mpp_hal.cpp +++ b/mpp/hal/mpp_hal.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/h264d/hal_h264d_fifo.c b/mpp/hal/rkdec/h264d/hal_h264d_fifo.c index c60c7695..d626c75b 100644 --- a/mpp/hal/rkdec/h264d/hal_h264d_fifo.c +++ b/mpp/hal/rkdec/h264d/hal_h264d_fifo.c @@ -1,6 +1,5 @@ - /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/h264d/hal_h264d_rkv_pkt.c b/mpp/hal/rkdec/h264d/hal_h264d_rkv_pkt.c index 2c83975e..1083e13a 100644 --- a/mpp/hal/rkdec/h264d/hal_h264d_rkv_pkt.c +++ b/mpp/hal/rkdec/h264d/hal_h264d_rkv_pkt.c @@ -1,6 +1,5 @@ - /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/h264d/hal_h264d_vdpu_pkt.c b/mpp/hal/rkdec/h264d/hal_h264d_vdpu_pkt.c index 060728df..77459869 100644 --- a/mpp/hal/rkdec/h264d/hal_h264d_vdpu_pkt.c +++ b/mpp/hal/rkdec/h264d/hal_h264d_vdpu_pkt.c @@ -1,6 +1,5 @@ - /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/h265d/cabac.h b/mpp/hal/rkdec/h265d/cabac.h index 1c79a79f..9a1523b0 100644 --- a/mpp/hal/rkdec/h265d/cabac.h +++ b/mpp/hal/rkdec/h265d/cabac.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/h265d/hal_h265d_reg.c b/mpp/hal/rkdec/h265d/hal_h265d_reg.c index db401dc7..2fe59ea8 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_reg.c +++ b/mpp/hal/rkdec/h265d/hal_h265d_reg.c @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/h265d/hal_h265d_reg.h b/mpp/hal/rkdec/h265d/hal_h265d_reg.h index afdcd2cb..f53f2a28 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_reg.h +++ b/mpp/hal/rkdec/h265d/hal_h265d_reg.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/vp9d/hal_vp9d_reg.h b/mpp/hal/rkdec/vp9d/hal_vp9d_reg.h index 3d5f5c49..572ec933 100644 --- a/mpp/hal/rkdec/vp9d/hal_vp9d_reg.h +++ b/mpp/hal/rkdec/vp9d/hal_vp9d_reg.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/rkdec/vp9d/hal_vp9d_table.h b/mpp/hal/rkdec/vp9d/hal_vp9d_table.h index c5991b50..0c8b4d57 100644 --- a/mpp/hal/rkdec/vp9d/hal_vp9d_table.h +++ b/mpp/hal/rkdec/vp9d/hal_vp9d_table.h @@ -1,6 +1,6 @@ /* * - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/vpu/h265d/dxva2_hevc.c b/mpp/hal/vpu/h265d/dxva2_hevc.c index 6ca79667..b8627ebc 100644 --- a/mpp/hal/vpu/h265d/dxva2_hevc.c +++ b/mpp/hal/vpu/h265d/dxva2_hevc.c @@ -1,6 +1,6 @@ /* * DXVA2 HEVC HW acceleration. - * Copyright 2010 Rockchip Electronics Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/vpu/m2vd/hal_m2vd_reg.c b/mpp/hal/vpu/m2vd/hal_m2vd_reg.c index 3da0f057..98de522c 100644 --- a/mpp/hal/vpu/m2vd/hal_m2vd_reg.c +++ b/mpp/hal/vpu/m2vd/hal_m2vd_reg.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/hal/vpu/m2vd/hal_m2vd_reg.h b/mpp/hal/vpu/m2vd/hal_m2vd_reg.h index 7c997bc8..527d77f2 100644 --- a/mpp/hal/vpu/m2vd/hal_m2vd_reg.h +++ b/mpp/hal/vpu/m2vd/hal_m2vd_reg.h @@ -1,7 +1,5 @@ -#ifndef __HAL_M2VD_REG_H__ -#define __HAL_M2VD_REG_H__ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +14,9 @@ * limitations under the License. */ +#ifndef __HAL_M2VD_REG_H__ +#define __HAL_M2VD_REG_H__ + #include "m2vd_syntax.h" #include "hal_task.h" #include "mpp_hal.h" diff --git a/mpp/hal/worker/libvpu/vpu.c b/mpp/hal/worker/libvpu/vpu.c index 11896049..ceccc3de 100644 --- a/mpp/hal/worker/libvpu/vpu.c +++ b/mpp/hal/worker/libvpu/vpu.c @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/legacy/ppOp.cpp b/mpp/legacy/ppOp.cpp index aebfb169..f4e38e24 100644 --- a/mpp/legacy/ppOp.cpp +++ b/mpp/legacy/ppOp.cpp @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,21 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * File: - * ppOp.h - * Description: - * Global struct definition in VPU module - * Author: - * Wu JunMin - * Date: - * 2015-03-31 14:43:40 - */ + #define LOG_TAG "PpOp" -#define ATRACE_TAG ATRACE_TAG_VIDEO + #include "vpu.h" #include "ppOp.h" -//#include "reg.h" #ifdef ANDROID diff --git a/mpp/legacy/ppOp.h b/mpp/legacy/ppOp.h index 6cd2e5eb..b3b31869 100644 --- a/mpp/legacy/ppOp.h +++ b/mpp/legacy/ppOp.h @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * File: - * ppOp.h - * Description: - * Global struct definition in VPU module - * Author: - * Wu JunMin - * Date: - * 2015-03-31 14:43:40 - */ + #ifndef _PPOP_H_ #define _PPOP_H_ diff --git a/mpp/legacy/vpu_api.cpp b/mpp/legacy/vpu_api.cpp index 2ea49a83..f693e4a4 100644 --- a/mpp/legacy/vpu_api.cpp +++ b/mpp/legacy/vpu_api.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/legacy/vpu_api_legacy.cpp b/mpp/legacy/vpu_api_legacy.cpp index 387c2ab7..a61ee3ae 100644 --- a/mpp/legacy/vpu_api_legacy.cpp +++ b/mpp/legacy/vpu_api_legacy.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -344,9 +344,9 @@ RK_S32 VpuApi::control(VpuCodecContext *ctx, VPU_API_CMD cmd, void *param) } case VPU_API_SET_DEFAULT_WIDTH_HEIGH: { VPU_GENERIC *p = (VPU_GENERIC *)param; - RK_U32 ImgWidth = p->ImgWidth; + RK_U32 ImgWidth = p->ImgWidth; mpicmd = MPP_CODEC_SET_FRAME_INFO; - /**hightest of p->ImgWidth bit show current dec bitdepth + /**hightest of p->ImgWidth bit show current dec bitdepth * 0 - 8bit * 1 - 10bit **/ diff --git a/mpp/legacy/vpu_api_legacy.h b/mpp/legacy/vpu_api_legacy.h index 52616167..c6b99569 100644 --- a/mpp/legacy/vpu_api_legacy.h +++ b/mpp/legacy/vpu_api_legacy.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/legacy/vpu_mem_legacy.c b/mpp/legacy/vpu_mem_legacy.c index f6f70196..319d2c1b 100644 --- a/mpp/legacy/vpu_mem_legacy.c +++ b/mpp/legacy/vpu_mem_legacy.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/legacy/vpu_mem_legacy.h b/mpp/legacy/vpu_mem_legacy.h index 259e3fa4..81855d23 100644 --- a/mpp/legacy/vpu_mem_legacy.h +++ b/mpp/legacy/vpu_mem_legacy.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/mpi.cpp b/mpp/mpi.cpp index 5fdf0b1b..dbcb46b7 100644 --- a/mpp/mpi.cpp +++ b/mpp/mpi.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/mpi_impl.cpp b/mpp/mpi_impl.cpp index 1aa6cc7e..e3ee6583 100644 --- a/mpp/mpi_impl.cpp +++ b/mpp/mpi_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/mpi_impl.h b/mpp/mpi_impl.h index 8ae0e713..e6dc3536 100644 --- a/mpp/mpi_impl.h +++ b/mpp/mpi_impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/mpp.cpp b/mpp/mpp.cpp index 6333b91a..14bde2e1 100644 --- a/mpp/mpp.cpp +++ b/mpp/mpp.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,6 @@ Mpp::Mpp() mFrameGetCount(0), mTaskPutCount(0), mTaskGetCount(0), - mInternalGroup(NULL), mPacketGroup(NULL), mFrameGroup(NULL), mThreadCodec(NULL), @@ -87,7 +86,6 @@ MPP_RET Mpp::init(MppCtxType type, MppCodingType coding) mThreadCodec = new MppThread(mpp_dec_parser_thread, this, "mpp_dec_parser"); mThreadHal = new MppThread(mpp_dec_hal_thread, this, "mpp_dec_hal"); - mpp_buffer_group_get_internal(&mInternalGroup, MPP_BUFFER_TYPE_ION); mpp_buffer_group_get_internal(&mPacketGroup, MPP_BUFFER_TYPE_ION); mpp_buffer_group_limit_config(mPacketGroup, 0, 3); @@ -101,7 +99,6 @@ MPP_RET Mpp::init(MppCtxType type, MppCodingType coding) mThreadCodec = new MppThread(mpp_enc_control_thread, this, "mpp_enc_ctrl"); mThreadHal = new MppThread(mpp_enc_hal_thread, this, "mpp_enc_hal"); - mpp_buffer_group_get_internal(&mInternalGroup, MPP_BUFFER_TYPE_ION); mpp_buffer_group_get_internal(&mPacketGroup, MPP_BUFFER_TYPE_NORMAL); mpp_buffer_group_get_external(&mFrameGroup, MPP_BUFFER_TYPE_ION); } break; @@ -171,10 +168,6 @@ void Mpp::clear() delete mTasks; mTasks = NULL; } - if (mInternalGroup) { - mpp_buffer_group_put(mInternalGroup); - mInternalGroup = NULL; - } if (mPacketGroup) { mpp_buffer_group_put(mPacketGroup); mPacketGroup = NULL; diff --git a/mpp/mpp.h b/mpp/mpp.h index e7b999a6..bbda89dd 100644 --- a/mpp/mpp.h +++ b/mpp/mpp.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,15 +84,11 @@ public: RK_U32 mTaskGetCount; /* - * internal buffer group - * - for all kind of table like cabac / scaling list - * fixed to ion buffer group * packet buffer group * - packets in I/O, can be ion buffer or normal buffer * frame buffer group * - frames in I/O, normally should be a ion buffer group */ - MppBufferGroup mInternalGroup; MppBufferGroup mPacketGroup; MppBufferGroup mFrameGroup; diff --git a/mpp/mpp_info.cpp b/mpp/mpp_info.cpp index f9fcdc0b..c0b1ba93 100644 --- a/mpp/mpp_info.cpp +++ b/mpp/mpp_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/mpp_info.h b/mpp/mpp_info.h index 074dfee0..8af07cf7 100644 --- a/mpp/mpp_info.h +++ b/mpp/mpp_info.h @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/test/avsd_test.c b/mpp/test/avsd_test.c index 7eb1ebc0..a92c2f7f 100644 --- a/mpp/test/avsd_test.c +++ b/mpp/test/avsd_test.c @@ -1,18 +1,18 @@ /* -* Copyright 2010 Rockchip Electronics S.LSI Co. LTD -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2015 Rockchip Electronics Co. LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #define MODULE_TAG "avsd_test" @@ -246,12 +246,12 @@ static MPP_RET avsd_input_init(InputParams *inp, RK_S32 ac, char *av[]) inp->output_dec_pic = 0; while (CLcount < ac) { - if (!strncmp(av[CLcount], "-h", 2)) { + if (!strncmp(av[CLcount], "-h", 2)) { mpp_log("Options:"); mpp_log(" -h : prints help message."); mpp_log(" -i :[file] Set input AVS+ bitstream file."); mpp_log(" -o :[file] Set output YUV file."); - mpp_log(" -n :[number] Set decoded frames."); + mpp_log(" -n :[number] Set decoded frames."); CLcount += 1; } else if (!strncmp(av[CLcount], "-i", 2)) { @@ -268,7 +268,7 @@ static MPP_RET avsd_input_init(InputParams *inp, RK_S32 ac, char *av[]) if (rkv_avsd_test_debug & AVSD_TEST_DUMPYUV) { inp->output_dec_pic = 1; strncpy(outfile_name, av[CLcount + 1], strlen((const char*)av[CLcount + 1]) + 1); - } + } CLcount += 2; } else { @@ -292,7 +292,7 @@ static MPP_RET avsd_input_init(InputParams *inp, RK_S32 ac, char *av[]) } //!< malloc read buffer - inp->bufsize = 30*1024; + inp->bufsize = 30*1024; MEM_CHECK(ret, inp->pbuf = mpp_malloc(RK_U8, inp->bufsize)); AVSD_TEST_LOG(AVSD_TEST_TRACE, "------------------------------------------------------------"); @@ -462,7 +462,7 @@ int main(int argc, char **argv) AVSD_TEST_LOG(AVSD_TEST_TRACE, "[AVSD_TEST] Single-thread test error."); goto __FAILED; } - + ret = MPP_OK; __FAILED: decoder_deinit(p_dec); diff --git a/mpp/test/h264d_test.c b/mpp/test/h264d_test.c index 1daca45e..fc342279 100644 --- a/mpp/test/h264d_test.c +++ b/mpp/test/h264d_test.c @@ -1,5 +1,5 @@ /* -* Copyright 2010 Rockchip Electronics S.LSI Co. LTD +* Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/test/mpp_info_test.c b/mpp/test/mpp_info_test.c index e6e91752..aa51784f 100644 --- a/mpp/test/mpp_info_test.c +++ b/mpp/test/mpp_info_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mpp/test/vp9d_test.c b/mpp/test/vp9d_test.c index a804c48b..16abfb87 100644 --- a/mpp/test/vp9d_test.c +++ b/mpp/test/vp9d_test.c @@ -1,5 +1,5 @@ /* -* Copyright 2010 Rockchip Electronics S.LSI Co. LTD +* Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/allocator/allocator_ion.c b/osal/allocator/allocator_ion.c index 8f6b2bf3..aff57de7 100644 --- a/osal/allocator/allocator_ion.c +++ b/osal/allocator/allocator_ion.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/allocator/allocator_ion.h b/osal/allocator/allocator_ion.h index dffa15f2..313441d7 100644 --- a/osal/allocator/allocator_ion.h +++ b/osal/allocator/allocator_ion.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/android/os_allocator.c b/osal/android/os_allocator.c index 60c5ac2b..47c5b053 100644 --- a/osal/android/os_allocator.c +++ b/osal/android/os_allocator.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/android/os_env.c b/osal/android/os_env.c index a2fae1e4..d7141c48 100644 --- a/osal/android/os_env.c +++ b/osal/android/os_env.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/android/os_log.c b/osal/android/os_log.c index c4f06737..decb001a 100644 --- a/osal/android/os_log.c +++ b/osal/android/os_log.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/android/os_mem.c b/osal/android/os_mem.c index ed931bf5..92f8d2fe 100644 --- a/osal/android/os_mem.c +++ b/osal/android/os_mem.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_allocator.h b/osal/inc/mpp_allocator.h index a958d5eb..bd81da6a 100644 --- a/osal/inc/mpp_allocator.h +++ b/osal/inc/mpp_allocator.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_common.h b/osal/inc/mpp_common.h index 7a25f29c..d29d216c 100644 --- a/osal/inc/mpp_common.h +++ b/osal/inc/mpp_common.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_env.h b/osal/inc/mpp_env.h index c22ba481..465434b0 100644 --- a/osal/inc/mpp_env.h +++ b/osal/inc/mpp_env.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_list.h b/osal/inc/mpp_list.h index 8712b72e..b438e855 100644 --- a/osal/inc/mpp_list.h +++ b/osal/inc/mpp_list.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_log.h b/osal/inc/mpp_log.h index 40a8e27e..88f61b3a 100644 --- a/osal/inc/mpp_log.h +++ b/osal/inc/mpp_log.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_mem.h b/osal/inc/mpp_mem.h index 4090d5cb..1a2886c8 100644 --- a/osal/inc/mpp_mem.h +++ b/osal/inc/mpp_mem.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_thread.h b/osal/inc/mpp_thread.h index 5ae3d223..d2be98c0 100644 --- a/osal/inc/mpp_thread.h +++ b/osal/inc/mpp_thread.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/inc/mpp_time.h b/osal/inc/mpp_time.h index 70f35559..53078964 100644 --- a/osal/inc/mpp_time.h +++ b/osal/inc/mpp_time.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/linux/os_allocator.c b/osal/linux/os_allocator.c index bb7ebded..b13bdf67 100644 --- a/osal/linux/os_allocator.c +++ b/osal/linux/os_allocator.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/linux/os_env.c b/osal/linux/os_env.c index ed1d5d9e..6c9f05bb 100644 --- a/osal/linux/os_env.c +++ b/osal/linux/os_env.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/linux/os_log.c b/osal/linux/os_log.c index 51cd1636..18658a46 100644 --- a/osal/linux/os_log.c +++ b/osal/linux/os_log.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/linux/os_mem.c b/osal/linux/os_mem.c index 03daf1b5..4534f381 100644 --- a/osal/linux/os_mem.c +++ b/osal/linux/os_mem.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_allocator.cpp b/osal/mpp_allocator.cpp index 46c66f96..3ce07f5f 100644 --- a/osal/mpp_allocator.cpp +++ b/osal/mpp_allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_allocator_impl.h b/osal/mpp_allocator_impl.h index d162478b..3fddf611 100644 --- a/osal/mpp_allocator_impl.h +++ b/osal/mpp_allocator_impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_common.cpp b/osal/mpp_common.cpp index 4c941267..ca7f893f 100644 --- a/osal/mpp_common.cpp +++ b/osal/mpp_common.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_env.cpp b/osal/mpp_env.cpp index 76e2081d..554561e0 100644 --- a/osal/mpp_env.cpp +++ b/osal/mpp_env.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_list.cpp b/osal/mpp_list.cpp index f779e33a..860d3fd2 100644 --- a/osal/mpp_list.cpp +++ b/osal/mpp_list.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_log.cpp b/osal/mpp_log.cpp index 3c467f6c..9fdae88b 100644 --- a/osal/mpp_log.cpp +++ b/osal/mpp_log.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_mem.cpp b/osal/mpp_mem.cpp index d1930bf0..33e74b8c 100644 --- a/osal/mpp_mem.cpp +++ b/osal/mpp_mem.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_thread.cpp b/osal/mpp_thread.cpp index 352d6828..9a6b2b55 100644 --- a/osal/mpp_thread.cpp +++ b/osal/mpp_thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/mpp_time.cpp b/osal/mpp_time.cpp index 9d6a0d0d..e8b38e3c 100644 --- a/osal/mpp_time.cpp +++ b/osal/mpp_time.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/os_allocator.h b/osal/os_allocator.h index eb422928..9f95ac0e 100644 --- a/osal/os_allocator.h +++ b/osal/os_allocator.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/os_env.h b/osal/os_env.h index 50e5f6fe..96d30699 100644 --- a/osal/os_env.h +++ b/osal/os_env.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/os_log.h b/osal/os_log.h index c552eda8..96040eb6 100644 --- a/osal/os_log.h +++ b/osal/os_log.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/os_mem.h b/osal/os_mem.h index 90022e74..5eeb1b86 100644 --- a/osal/os_mem.h +++ b/osal/os_mem.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/test/mpp_env_test.c b/osal/test/mpp_env_test.c index b4590b3b..795b89f5 100644 --- a/osal/test/mpp_env_test.c +++ b/osal/test/mpp_env_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/test/mpp_log_test.c b/osal/test/mpp_log_test.c index 7bf4f548..71c7be17 100644 --- a/osal/test/mpp_log_test.c +++ b/osal/test/mpp_log_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/test/mpp_mem_test.c b/osal/test/mpp_mem_test.c index 9d142dae..0c19a0cc 100644 --- a/osal/test/mpp_mem_test.c +++ b/osal/test/mpp_mem_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/test/mpp_thread_test.c b/osal/test/mpp_thread_test.c index ddf8bd1a..8dbb5f4a 100644 --- a/osal/test/mpp_thread_test.c +++ b/osal/test/mpp_thread_test.c @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/window/os_allocator.c b/osal/window/os_allocator.c index 9839e797..940b22b1 100644 --- a/osal/window/os_allocator.c +++ b/osal/window/os_allocator.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/window/os_env.c b/osal/window/os_env.c index 8aefa580..88b22fe7 100644 --- a/osal/window/os_env.c +++ b/osal/window/os_env.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/window/os_log.c b/osal/window/os_log.c index d6db74ca..38940931 100644 --- a/osal/window/os_log.c +++ b/osal/window/os_log.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/osal/window/os_mem.c b/osal/window/os_mem.c index f73e01a1..28cddada 100644 --- a/osal/window/os_mem.c +++ b/osal/window/os_mem.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/mpi_test.c b/test/mpi_test.c index 708d9438..19de8d38 100644 --- a/test/mpi_test.c +++ b/test/mpi_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/mpp_buffer_test.c b/test/mpp_buffer_test.c index 35855f13..8dd13d51 100644 --- a/test/mpp_buffer_test.c +++ b/test/mpp_buffer_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/mpp_packet_test.c b/test/mpp_packet_test.c index 6d803732..459f4f10 100644 --- a/test/mpp_packet_test.c +++ b/test/mpp_packet_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/vpu_api_test.c b/test/vpu_api_test.c index 329fac59..1cd6b504 100644 --- a/test/vpu_api_test.c +++ b/test/vpu_api_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/utils/utils.c b/utils/utils.c index 7b3a4427..3ab10194 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -1,6 +1,5 @@ /* - * - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/utils/utils.h b/utils/utils.h index 863b40ed..b9b81a20 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -1,5 +1,5 @@ /* - * Copyright 2010 Rockchip Electronics S.LSI Co. LTD + * Copyright 2015 Rockchip Electronics Co. LTD * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.