From 009bc1fc0d896ac4cf9be8ec414bef76a6a2e76b Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Tue, 6 Sep 2016 14:05:11 +0800 Subject: [PATCH] [misc]: format coding style and fix comment error Change-Id: I70d8688971b298be6af07150504b08b7d6aa32c8 Signed-off-by: Herman Chen --- mpp/codec/mpp_enc.cpp | 4 ++-- mpp/hal/inc/hal_jpege_api.h | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mpp/codec/mpp_enc.cpp b/mpp/codec/mpp_enc.cpp index c76e5df2..511d4c3d 100644 --- a/mpp/codec/mpp_enc.cpp +++ b/mpp/codec/mpp_enc.cpp @@ -294,12 +294,12 @@ MPP_RET mpp_enc_init(MppEnc **enc, MppCodingType coding) ret = controller_init(&controller, &controller_cfg); if (ret) { - mpp_err_f("could not init parser\n"); + mpp_err_f("could not init controller\n"); break; } cb.callBack = hal_enc_callback; cb.opaque = controller; - // then init hal with task count from parser + // then init hal with task count from controller MppHalCfg hal_cfg = { MPP_CTX_ENC, coding, diff --git a/mpp/hal/inc/hal_jpege_api.h b/mpp/hal/inc/hal_jpege_api.h index 50b74621..b4e17487 100644 --- a/mpp/hal/inc/hal_jpege_api.h +++ b/mpp/hal/inc/hal_jpege_api.h @@ -1,19 +1,19 @@ /* -* -* 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. -*/ + * + * 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. + */ #ifndef __HAL_JPEGE_API_H__ #define __HAL_JPEGE_API_H__