Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable video stack individually (#3469)

Browse Source
This commit is contained in:
Aven
2024-04-13 20:35:59 +08:00
committed by GitHub
parent e6506a96d4
commit 3dcd0ed463
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/VideoStack.cpp
View File

@@ -1,4 +1,4 @@
#if defined(ENABLE_X264) && defined(ENABLE_FFMPEG)
#if defined(ENABLE_VIDEOSTACK) && defined(ENABLE_X264) && defined(ENABLE_FFMPEG)
#include "VideoStack.h"
#include "Codec/Transcode.h"
#include "Common/Device.h"

2
server/VideoStack.h
View File

@@ -1,5 +1,5 @@
#pragma once
#if defined(ENABLE_X264) && defined(ENABLE_FFMPEG)
#if defined(ENABLE_VIDEOSTACK) && defined(ENABLE_X264) && defined(ENABLE_FFMPEG)
#include "Codec/Transcode.h"
#include "Common/Device.h"
#include "Player/MediaPlayer.h"

4
server/WebApi.cpp
View File

@@ -62,7 +62,7 @@
#include "ZLMVersion.h"
#endif
#if defined(ENABLE_X264) && defined (ENABLE_FFMPEG)
#if defined(ENABLE_VIDEOSTACK) && defined(ENABLE_X264) && defined (ENABLE_FFMPEG)
#include "VideoStack.h"
#endif
@@ -1910,7 +1910,7 @@ void installWebApi() {
}
});
#if defined(ENABLE_X264) && defined(ENABLE_FFMPEG)
#if defined(ENABLE_VIDEOSTACK) && defined(ENABLE_X264) && defined(ENABLE_FFMPEG)
VideoStackManager::Instance().loadBgImg("novideo.yuv");
NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastStreamNoneReader, [](BroadcastStreamNoneReaderArgs) {
auto id = sender.getMediaTuple().stream;