From e6762a03ee8a4ac44995a5cc5471187c24c83049 Mon Sep 17 00:00:00 2001
From: yangfan <yangfan229@huawei.com>
Date: Thu, 3 Mar 2022 17:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AFvideo=E5=9B=9E=E8=B0=83=E6=9C=AA=E5=9B=9E?=
 =?UTF-8?q?=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangfan <yangfan229@huawei.com>
Change-Id: I0e0265689b71fdd8b46709c92ef994316d73a748
---
 .../core/components/video/media_player_callback.h      | 10 +++++++++-
 frameworks/core/components/video/video_element.cpp     |  7 ++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/frameworks/core/components/video/media_player_callback.h b/frameworks/core/components/video/media_player_callback.h
index 7cd4e337013..034ae2630e7 100644
--- a/frameworks/core/components/video/media_player_callback.h
+++ b/frameworks/core/components/video/media_player_callback.h
@@ -18,6 +18,7 @@
 
 #include "base/log/log.h"
 
+#include "core/common/container_scope.h"
 #include "core/components/video/video_utils.h"
 #include "foundation/multimedia/media_standard/interfaces/innerkits/native/media/include/player.h"
 
@@ -68,6 +69,11 @@ public:
     using StateChangedEvent = std::function<void(PlaybackStatus)>;
 
     MediaPlayerCallback() = default;
+    explicit MediaPlayerCallback(int32_t instanceId)
+    {
+        instanceId_ = instanceId;
+    }
+
     ~MediaPlayerCallback() = default;
 
     void OnError(Media::PlayerErrorType errorType, int32_t errorCode) override
@@ -75,8 +81,9 @@ public:
         LOGE("OnError callback, errorType: %{public}d, errorCode: %{public}d", errorType, errorCode);
     }
 
-    virtual void OnInfo(Media::PlayerOnInfoType type, int32_t extra, const Media::Format &InfoBody = {}) override
+    void OnInfo(Media::PlayerOnInfoType type, int32_t extra, const Media::Format &InfoBody = {}) override
     {
+        ContainerScope scope(instanceId_);
         switch (type) {
             case OHOS::Media::INFO_TYPE_SEEKDONE:
                 LOGI("OnSeekDone callback");
@@ -150,6 +157,7 @@ private:
     PositionUpdatedEvent positionUpdatedEvent_;
     EndOfStreamEvent endOfStreamEvent_;
     StateChangedEvent stateChangedEvent_;
+    int32_t instanceId_ = -1;
 };
 
 } // namespace OHOS::Ace
diff --git a/frameworks/core/components/video/video_element.cpp b/frameworks/core/components/video/video_element.cpp
index 783a912ae95..0996dab8317 100644
--- a/frameworks/core/components/video/video_element.cpp
+++ b/frameworks/core/components/video/video_element.cpp
@@ -27,6 +27,7 @@
 #include "base/log/log.h"
 #include "base/resource/internal_resource.h"
 #include "base/utils/utils.h"
+#include "core/common/container_scope.h"
 #include "core/components/align/align_component.h"
 #include "core/components/box/box_component.h"
 #include "core/components/button/button_component.h"
@@ -285,7 +286,7 @@ void VideoElement::RegistMediaPlayerEvent()
         });
     };
 
-    mediaPlayerCallback_ = std::make_shared<MediaPlayerCallback>();
+    mediaPlayerCallback_ = std::make_shared<MediaPlayerCallback>(ContainerScope::CurrentId());
     mediaPlayerCallback_->SetPositionUpdatedEvent(positionUpdatedEvent);
     mediaPlayerCallback_->SetStateChangedEvent(stateChangedEvent);
     mediaPlayerCallback_->SetEndOfStreamEvent(endOfStreamEvent);
@@ -1103,7 +1104,7 @@ void VideoElement::OnPrepared(
         } else {
             param = std::string("\"prepared\",{\"duration\":").append(std::to_string(duration_)).append("}");
         }
-        LOGE("video onPrepared event: %s ", param.c_str());
+        LOGI("video onPrepared event: %s ", param.c_str());
         onPrepared_(param);
     }
 
@@ -1222,7 +1223,7 @@ void VideoElement::OnCurrentTimeChange(uint32_t currentPos)
         } else {
             param = std::string("\"timeupdate\",{\"currenttime\":").append(std::to_string(currentPos)).append("}");
         }
-        LOGE("video onTimeUpdate event: %s ", param.c_str());
+        LOGI("video onTimeUpdate event: %s ", param.c_str());
         onTimeUpdate_(param);
     }
 }
-- 
Gitee