Показывать фактическую глубину GPU-конвейера без дополнительной TX-очереди
This commit is contained in:
1 parent
09f48403c5
commit
0343825746
3 files changed
+29
-26
No files matched your search
@@ -251,26 +251,25 @@ void CallVideoEngine::transmit() {
|
||||
if (!encoded) { forceKey = true; m->report(encoder.error()); continue; }
|
||||
// GPU может вернуть несколько уже готовых кадров: отправляем все, не добавляя очередь в TX worker.
|
||||
for (const auto& output : outputs) {
|
||||
++encodedCount; if (output.key) ++keyCount;
|
||||
call_video_frame packet{};
|
||||
packet.call_id = m->id; packet.frame_id = ++frameId; packet.pts_us = output.pts; packet.format = format;
|
||||
packet.size = packet.length = output.data.size(); packet.data = reinterpret_cast<const uint8_t*>(output.data.constData());
|
||||
packet.flags = output.key ? CALL_VIDEO_KEY : 0;
|
||||
{ std::lock_guard<std::mutex> guard(m->lock);
|
||||
if (!m->running || !m->enabled || m->revision != revision || nowUs() - output.pts > CallCameraMaxFrameAgeUs) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_CALL, "video TX discards obsolete encoded frame revision=%llu/%llu enabled=%d age_us=%lld",
|
||||
(unsigned long long)revision, (unsigned long long)m->revision, m->enabled, (long long)(nowUs() - output.pts));
|
||||
++expired;
|
||||
forceKey = true; continue;
|
||||
}
|
||||
forceKey = call_video_port_send(&packet) != 1; }
|
||||
// Одинаковое окно исходного PTS на всех этапах: примерно один кадр в секунду, без трассы каждого кадра.
|
||||
if (output.pts % 1000000 < 34000)
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_CALL,
|
||||
"video timing stage=encode call=%llu frame=%llu pts=%lld mono_us=%lld encode_us=%lld accepted=%d",
|
||||
(unsigned long long)m->id, (unsigned long long)frameId, (long long)output.pts, (long long)nowUs(),
|
||||
(long long)(nowUs() - encodeStarted), !forceKey);
|
||||
if (forceKey) { ++sendBusy; break; }
|
||||
++encodedCount; if (output.key) ++keyCount;
|
||||
call_video_frame packet{};
|
||||
packet.call_id = m->id; packet.frame_id = ++frameId; packet.pts_us = output.pts; packet.format = format;
|
||||
packet.size = packet.length = output.data.size(); packet.data = reinterpret_cast<const uint8_t*>(output.data.constData());
|
||||
packet.flags = output.key ? CALL_VIDEO_KEY : 0;
|
||||
{ std::lock_guard<std::mutex> guard(m->lock);
|
||||
if (!m->running || !m->enabled || m->revision != revision || nowUs() - output.pts > CallCameraMaxFrameAgeUs) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_CALL, "video TX discards obsolete encoded frame revision=%llu/%llu enabled=%d age_us=%lld",
|
||||
(unsigned long long)revision, (unsigned long long)m->revision, m->enabled, (long long)(nowUs() - output.pts));
|
||||
++expired; forceKey = true; continue;
|
||||
}
|
||||
forceKey = call_video_port_send(&packet) != 1; }
|
||||
// Одинаковое окно исходного PTS на всех этапах: примерно один кадр в секунду, без трассы каждого кадра.
|
||||
if (output.pts % 1000000 < 34000)
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_CALL,
|
||||
"video timing stage=encode call=%llu frame=%llu pts=%lld mono_us=%lld encode_us=%lld accepted=%d",
|
||||
(unsigned long long)m->id, (unsigned long long)frameId, (long long)output.pts, (long long)nowUs(),
|
||||
(long long)(nowUs() - encodeStarted), !forceKey);
|
||||
if (forceKey) { ++sendBusy; break; }
|
||||
}
|
||||
#else
|
||||
idle();
|
||||
|
||||
Reference in new issue
Block a user