Star9
201
代码
代码
Issues27
Pull Requests15
项目讨论
Wiki
分析
Star9
201
已开启
差异修改 #2736
wuyajun123创建于 27 天前
差异修改 #2736
已开启
wuyajun123创建于 27 天前
从wuyajun123/multimedia_media_foundation_4484master合入到openharmony/multimedia_media_foundationmaster
共 8 个文件变更+34-21
Mservices/media_monitor/BUILD.gn+0-2
@@ -66,7 +66,6 @@ if (hst_is_lite_sys) {
66} else {66} else {
67 ohos_prebuilt_etc("media_monitor.para") {67 ohos_prebuilt_etc("media_monitor.para") {
68 source = "etc/media_monitor.para"68 source = "etc/media_monitor.para"
69- subsystem_name = "multimedia"
70 part_name = "media_foundation"69 part_name = "media_foundation"
71 module_install_dir = "etc/param"70 module_install_dir = "etc/param"
72 }71 }
@@ -79,7 +78,6 @@ if (hst_is_lite_sys) {
79} else {78} else {
80 ohos_prebuilt_etc("media_monitor.para.dac") {79 ohos_prebuilt_etc("media_monitor.para.dac") {
81 source = "etc/media_monitor.para.dac"80 source = "etc/media_monitor.para.dac"
82- subsystem_name = "multimedia"
83 part_name = "media_foundation"81 part_name = "media_foundation"
84 module_install_dir = "etc/param"82 module_install_dir = "etc/param"
85 }83 }
Mservices/media_monitor/common/include/media_monitor_info.h+1-1
@@ -108,7 +108,7 @@ enum EventId {
108 INTERRUPT_ERROR = 54,108 INTERRUPT_ERROR = 54,
109 109 
110 APP_SESSION_STATE = 55,110 APP_SESSION_STATE = 55,
111- AUDIO_PLAYBACK_ERROR = 56,111+ UNDERRUN_ISSUE = 56,
112 112 
113 UNIFIED_FAULT_CODE = 57,113 UNIFIED_FAULT_CODE = 57,
114 114 
Mservices/media_monitor/server/include/event_aggregate.h+1-1
@@ -95,7 +95,7 @@ private:
95 void HandleSuiteEngineUtilizationStats(std::shared_ptr<EventBean> &bean);95 void HandleSuiteEngineUtilizationStats(std::shared_ptr<EventBean> &bean);
96 void HandleVolumeSettingStatisticsEvent(std::shared_ptr<EventBean> &bean);96 void HandleVolumeSettingStatisticsEvent(std::shared_ptr<EventBean> &bean);
97 void HandleAudioInterruptErrorEvent(std::shared_ptr<EventBean> &bean);97 void HandleAudioInterruptErrorEvent(std::shared_ptr<EventBean> &bean);
98- void HandleAudioPlaybackErrorEvent(std::shared_ptr<EventBean> &bean);98+ void HandleAudioUnderrunIssueEvent(std::shared_ptr<EventBean> &bean);
99 void HandleKaraokeFeatureEvent(std::shared_ptr<EventBean> &bean);99 void HandleKaraokeFeatureEvent(std::shared_ptr<EventBean> &bean);
100 void AddToUnifiedFaultCodeVector(std::shared_ptr<EventBean> &bean);100 void AddToUnifiedFaultCodeVector(std::shared_ptr<EventBean> &bean);
101 101 
Mservices/media_monitor/server/include/media_event_base_writer.h+1-1
@@ -145,7 +145,7 @@ public:
145 void WriteTonePlaybackFailed(std::shared_ptr<EventBean> &bean);145 void WriteTonePlaybackFailed(std::shared_ptr<EventBean> &bean);
146 void WriteAudioLoopbackException(std::shared_ptr<EventBean> &bean);146 void WriteAudioLoopbackException(std::shared_ptr<EventBean> &bean);
147 void WriteAudioInterruptErrorEvent(std::shared_ptr<EventBean> &bean);147 void WriteAudioInterruptErrorEvent(std::shared_ptr<EventBean> &bean);
148- void WriteAudioPlaybackErrorEvent(std::shared_ptr<EventBean> &bean);148+ void WriteAudioUnderrunIssueEvent(std::shared_ptr<EventBean> &bean);
149 void WriteKaraokeFeatureStatistic(std::shared_ptr<EventBean> &bean);149 void WriteKaraokeFeatureStatistic(std::shared_ptr<EventBean> &bean);
150};150};
151 151 
Mservices/media_monitor/server/include/media_monitor_policy.h+1-1
@@ -72,7 +72,7 @@ public:
72 void AddToSuiteEngineNodeStatsMap(std::shared_ptr<EventBean> &bean);72 void AddToSuiteEngineNodeStatsMap(std::shared_ptr<EventBean> &bean);
73 void HandleVolumeSettingStatistics(std::shared_ptr<EventBean> &bean);73 void HandleVolumeSettingStatistics(std::shared_ptr<EventBean> &bean);
74 void AddLoudVolumeTimes();74 void AddLoudVolumeTimes();
75- void AddAudioPlaybackErrorEvent(std::shared_ptr<EventBean> &bean);75+ void AddAudioUnderrunIssueEvent(std::shared_ptr<EventBean> &bean);
76 void AddToKaraokeFeatureVector(std::shared_ptr<EventBean> &bean);76 void AddToKaraokeFeatureVector(std::shared_ptr<EventBean> &bean);
77 void HandleToKaraokeFeatureEvent();77 void HandleToKaraokeFeatureEvent();
78 78 
Mservices/media_monitor/server/src/event_aggregate.cpp+5-5
@@ -175,8 +175,8 @@ void EventAggregate::UpdateAggregateStateEventList(std::shared_ptr<EventBean> &b
175 case INTERRUPT_ERROR:175 case INTERRUPT_ERROR:
176 HandleAudioInterruptErrorEvent(bean);176 HandleAudioInterruptErrorEvent(bean);
177 break;177 break;
178- case AUDIO_PLAYBACK_ERROR:178+ case UNDERRUN_ISSUE:
179- HandleAudioPlaybackErrorEvent(bean);179+ HandleAudioUnderrunIssueEvent(bean);
180 break;180 break;
181 case KARAOKE_FEATURE_UTILIZATION:181 case KARAOKE_FEATURE_UTILIZATION:
182 HandleKaraokeFeatureEvent(bean);182 HandleKaraokeFeatureEvent(bean);
@@ -216,10 +216,10 @@ void EventAggregate::HandleAudioInterruptErrorEvent(std::shared_ptr<EventBean> &
216 mediaMonitorPolicy_.AddAudioInterruptErrorEvent(bean);216 mediaMonitorPolicy_.AddAudioInterruptErrorEvent(bean);
217}217}
218 218 
219-void EventAggregate::HandleAudioPlaybackErrorEvent(std::shared_ptr<EventBean> &bean)219+void EventAggregate::HandleAudioUnderrunIssueEvent(std::shared_ptr<EventBean> &bean)
萤火虫
萤火虫萤火虫27 天前

【告警类型】代码设计 【告警级别】提示 【告警描述】编程规范

likedislike
220{220{
221- MEDIA_LOG_D("Handle audio playback error event");221+ MEDIA_LOG_D("Handle audio underrun error event");
222- mediaMonitorPolicy_.AddAudioPlaybackErrorEvent(bean);222+ mediaMonitorPolicy_.AddAudioUnderrunIssueEvent(bean);
223}223}
224 224 
225void EventAggregate::HandleDeviceChangeEvent(std::shared_ptr<EventBean> &bean)225void EventAggregate::HandleDeviceChangeEvent(std::shared_ptr<EventBean> &bean)
Mservices/media_monitor/server/src/media_event_base_writer.cpp+22-7
@@ -241,6 +241,7 @@ void MediaEventBaseWriter::WriteJankPlaybackError(std::shared_ptr<EventBean> &be
241 }241 }
242#ifdef MONITOR_ENABLE_HISYSEVENT242#ifdef MONITOR_ENABLE_HISYSEVENT
243 int32_t reason = bean->GetIntValue("REASON");243 int32_t reason = bean->GetIntValue("REASON");
244+ int32_t extraInfo = bean->GetIntValue("EXTRAINFO");
244 HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::AUDIO, "JANK_PLAYBACK",245 HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::AUDIO, "JANK_PLAYBACK",
245 HiviewDFX::HiSysEvent::EventType::FAULT,246 HiviewDFX::HiSysEvent::EventType::FAULT,
246 "REASON", static_cast<uint8_t>(reason),247 "REASON", static_cast<uint8_t>(reason),
@@ -248,6 +249,7 @@ void MediaEventBaseWriter::WriteJankPlaybackError(std::shared_ptr<EventBean> &be
248 "PIPE_TYPE", static_cast<uint8_t>(bean->GetIntValue("PIPE_TYPE")),249 "PIPE_TYPE", static_cast<uint8_t>(bean->GetIntValue("PIPE_TYPE")),
249 "HDI_ADAPTER", static_cast<uint8_t>(bean->GetIntValue("HDI_ADAPTER")),250 "HDI_ADAPTER", static_cast<uint8_t>(bean->GetIntValue("HDI_ADAPTER")),
250 "POSITION", static_cast<uint8_t>(bean->GetIntValue("POSITION")),251 "POSITION", static_cast<uint8_t>(bean->GetIntValue("POSITION")),
252+ "EXTRAINFO", static_cast<uint8_t>(extraInfo),
251 "APP_NAME", (reason == 0 ? bean->GetStringValue("APP_NAMES") : bean->GetStringValue("APP_NAME")),253 "APP_NAME", (reason == 0 ? bean->GetStringValue("APP_NAMES") : bean->GetStringValue("APP_NAME")),
252 "JANK_START_TIME", static_cast<int64_t>(bean->GetUint64Value("JANK_START_TIME")));254 "JANK_START_TIME", static_cast<int64_t>(bean->GetUint64Value("JANK_START_TIME")));
253#endif255#endif
@@ -795,19 +797,32 @@ void MediaEventBaseWriter::WriteAudioInterruptErrorEvent(std::shared_ptr<EventBe
795#endif797#endif
796}798}
797 799 
798-void MediaEventBaseWriter::WriteAudioPlaybackErrorEvent(std::shared_ptr<EventBean> &bean)800+void MediaEventBaseWriter::WriteAudioUnderrunIssueEvent(std::shared_ptr<EventBean> &bean)
799{801{
800- MEDIA_LOG_E("Write audio playback error event");802+ MEDIA_LOG_E("Write audio underrun error event");
801 if (bean == nullptr) {803 if (bean == nullptr) {
802 MEDIA_LOG_E("eventBean is nullptr");804 MEDIA_LOG_E("eventBean is nullptr");
803 return;805 return;
804 }806 }
805#ifdef MONITOR_ENABLE_HISYSEVENT807#ifdef MONITOR_ENABLE_HISYSEVENT
806- HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::AUDIO, "AUDIO_PLAYBACK_ERROR",808+ HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::AUDIO, "UNDERRUN_ISSUE",
807- HiviewDFX::HiSysEvent::EventType::STATISTIC,809+ HiviewDFX::HiSysEvent::EventType::FAULT,
808- "APP_NAME", bean->GetStringValue("APP_NAME"),810+ "ISSUE_TYPE", static_cast<uint32_t>(bean->GetIntValue("ISSUE_TYPE")),
809- "STREAM_TYPE", bean->GetIntValue("STREAM_TYPE"),811+ "STREAM_INFO_1", bean->GetStringValue("STREAM_INFO_1"),
810- "TYPE", bean->GetIntValue("TYPE"));812+ "STREAM_INFO_2", bean->GetStringValue("STREAM_INFO_2"),
813+ "STREAM_INFO_3", static_cast<uint32_t>(bean->GetIntValue("STREAM_INFO_3")),
814+ "STREAM_INFO_4", static_cast<uint32_t>(bean->GetIntValue("STREAM_INFO_4")),
815+ "APP_INFO_1", bean->GetStringValue("APP_INFO_1"),
816+ "APP_INFO_2", bean->GetStringValue("APP_INFO_2"),
817+ "APP_INFO_3", static_cast<uint32_t>(bean->GetIntValue("APP_INFO_3")),
818+ "EXCEPTION_INFO_1", bean->GetStringValue("EXCEPTION_INFO_1"),
819+ "EXCEPTION_INFO_2", bean->GetStringValue("EXCEPTION_INFO_2"),
820+ "EXCEPTION_INFO_3", static_cast<uint32_t>(bean->GetIntValue("EXCEPTION_INFO_3")),
821+ "EXCEPTION_INFO_4", static_cast<uint32_t>(bean->GetIntValue("EXCEPTION_INFO_4")),
822+ "DEVICE_INFO_1", bean->GetStringValue("DEVICE_INFO_1"),
823+ "DEVICE_INFO_2", static_cast<uint32_t>(bean->GetIntValue("DEVICE_INFO_2")),
824+ "SYSTEM_INFO_1", static_cast<uint32_t>(bean->GetIntValue("SYSTEM_INFO_1")),
825+ "SYSTEM_INFO_2", static_cast<uint32_t>(bean->GetIntValue("SYSTEM_INFO_2")));
811#endif826#endif
812}827}
813 828 
Mservices/media_monitor/server/src/media_monitor_policy.cpp+3-3
@@ -888,14 +888,14 @@ void MediaMonitorPolicy::AddAudioInterruptErrorEvent(std::shared_ptr<EventBean>
888 }888 }
889}889}
890 890 
891-void MediaMonitorPolicy::AddAudioPlaybackErrorEvent(std::shared_ptr<EventBean> &bean)891+void MediaMonitorPolicy::AddAudioUnderrunIssueEvent(std::shared_ptr<EventBean> &bean)
892{892{
893- MEDIA_LOG_D("add audio playback error event");893+ MEDIA_LOG_D("add audio underrun error event");
894 if (bean == nullptr) {894 if (bean == nullptr) {
895 MEDIA_LOG_E("eventBean is nullptr");895 MEDIA_LOG_E("eventBean is nullptr");
896 return;896 return;
897 }897 }
898- mediaEventBaseWriter_.WriteAudioPlaybackErrorEvent(bean);898+ mediaEventBaseWriter_.WriteAudioUnderrunIssueEvent(bean);
899}899}
900 900 
901void MediaMonitorPolicy::AddToSuiteEngineNodeStatsMap(std::shared_ptr<EventBean> &bean)901void MediaMonitorPolicy::AddToSuiteEngineNodeStatsMap(std::shared_ptr<EventBean> &bean)