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

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

Merge "hal: Update paths for dump and calib files"

parents 57ffe492 b141668c

hal/audio_extn/spkr_protection.c

+2 −2
Original line number Diff line number Diff line 
/*

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

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

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -96,7 +96,7 @@ enum sp_version { 
#define MAX_RESISTANCE_SPKR_Q24 (40 * (1 << 24))



/*Path where the calibration file will be stored*/

#define CALIB_FILE "/data/vendor/misc/audio/audio.cal"

#define CALIB_FILE "/data/vendor/audio/audio.cal"



/*Time between retries for calibartion or intial wait time

  after boot up*/

hal/audio_extn/ssr.c

+4 −4
Original line number Diff line number Diff line 
/*

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

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

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -552,16 +552,16 @@ int32_t audio_extn_ssr_init(struct stream_in *in, int num_out_chan) 
          otherwise, fopen may fail */

        if ( !ssrmod.fp_input) {

            ALOGD("%s: Opening ssr input dump file \n", __func__);

            ssrmod.fp_input = fopen("/data/vendor/misc/audio/ssr_input_3ch.pcm", "wb");

            ssrmod.fp_input = fopen("/data/vendor/audio/ssr_input_3ch.pcm", "wb");

        }



        if ( !ssrmod.fp_output) {

            if(ssrmod.num_out_chan == 6) {

                ALOGD("%s: Opening ssr input dump file for 6 channel\n", __func__);

                ssrmod.fp_output = fopen("/data/vendor/misc/audio/ssr_output_6ch.pcm", "wb");

                ssrmod.fp_output = fopen("/data/vendor/audio/ssr_output_6ch.pcm", "wb");

            } else {

                ALOGD("%s: Opening ssr input dump file for 2 channel\n", __func__);

                ssrmod.fp_output = fopen("/data/vendor/misc/audio/ssr_output_2ch.pcm", "wb");

                ssrmod.fp_output = fopen("/data/vendor/audio/ssr_output_2ch.pcm", "wb");

            }

        }