From 04c0a73ca53d84472a7a78ec7ecafca0e966c696 Mon Sep 17 00:00:00 2001
From: liubo <liubo419@huawei.com>
Date: Sat, 13 Sep 2025 15:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E5=BC=82=E5=91=8A=E8=AD=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20Signed-off-by:=20liubo419=20<liubo419@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kits/nativecommon/napi_native_mediaplayer_handler_impl.h | 1 -
 .../media_adapter/src/audio_codec_decoder_adapter_impl.cpp   | 5 ++---
 ohos_interface/include/ohos_adapter/drm_adapter.h            | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/interfaces/kits/nativecommon/napi_native_mediaplayer_handler_impl.h b/interfaces/kits/nativecommon/napi_native_mediaplayer_handler_impl.h
index 67c3b5c8e..34caf5d39 100644
--- a/interfaces/kits/nativecommon/napi_native_mediaplayer_handler_impl.h
+++ b/interfaces/kits/nativecommon/napi_native_mediaplayer_handler_impl.h
@@ -17,7 +17,6 @@
 #define NAPI_NATIVE_MEDIAPLAYER_HANDLER_IMPL_H
 
 #include "nweb_native_media_player.h"
-#include "napi_native_mediaplayer_handler_impl.h"
 #include "transfer_referenced_count.h"
 
 namespace OHOS::NWeb {
diff --git a/ohos_adapter/media_adapter/src/audio_codec_decoder_adapter_impl.cpp b/ohos_adapter/media_adapter/src/audio_codec_decoder_adapter_impl.cpp
index bf44630b0..409e00942 100644
--- a/ohos_adapter/media_adapter/src/audio_codec_decoder_adapter_impl.cpp
+++ b/ohos_adapter/media_adapter/src/audio_codec_decoder_adapter_impl.cpp
@@ -21,7 +21,6 @@
 #include <multimedia/native_audio_channel_layout.h>
 #include "native_drm_err.h"
 #include "native_mediakeysession.h"
-#include <cinttypes>
 #include "audio_cenc_info_adapter_impl.h"
 
 #define MIME_SIZE 256
@@ -153,7 +152,7 @@ void AudioDecoderFormatAdapterImpl::PrintFormatData(std::shared_ptr<AudioDecoder
 {
     WVLOG_I("PrintFormatData:SampleRate[%{public}d], ChannelCount[%{public}d],"
             "MaxInputSize[%{public}d], AACIsAdts[%{public}d], AudioSampleFormat[%{public}d],"
-            "BitRate[%{public}" PRId64 "], IDHeader[%{public}d], SetupHeader[%{public}d],",
+            "BitRate[%{public}ld], IDHeader[%{public}d], SetupHeader[%{public}d],",
             format->GetSampleRate(), format->GetChannelCount(), format->GetMaxInputSize(),
             static_cast<int32_t>(format->GetAACIsAdts()), format->GetAudioSampleFormat(),
             format->GetBitRate(), format->GetIdentificationHeader(), format->GetSetupHeader());
@@ -196,7 +195,7 @@ void AudioDecoderCallbackAdapterImpl::OnInputBufferAvailable(uint32_t index)
 void AudioDecoderCallbackAdapterImpl::OnOutputBufferAvailable(
     uint32_t index, uint8_t *bufferData, int32_t size, int64_t pts, int32_t offset, uint32_t flags)
 {
-    WVLOG_I("outputBuffer[%{public}u] available, buffer size[%{public}d], pts[%{public}" PRId64 "],"
+    WVLOG_I("outputBuffer[%{public}u] available, buffer size[%{public}d], pts[%{public}ld],"
         "offset[%{public}d], flags[%{public}u].", index, size, pts, offset, flags);
     if (!cb_) {
         WVLOG_E("callback is nullptr.");
diff --git a/ohos_interface/include/ohos_adapter/drm_adapter.h b/ohos_interface/include/ohos_adapter/drm_adapter.h
index 3dd0968a8..622de6026 100644
--- a/ohos_interface/include/ohos_adapter/drm_adapter.h
+++ b/ohos_interface/include/ohos_adapter/drm_adapter.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 namespace OHOS::NWeb {
 
-- 
Gitee