Just one small correction:
On 9/2/19 11:33 AM, Jiunn Chang wrote:
> Add user control press operands:
> - Mute Function
> - Restore Volume Function
>
> Signed-off-by: Jiunn Chang <c0d1n61at3@xxxxxxxxx>
> ---
> utils/cec-compliance/cec-test-audio.cpp | 32 +++++++++++++++++++++++++
> utils/cec-follower/cec-processing.cpp | 6 +++++
> 2 files changed, 38 insertions(+)
>
> diff --git a/utils/cec-compliance/cec-test-audio.cpp b/utils/cec-compliance/cec-test-audio.cpp
> index 8611350e..872bb9ad 100644
> --- a/utils/cec-compliance/cec-test-audio.cpp
> +++ b/utils/cec-compliance/cec-test-audio.cpp
> @@ -673,6 +673,32 @@ static int sac_user_control_press_mute(struct node *node, unsigned me, unsigned
> return 0;
> }
>
> +static int sac_user_control_press_mute_function(struct node *node, unsigned me, unsigned la, bool interactive)
> +{
> + __u8 ret;
> +
> + if ((ret = sac_util_send_user_control_press(node, me, la, 0x65)))
> + return ret;
> + fail_on_test_v2(node->remote[la].cec_version,
> + la == CEC_LOG_ADDR_AUDIOSYSTEM &&
> + node->remote[la].mute == CEC_OP_AUD_MUTE_STATUS_ON);
> +
> + return 0;
> +}
> +
> +static int sac_user_control_press_restore_volume_function(struct node *node, unsigned me, unsigned la, bool interactive)
> +{
> + __u8 ret;
> +
> + if ((ret = sac_util_send_user_control_press(node, me, la, 0x66)))
> + return ret;
> + fail_on_test_v2(node->remote[la].cec_version,
> + la == CEC_LOG_ADDR_AUDIOSYSTEM &&
> + node->remote[la].mute == CEC_OP_AUD_MUTE_STATUS_OFF);
> +
> + return 0;
> +}
> +
> static int sac_user_control_release(struct node *node, unsigned me, unsigned la, bool interactive)
> {
> struct cec_msg msg = {};
> @@ -763,6 +789,12 @@ struct remote_subtest sac_subtests[] = {
> { "User Control Pressed (Mute)",
> CEC_LOG_ADDR_MASK_AUDIOSYSTEM | CEC_LOG_ADDR_MASK_TV,
> sac_user_control_press_mute },
> + { "User Control Pressed (Restore Volume Function)",
> + CEC_LOG_ADDR_MASK_AUDIOSYSTEM | CEC_LOG_ADDR_MASK_TV,
> + sac_user_control_press_restore_volume_function },
> + { "User Control Pressed (Mute Function)",
> + CEC_LOG_ADDR_MASK_AUDIOSYSTEM | CEC_LOG_ADDR_MASK_TV,
> + sac_user_control_press_mute_function },
> { "User Control Released",
> CEC_LOG_ADDR_MASK_AUDIOSYSTEM | CEC_LOG_ADDR_MASK_TV,
> sac_user_control_release },
> diff --git a/utils/cec-follower/cec-processing.cpp b/utils/cec-follower/cec-processing.cpp
> index 27172560..c6d88647 100644
> --- a/utils/cec-follower/cec-processing.cpp
> +++ b/utils/cec-follower/cec-processing.cpp
> @@ -516,6 +516,12 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me)
> case 0x43:
> node->state.mute = !node->state.mute;
> break;
> + case 0x65:
> + node->state.mute = CEC_OP_AUD_MUTE_STATUS_ON;
> + break;
> + case 0x66:
> + node->state.mute = CEC_OP_AUD_MUTE_STATUS_OFF;
state.mute is a bool, so just use true and false instead of CEC_OP_AUD_MUTE_STATUS_ON/OFF.
> + break;
> case 0x6B:
> if (!enter_standby(node))
> exit_standby(node);
>
Regards,
Hans
