This release adds microphone processing controls and local chat controls, expands platform packages, and synchronizes the website and guides. It also fixes native H.264 input/format handling, signaling recovery, fresh STUN discovery, and UDP ownership during overlapping connections. This is **v1.8.0**. Browser/Server v23, Native control v9 and capture v7 remain unchanged, with the existing 1440p ceiling. Additional resolutions, capability negotiation and Magicsock are separate follow-up work. ## Validation - Full local Web check: 79 files / 1,317 tests, TypeScript and production build. - Full Go checks, platform builds and Windows native capture regressions/probe. - Native H.264 Host lifecycle, Browser-to-App fanout and App-exit recovery, and Native H.264 through embedded SFU: all passed with owned process/port/profile cleanup. - Website build, documentation and repository hygiene passed. Existing UI acceptance covers narrow screens, both languages/themes, architecture downloads and all 23 film checks; final packaging and Go race checks run on the merged revision in CI. - Physical macOS/Linux capture, representative public networks and unmatched field reports retain their documented evidence limits. No claim that every blur/disconnection report is resolved. ## Release notes ### 中文 这是一次功能与兼容性更新:麦克风和聊天增加了实用的小选项,App 与 Server 支持更多设备,同时修复了原生分享和连接恢复中的若干问题。现有 1.x 协议保持不变。 #### 新增与改进 - 浏览器麦克风新增「降噪与回声消除」开关,默认开启回声消除、降噪和自动增益;分享音乐或使用虚拟音频输入时,可按需关闭。 - 可调整弹幕字号和透明度,并将当前保留的聊天记录导出为 TXT。当前会话最多保留 1,000 条文字消息,刷新页面后清空;需要保存时请先导出。 - 新增 Intel Mac、Linux ARM64 App,以及 Linux ARM64 Server 和容器镜像。官网下载区可直接选择对应架构,并显示最新版本和发布时间。 - 更新官网演示、README 截图和中英文教程,明确浏览器分享也可选择窗口或屏幕;开始分享前显示房间号占位,保持底栏控件位置稳定。 - 官网新增直达问题排查的入口,补充浏览器 WebRTC 限制、校园网和 Windows 显卡相关的排查步骤。 - App 模式选择页显示免费开源说明、作者与贡献者署名,以及官方网站和源码链接。 #### 修复 - 修正部分 H.264 原生分享的格式兼容性校验,以及 Windows 编码器输入长度和输出缓冲区对齐问题。 - 清理已失效的重连任务和 Native 接收信令,避免旧连接继续影响当前会话。 - 修复 App 重连时可能复用过期公网地址的问题;重新探测使用当前地址,并处理探测丢包和过期响应,保留其他正常连接。 - 修复 App 新旧媒体连接重叠时共用端口造成的冲突,避免准备或撤销新连接打断仍在使用的画面;关闭连接时及时取消未完成的端口映射请求。 - 无站点密码时,连接恢复不再误引导用户输入站点密码。 - 房间失效或会话终止时,开播前后的原因提示统一显示在电视状态图标中,避免额外提示条。 - 修正 Linux 原生采集的时间戳与关键帧时间基准。感谢 Pedro Antonio 在 [#449](https://github.com/TNTcraftHIM/Piik/pull/449) 的贡献。 #### 使用说明 下载对应平台的完整压缩包,退出旧 App 后解压使用。Windows 继续提供 x64;macOS 提供 Apple 芯片与 Intel 版本,原生采集需要 macOS 13 或更新版本。Linux 提供 x64 与 ARM64,原生采集还需安装[系统组件](https://github.com/TNTcraftHIM/Piik/blob/main/native/capture/linux/README.md)。macOS 和 Linux 的实机覆盖仍有限,欢迎反馈。 ### English This update adds useful microphone and chat controls, brings Piik to more devices, and fixes several native-sharing and connection-recovery issues. The existing 1.x protocols remain unchanged. #### New and improved - Browser microphones now have a “Noise & echo reduction” toggle. Echo cancellation, noise suppression and automatic gain control are on by default; turn them off when appropriate for music or virtual audio inputs. - Adjust chat-overlay text size and opacity, and export retained messages as TXT. The current session keeps up to 1,000 text messages and clears on page refresh; export first if you want to keep them. - Added Intel Mac and Linux ARM64 App packages, plus Linux ARM64 Server and container images. The website provides architecture selectors and shows the latest release and publication date. - Updated the website demonstration, README screenshots and bilingual guides, clarifying that browser capture can also select windows or screens. A room-code placeholder keeps the bottom bar stable before sharing starts. - Added direct website links to troubleshooting, with steps for browser WebRTC restrictions, campus networks and Windows graphics issues. - The App mode-selection page now shows its free and open-source status, author and contributor credit, and links to the official website and source. #### Fixes - Corrected H.264 format compatibility checks and Windows encoder input-length and output-buffer alignment handling. - Retired stale reconnect tasks and Native receive signals so they cannot continue affecting the current session. - Fixed App reconnection reusing an expired public address. Fresh discovery handles lost probes and stale responses while preserving other working connections. - Fixed UDP socket conflicts between overlapping App media connections so preparing or canceling a replacement preserves the active picture. Closing a connection now cancels unfinished gateway mapping requests. - Connection recovery on passwordless sites no longer incorrectly asks for a site passphrase. - Expired-room and session-termination reasons now use the same TV status indicator before and during sharing, without an extra notice strip. - Corrected Linux native capture timestamps and keyframe time bases. Thanks to Pedro Antonio for [#449](https://github.com/TNTcraftHIM/Piik/pull/449). #### Updating Download the complete archive for your platform, quit the old App, and extract the new package. Windows remains x64-only. macOS packages support Apple silicon and Intel; native capture requires macOS 13 or newer. Linux supports x64 and ARM64 and requires additional [system components](https://github.com/TNTcraftHIM/Piik/blob/main/native/capture/linux/README.md) for native capture. Physical-device coverage on macOS and Linux remains limited; feedback is welcome. ## Attribution Co-authored-by: Pedro Antonio <wrenchwastaken@gmail.com>
247 lines
7.7 KiB
C++
247 lines
7.7 KiB
C++
#pragma once
|
|
|
|
#ifndef NOMINMAX
|
|
#define NOMINMAX
|
|
#endif
|
|
#include <windows.h>
|
|
|
|
#include <codecapi.h>
|
|
#include <d3d11.h>
|
|
#include <dxgi1_2.h>
|
|
#include <strmif.h>
|
|
#include <mfapi.h>
|
|
#include <mfidl.h>
|
|
#include <mftransform.h>
|
|
#include <wrl/client.h>
|
|
|
|
#include "capture_error.h"
|
|
#include "mft_event_reader.h"
|
|
|
|
#include <chrono>
|
|
#include <iomanip>
|
|
#include <optional>
|
|
#include <sstream>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
namespace piik::capture {
|
|
enum class OutputKind : UINT8;
|
|
}
|
|
|
|
namespace piik::capture::windows {
|
|
|
|
using Microsoft::WRL::ComPtr;
|
|
|
|
enum class DegradationPreference {
|
|
resolution,
|
|
balanced,
|
|
framerate,
|
|
};
|
|
|
|
struct VideoProfile final {
|
|
UINT32 width = 1280;
|
|
UINT32 height = 720;
|
|
UINT32 frame_rate = 30;
|
|
UINT32 bit_rate = 3'000'000;
|
|
DegradationPreference preference = DegradationPreference::balanced;
|
|
|
|
UINT32 gop_frames() const { return frame_rate * 2; }
|
|
LONGLONG frame_duration_100ns() const {
|
|
return 10'000'000 / static_cast<LONGLONG>(frame_rate);
|
|
}
|
|
UINT32 quality_vs_speed() const {
|
|
if (preference == DegradationPreference::resolution) return 100;
|
|
if (preference == DegradationPreference::framerate) return 0;
|
|
return 50;
|
|
}
|
|
UINT32 h264_level() const {
|
|
const UINT64 macroblocks =
|
|
((static_cast<UINT64>(width) + 15) / 16) *
|
|
((static_cast<UINT64>(height) + 15) / 16);
|
|
const UINT64 macroblocks_per_second = macroblocks * frame_rate;
|
|
if (macroblocks <= 3'600 && macroblocks_per_second <= 108'000) return 31;
|
|
if (macroblocks <= 8'192 && macroblocks_per_second <= 245'760) return 40;
|
|
if (macroblocks <= 8'704 && macroblocks_per_second <= 522'240) return 42;
|
|
if (macroblocks <= 22'080 && macroblocks_per_second <= 589'824) return 50;
|
|
return 51;
|
|
}
|
|
std::string profile_level_id() const {
|
|
std::ostringstream output;
|
|
output << "42c0" << std::hex << std::setfill('0') << std::setw(2)
|
|
<< h264_level();
|
|
return output.str();
|
|
}
|
|
bool accepts_h264_profile_level_id(const std::string& value) const;
|
|
};
|
|
|
|
constexpr VideoProfile kDefaultVideoProfile{};
|
|
|
|
struct Runtime final {
|
|
Runtime() {
|
|
Check(CoInitializeEx(nullptr, COINIT_MULTITHREADED), "com-initialize");
|
|
com_started = true;
|
|
Check(MFStartup(MF_VERSION, MFSTARTUP_FULL), "mf-startup");
|
|
mf_started = true;
|
|
}
|
|
|
|
~Runtime() {
|
|
if (mf_started) {
|
|
MFShutdown();
|
|
}
|
|
if (com_started) {
|
|
CoUninitialize();
|
|
}
|
|
}
|
|
|
|
bool com_started = false;
|
|
bool mf_started = false;
|
|
};
|
|
|
|
struct Adapter final {
|
|
UINT index = 0;
|
|
DXGI_ADAPTER_DESC1 description = {};
|
|
ComPtr<IDXGIAdapter1> value;
|
|
};
|
|
|
|
struct DeviceContext final {
|
|
ComPtr<ID3D11Device> device;
|
|
ComPtr<ID3D11DeviceContext> context;
|
|
ComPtr<IMFDXGIDeviceManager> manager;
|
|
D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_9_1;
|
|
};
|
|
|
|
class ActivationList final {
|
|
public:
|
|
ActivationList() = default;
|
|
ActivationList(const ActivationList&) = delete;
|
|
ActivationList& operator=(const ActivationList&) = delete;
|
|
ActivationList(ActivationList&& other) noexcept
|
|
: values(std::exchange(other.values, nullptr)),
|
|
count(std::exchange(other.count, 0)) {}
|
|
|
|
~ActivationList() {
|
|
for (UINT32 index = 0; index < count; ++index) {
|
|
values[index]->Release();
|
|
}
|
|
CoTaskMemFree(values);
|
|
}
|
|
|
|
IMFActivate** values = nullptr;
|
|
UINT32 count = 0;
|
|
};
|
|
|
|
struct SelectedTransform final {
|
|
SelectedTransform() = default;
|
|
SelectedTransform(const SelectedTransform&) = delete;
|
|
SelectedTransform& operator=(const SelectedTransform&) = delete;
|
|
SelectedTransform(SelectedTransform&&) noexcept = default;
|
|
SelectedTransform& operator=(SelectedTransform&&) = delete;
|
|
~SelectedTransform() { if (activation) activation->ShutdownObject(); }
|
|
|
|
std::string name;
|
|
std::string clsid;
|
|
ComPtr<IMFActivate> activation;
|
|
ComPtr<IMFTransform> transform;
|
|
ComPtr<ICodecAPI> codec;
|
|
ComPtr<IMFMediaEventGenerator> events;
|
|
};
|
|
|
|
struct NalSummary final {
|
|
bool annex_b = false;
|
|
bool sps = false;
|
|
bool pps = false;
|
|
bool idr = false;
|
|
std::optional<std::string> profile_level_id;
|
|
};
|
|
|
|
std::vector<Adapter> EnumerateAdapters();
|
|
const Adapter& SelectAdapter(const std::vector<Adapter>& adapters, UINT index);
|
|
DeviceContext CreateDevice(const Adapter& adapter);
|
|
ActivationList EnumerateHardwareEncoders(const Adapter& adapter,
|
|
bool require_candidate = true);
|
|
SelectedTransform ActivateTransform(const ActivationList& list, UINT index,
|
|
IMFDXGIDeviceManager* manager);
|
|
std::wstring GetOptionalString(IMFAttributes* attributes, const GUID& key);
|
|
std::string NarrowAscii(const std::wstring& value);
|
|
std::string GuidString(const GUID& value);
|
|
|
|
// The hardware fixture uses the same configuration and output validation.
|
|
void SetU32(ICodecAPI* codec, const GUID& key, UINT32 expected,
|
|
const std::string& name);
|
|
void ConfigureCodec(ICodecAPI* codec,
|
|
const VideoProfile& profile = kDefaultVideoProfile);
|
|
ComPtr<IMFMediaType> CreateOutputType(
|
|
const VideoProfile& profile = kDefaultVideoProfile);
|
|
ComPtr<IMFMediaType> CreateInputType(
|
|
const VideoProfile& profile = kDefaultVideoProfile);
|
|
void ValidateMediaTypes(IMFTransform* transform,
|
|
const VideoProfile& profile = kDefaultVideoProfile);
|
|
void ValidateCodecReadback(ICodecAPI* codec,
|
|
const VideoProfile& profile = kDefaultVideoProfile);
|
|
void ForceKeyFrame(ICodecAPI* codec);
|
|
ComPtr<IMFSample> CreateCallerOutputSample(const MFT_OUTPUT_STREAM_INFO& info);
|
|
ComPtr<IMFSample> PullOutput(IMFTransform* transform,
|
|
const MFT_OUTPUT_STREAM_INFO& info);
|
|
ComPtr<IMFSample> CreateSurfaceSample(ID3D11Texture2D* texture,
|
|
LONGLONG timestamp100ns,
|
|
LONGLONG duration100ns);
|
|
NalSummary InspectAnnexB(const std::vector<UINT8>& bytes);
|
|
std::vector<UINT8> ReadSample(IMFSample* sample);
|
|
|
|
struct EncodedAccessUnit final {
|
|
UINT64 timestamp100ns = 0;
|
|
bool key_frame = false;
|
|
std::vector<UINT8> bytes;
|
|
};
|
|
|
|
using EncoderClock = std::chrono::steady_clock;
|
|
|
|
void RequireEncoderTime(EncoderClock::time_point deadline);
|
|
|
|
class VideoEncoder {
|
|
public:
|
|
VideoEncoder(OutputKind kind, std::string name, std::string identity)
|
|
: kind(kind), name(std::move(name)), identity(std::move(identity)) {}
|
|
virtual ~VideoEncoder() = default;
|
|
virtual EncodedAccessUnit Encode(ID3D11Texture2D* texture,
|
|
UINT64 timestamp100ns,
|
|
bool force_key_frame,
|
|
EncoderClock::time_point deadline =
|
|
EncoderClock::time_point::max()) = 0;
|
|
virtual void SetBitrate(UINT32 bitrate) = 0;
|
|
const OutputKind kind;
|
|
const std::string name;
|
|
const std::string identity;
|
|
};
|
|
|
|
// The caller owns COM/MF startup and serializes access to each encoder.
|
|
class LiveEncoder final : public VideoEncoder {
|
|
public:
|
|
explicit LiveEncoder(SelectedTransform selected,
|
|
VideoProfile profile = kDefaultVideoProfile);
|
|
~LiveEncoder() override;
|
|
LiveEncoder(const LiveEncoder&) = delete;
|
|
LiveEncoder& operator=(const LiveEncoder&) = delete;
|
|
|
|
void SetBitrate(UINT32 bitrate) override;
|
|
EncodedAccessUnit Encode(
|
|
ID3D11Texture2D* texture, UINT64 timestamp100ns, bool force_key_frame,
|
|
EncoderClock::time_point deadline = EncoderClock::time_point::max()) override;
|
|
|
|
private:
|
|
MediaEventType NextEvent(EncoderClock::time_point deadline, const char* timeout_stage);
|
|
void WaitForInput(EncoderClock::time_point deadline);
|
|
|
|
SelectedTransform selected_;
|
|
MftEventReader events_;
|
|
VideoProfile profile_;
|
|
MFT_OUTPUT_STREAM_INFO output_info_ = {};
|
|
UINT32 input_requests_ = 0;
|
|
std::optional<std::string> profile_level_id_;
|
|
bool started_ = false;
|
|
};
|
|
|
|
} // namespace piik::capture::windows
|