diff --git a/interfaces/kits/nativecommon/napi_native_mediaplayer_handler_impl.h b/interfaces/kits/nativecommon/napi_native_mediaplayer_handler_impl.h index 67c3b5c8e7ece8777d75bd451d5a85e39ac72f35..34caf5d39506e37e30b75e1904470305e719818d 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 bf44630b0d2088ca67c7e4cdd4ce19441667de95..409e00942565732f5487998b1008c0dcf42bc2b1 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 #include "native_drm_err.h" #include "native_mediakeysession.h" -#include #include "audio_cenc_info_adapter_impl.h" #define MIME_SIZE 256 @@ -153,7 +152,7 @@ void AudioDecoderFormatAdapterImpl::PrintFormatData(std::shared_ptrGetSampleRate(), format->GetChannelCount(), format->GetMaxInputSize(), static_cast(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 3dd0968a8e3cc41b01067d53b82d556a8adb0706..622de6026437981622f2d86b69dd47990d3aa4ba 100644 --- a/ohos_interface/include/ohos_adapter/drm_adapter.h +++ b/ohos_interface/include/ohos_adapter/drm_adapter.h @@ -18,6 +18,7 @@ #include #include +#include namespace OHOS::NWeb {