commit 9a0f8e0bc18e4a64eb7584796472c4481099710d
author qianch <quic_qianch@quicinc.com> Tue Jun 13 10:54:13 2023 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 14 23:35:53 2023 -0700
tree 6a2ba10be0ebc90f8b0874126122b08b2fc6d179
parent ff7481bdd4d61e7fd88d8795fae5f493d30b98d1

Pal: rotation config setting failed should not be fatal when resume

If rotation config setting failed, just print error log but not
block stream resuming. And only setting rotation config to MFC in
non-mspp mode.

Change-Id: I2ea21a882cf3db5537efcf2f61d2827e29118a40

session/src/Session.cpp

diff --git a/session/src/Session.cpp b/session/src/Session.cpp
index 3213362..7235640 100644
--- a/session/src/Session.cpp
+++ b/session/src/Session.cpp
@@ -692,7 +692,8 @@
              }
 
              if ((PAL_DEVICE_OUT_SPEAKER == dAttr.id) &&
-                  (2 == dAttr.config.ch_info.channels)) {
+                  (2 == dAttr.config.ch_info.channels) &&
+                  (strcmp(dAttr.custom_config.custom_key, "mspp") != 0)) {
                  /* Get DevicePP MFC MIID and configure to match to device config */
                  /* This has to be done after sending all mixer controls and
                   * before connect

stream/src/StreamCompress.cpp

diff --git a/stream/src/StreamCompress.cpp b/stream/src/StreamCompress.cpp
index 57a2b3e..a0d4a1c 100644
--- a/stream/src/StreamCompress.cpp
+++ b/stream/src/StreamCompress.cpp
@@ -991,7 +991,6 @@
         if (0 != status) {
             PAL_ERR(LOG_TAG, "session setParameters for rotation failed with status %d",
                     status);
-            goto exit;
         }
     }
 

stream/src/StreamPCM.cpp

diff --git a/stream/src/StreamPCM.cpp b/stream/src/StreamPCM.cpp
index f8995af..deff268 100644
--- a/stream/src/StreamPCM.cpp
+++ b/stream/src/StreamPCM.cpp
@@ -1321,7 +1321,6 @@
             if (0 != status) {
                 PAL_ERR(LOG_TAG, "session setParameters for rotation failed with status %d",
                         status);
-                goto exit;
             }
         }