commit 5a97b476720c9b5438dc5e73da160ab4f7c8aca9
author Houxiang Dai <houxiang.dai@mediatek.com> Mon Mar 22 17:56:04 2021 +0800
committer Wonsik Kim <wonsik@google.com> Tue Mar 30 19:09:39 2021 +0000
tree be60cc77331b345113f3dbbf242f9dd8e0b244b4
parent 00112c5a0aa6834b17ea3d6a84f4ccaeb764a465

support changing audio-hw-sync-id during playback.

Bug: 151997287
Bug: 183968006
Test: Manual
Change-Id: I526cea37ae1124ddc5e74d0d60245ab7faaf5265

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index f7564f6..c96729a 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1889,6 +1889,12 @@
         params->removeEntryAt(params->findEntryByName(KEY_BIT_RATE));
     }
 
+    int32_t syncId = 0;
+    if (params->findInt32("audio-hw-sync", &syncId)
+            || params->findInt32("hw-av-sync-id", &syncId)) {
+        configureTunneledVideoPlayback(comp, nullptr, params);
+    }
+
     Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
     const std::unique_ptr<Config> &config = *configLocked;
 
@@ -2179,6 +2185,10 @@
         return UNKNOWN_ERROR;
     }
 
+    if (sidebandHandle == nullptr) {
+        return OK;
+    }
+
     std::vector<std::unique_ptr<C2Param>> params;
     c2err = comp->query({}, {C2PortTunnelHandleTuning::output::PARAM_TYPE}, C2_DONT_BLOCK, &params);
     if (c2err == C2_OK && params.size() == 1u) {