Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7b38e7a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "codecs: reduce error log rate"

parents c496cb0f 72cea1a2

dsp/codecs/audio_aac.c

+12 −2
Original line number Diff line number Diff line
@@ -3,7 +3,17 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2010-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/msm_audio_aac.h>
@@ -383,7 +393,7 @@ static int audio_open(struct inode *inode, struct file *file) 
	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

		pr_err_ratelimited("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}

dsp/codecs/audio_alac.c

+12 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/types.h>
@@ -290,7 +299,7 @@ static int audio_open(struct inode *inode, struct file *file) 
	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

		pr_err_ratelimited("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}

dsp/codecs/audio_amrnb.c

+13 −3
Original line number Diff line number Diff line
@@ -3,7 +3,17 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2017, 2019 The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/types.h>
@@ -137,7 +147,7 @@ static int audio_open(struct inode *inode, struct file *file) 
	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

		pr_err_ratelimited("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}
@@ -178,7 +188,7 @@ static int audio_open(struct inode *inode, struct file *file) 
	if (IS_ERR(audio->dentry))

		pr_debug("debugfs_create_file failed\n");

#endif

	pr_info("%s:amrnb decoder open success, session_id = %d\n", __func__,

	pr_info_ratelimited("%s:amrnb decoder open success, session_id = %d\n", __func__,

				audio->ac->session);

	return rc;

fail:

dsp/codecs/audio_amrwbplus.c

+12 −2
Original line number Diff line number Diff line
@@ -3,7 +3,17 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2017, 2019 The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */

#include <linux/msm_audio_amrwbplus.h>

#include <linux/compat.h>
@@ -313,7 +323,7 @@ static int audio_open(struct inode *inode, struct file *file) 
	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

		pr_err_ratelimited("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}

dsp/codecs/audio_ape.c

+12 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/types.h>
@@ -271,7 +281,7 @@ static int audio_open(struct inode *inode, struct file *file) 
	}

	rc = audio_aio_open(audio, file);

	if (rc < 0) {

		pr_err("%s: audio_aio_open rc=%d\n",

		pr_err_ratelimited("%s: audio_aio_open rc=%d\n",

			__func__, rc);

		goto fail;

	}