openharmony/multimedia_av_codec
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_av_codec synced 2024-10-07 06:04:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!3491 demuxer稳定性问题修复

Browse Source 
Merge pull request !3491 from 彼此彼此/cyc0925_3
This commit is contained in:
openharmony_ci 2024-09-25 12:50:52 +00:00 committed by Gitee
commit df8444e417
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
services/media_engine/plugins/ffmpeg_adapter/demuxer/ffmpeg_demuxer_plugin.cpp
View File

@ -1530,6 +1530,15 @@ void FFmpegDemuxerPlugin::ConvertCsdToAnnexb(const AVStream& avStream, Meta &for
Status FFmpegDemuxerPlugin::AddPacketToCacheQueue(AVPacket *pkt)
{
#ifdef BUILD_ENG_VERSION
if (pkt == nullptr) {
MEDIA_LOG_D("Dump failed due to pkt is nullptr.");
} else {
DumpParam dumpParam {DumpMode(DUMP_AVPACKET_OUTPUT & dumpMode_), pkt->data, pkt->stream_index, -1, pkt->size,
avpacketIndex_++, pkt->pts, pkt->pos};
Dump(dumpParam);
}
#endif
auto trackId = pkt->stream_index;
Status ret = Status::OK;
if (NeedCombineFrame(trackId) && !GetNextFrame(pkt->data, pkt->size) && cacheQueue_.HasCache(trackId)) {
@ -1546,15 +1555,6 @@ Status FFmpegDemuxerPlugin::AddPacketToCacheQueue(AVPacket *pkt)
ret = CheckCacheDataLimit(static_cast<uint32_t>(trackId));
}
}
#ifdef BUILD_ENG_VERSION
if (pkt == nullptr) {
MEDIA_LOG_D("Dump failed due to pkt is nullptr.");
} else {
DumpParam dumpParam {DumpMode(DUMP_AVPACKET_OUTPUT & dumpMode_), pkt->data, pkt->stream_index, -1, pkt->size,
avpacketIndex_++, pkt->pts, pkt->pos};
Dump(dumpParam);
}
#endif
return ret;
}
@ -1577,11 +1577,6 @@ Status FFmpegDemuxerPlugin::GetVideoFirstKeyFrame(uint32_t trackIndex)
av_packet_unref(pkt);
break;
}
#ifdef BUILD_ENG_VERSION
DumpParam dumpParam {DumpMode(DUMP_AVPACKET_OUTPUT & dumpMode_), pkt->data, pkt->stream_index, -1, pkt->size,
avpacketIndex_++, pkt->pts, pkt->pos};
Dump(dumpParam);
#endif
cacheQueue_.AddTrackQueue(pkt->stream_index);
ret = AddPacketToCacheQueue(pkt);
if (ret != Status::OK) {