Update source to Armbian-dev-202610.A311Y3

aml-comp/multimedia/aml_audio_hal/decoder/libms12/include/DolbyMS12ConfigParams.h

@@ -336,6 +336,12 @@ public:
         ALOGI("%s() mVersion %d\n", __FUNCTION__, mVersion);
     }
 
+    virtual void setPcmrEffectOut(int value)
+    {
+        mPcmrEffectOut = value;
+        ALOGI("%s() mPcmrEffectOut %d\n", __FUNCTION__, mPcmrEffectOut);
+    }
+
 
 protected:
 
@@ -459,7 +465,8 @@ private:
 
     bool mIsLegacyDDPOut;
     bool mTVTuningFlag;
-    bool mFullDAPDisable;
+    int mFullDAPDisable; /* 0: DAP on, 1: DAP mute, 2: DAP raw (bypass) */
+    int mPcmrEffectOut;  /* 0: off; 1: enable PCMR effect raw out on config Y */
     /*
        DD/DD+ output is used for
        0 = Full HDMI (default)

aml-comp/multimedia/aml_audio_hal/decoder/libms12/include/aml_audio_ms12.h

@@ -101,6 +101,14 @@ typedef enum  {
     MS12_CODEC_CALLBACK_MAX,
 }ms12_codec_callback_type_t;
 
+typedef enum {
+    MIXER_BUFFER_STEREO = 0,
+    MIXER_BUFFER_DAP,
+    MIXER_BUFFER_MCH,
+    MIXER_BUFFER_ENC,
+    MIXER_BUFFER_MAX = 4,
+} MIXER_BUFFER;
+
 enum MS12_PROCESS_CALLBACK_PCM_TYPE {
     PCM_INT16 = 0,
     PCM_INT32 = 1,
@@ -153,6 +161,22 @@ typedef struct AML_MS12_CodecInfo_s
     int reserved[62];
 } AML_MS12_CodecInfo_t;
 
+typedef struct ms12_buffer_s
+{
+    unsigned channel;
+    ptrdiff_t n;
+    int type;
+    void **data;
+} ms12_buffer_t;
+
+typedef struct Aml_MS12_MixerInfo_s {
+    ms12_buffer_t *buffer[MIXER_BUFFER_MAX];
+    int buffer_acmod[MIXER_BUFFER_MAX];
+    int buffer_lfe[MIXER_BUFFER_MAX];
+    int process_frame;
+    int as32Reserved[8];
+} Aml_MS12_MixerInfo_t;
+
 struct dolby_ms12_desc {
     bool dolby_ms12_enable;//After continuous graph creats, this value is set to 1
     bool dolby_ms12_init_flags;//After continuous graph or dap only creats, this value is set to 1
@@ -313,6 +337,14 @@ struct dolby_ms12_desc {
     void *continuous_standby_handle;
     void *decoder_loudness_limiter;
     void *dap_loudness_limiter;
+    void *ms12_expand_handle;
+    void *expand_sys_handle;
+    void *expand_post_handle;
+    /* DAP raw pcm output is acting as the master output (DAP bypassed / PCMR tap) */
+    bool dap_raw_pcm_active;
+    bool b_enable_pcmr_effect;
+    void *dap_raw_remap_buf;
+    size_t dap_raw_remap_buf_sz;
 };
 
 

aml-comp/multimedia/aml_audio_hal/decoder/libms12/include/dolby_ms12_config_params.h

@@ -419,6 +419,7 @@ void dolby_ms12_set_dap_only(int dap_only);
 void dolby_ms12_set_hal_content_process(int hal_content_process);
 void dolby_ms12_set_output_bitwidth(int bit_width);
 void dolby_ms12_set_version(int version);
+void dolby_ms12_set_pcmr_effect(int value);
 /*End*/
 
 #ifdef __cplusplus