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

处理冲突

Browse Source 
Signed-off-by: liye <liye87@huawei.com>
This commit is contained in:
liye 2024-09-26 15:08:36 +08:00
parent 2e422f8939
commit 8e04249021
No known key found for this signature in database
GPG Key ID: B75FBEEC7EAAF434
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/media_engine/plugins/source/http_source/hls/hls_media_downloader.cpp
View File

@ -69,7 +69,7 @@ constexpr size_t MAX_BUFFERING_TIME_OUT = 30 * 1000;
// hls manifest, m3u8 --- content get from m3u8 url, we get play list from the content
// fragment --- one item in play list, download media data according to the fragment address.
HlsMediaDownloader::HlsMediaDownloader(const std::map<std::string, std::string>& httpHeader) noexcept;
HlsMediaDownloader::HlsMediaDownloader(const std::map<std::string, std::string>& httpHeader) noexcept
{
cacheMediaBuffer_ = std::make_shared<CacheMediaChunkBufferHlsImpl>();
cacheMediaBuffer_->Init(MAX_CACHE_BUFFER_SIZE, CHUNK_SIZE);
@ -80,7 +80,8 @@ HlsMediaDownloader::HlsMediaDownloader(const std::map<std::string, std::string>&
HlsInit();
}
HlsMediaDownloader::HlsMediaDownloader(int expectBufferDuration, const std::map<std::string, std::string>& httpHeader) noexcept;
HlsMediaDownloader::HlsMediaDownloader(int expectBufferDuration,
const std::map<std::string, std::string>& httpHeader) noexcept
{
expectDuration_ = static_cast<uint64_t>(expectBufferDuration);
userDefinedBufferDuration_ = true;
@ -91,7 +92,8 @@ HlsMediaDownloader::HlsMediaDownloader(int expectBufferDuration, const std::map<
HlsInit();
}
HlsMediaDownloader::HlsMediaDownloader(std::string mimeType, const std::map<std::string, std::string>& httpHeader)
HlsMediaDownloader::HlsMediaDownloader(std::string mimeType,
const std::map<std::string, std::string>& httpHeader) noexcept
{
mimeType_ = mimeType;
cacheMediaBuffer_ = std::make_shared<CacheMediaChunkBufferHlsImpl>();

2
services/media_engine/plugins/source/http_source/hls/hls_media_downloader.h
View File

@ -52,7 +52,7 @@ constexpr size_t MIN_BUFFER_SIZE = 5 * 1024 * 1024;
class HlsMediaDownloader : public MediaDownloader, public PlayListChangeCallback {
public:
HlsMediaDownloader(
explicit HlsMediaDownloader(
const std::map<std::string, std::string>& httpHeader = std::map<std::string, std::string>()) noexcept;
explicit HlsMediaDownloader(int expectBufferDuration,
const std::map<std::string, std::string>& httpHeader = std::map<std::string, std::string>()) noexcept;

4
services/media_engine/plugins/source/http_source/hls/playlist_downloader.cpp
View File

@ -55,7 +55,7 @@ void PlayListDownloader::PlayListDownloaderInit()
});
}
PlayListDownloader::PlayListDownloader(const std::map<std::string, std::string>& httpHeader)
PlayListDownloader::PlayListDownloader(const std::map<std::string, std::string>& httpHeader) noexcept
{
downloader_ = std::make_shared<Downloader>("hlsPlayList");
httpHeader_ = httpHeader;
@ -63,7 +63,7 @@ PlayListDownloader::PlayListDownloader(const std::map<std::string, std::string>&
}
PlayListDownloader::PlayListDownloader(std::shared_ptr<Downloader> downloader,
const std::map<std::string, std::string>& httpHeader)
const std::map<std::string, std::string>& httpHeader) noexcept
{
downloader_ = downloader;
httpHeader_ = httpHeader;