etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-11 06:15:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoders/ffmpeg: Set proper packet priority and drop priority

Browse source 
With increasing complexity in video encoders, we end up with complex priority and drop priority structures. While the fields are currently ignored by the default libOBSs output plugins, in the future this might no longer be the case. In any case, the increase in complexity requires us to adjust to it.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-12-02 17:44:02 +01:00
parent b151a44790
commit ac466a65f8
1 changed files with 55 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
source/encoders/encoder-ffmpeg.cpp
View file

@ -631,15 +631,62 @@ int ffmpeg_instance::receive_packet(bool* received_packet, struct encoder_packet
if (_handler) if (_handler)
_handler->process_avpacket(_packet, _codec, _context); _handler->process_avpacket(_packet, _codec, _context);
packet->type = OBS_ENCODER_VIDEO; // Build packet for use in OBS.
packet->pts = _packet.pts; packet->type = OBS_ENCODER_VIDEO;
packet->dts = _packet.dts; packet->pts = _packet.pts;
packet->data = _packet.data; packet->dts = _packet.dts;
packet->size = static_cast<size_t>(_packet.size); packet->data = _packet.data;
packet->keyframe = !!(_packet.flags & AV_PKT_FLAG_KEY); packet->size = static_cast<size_t>(_packet.size);
packet->drop_priority = packet->keyframe ? 0 : 1; packet->keyframe = !!(_packet.flags & AV_PKT_FLAG_KEY);
*received_packet = true; *received_packet = true;
// Figure out priority and drop_priority.
// In theory, this is done by OBS, but its not doing a great job.
packet->priority = packet->keyframe ? 3 : 2;
packet->drop_priority = 3;
for (size_t idx = 0, edx = _packet.side_data_elems; idx < edx; idx++) {
auto& side_data = _packet.side_data[idx];
if (side_data.type == AV_PKT_DATA_QUALITY_STATS) {
// Decisions based on picture type, if present.
switch (side_data.data[sizeof(uint32_t)]) {
case AV_PICTURE_TYPE_I: // I-Frame
case AV_PICTURE_TYPE_SI: // Switching I-Frame
if (_packet.flags & AV_PKT_FLAG_KEY) {
// Recovery only via IDR-Frame.
packet->priority = 3; // OBS_NAL_PRIORITY_HIGHEST
packet->drop_priority = 2; // OBS_NAL_PRIORITY_HIGH
} else {
// Recovery via I- or IDR-Frame.
packet->priority = 2; // OBS_NAL_PRIORITY_HIGH
packet->drop_priority = 2; // OBS_NAL_PRIORITY_HIGH
}
break;
case AV_PICTURE_TYPE_P: // P-Frame
case AV_PICTURE_TYPE_SP: // Switching P-Frame
// Recovery via I- or IDR-Frame.
packet->priority = 1; // OBS_NAL_PRIORITY_LOW
packet->drop_priority = 2; // OBS_NAL_PRIORITY_HIGH
break;
case AV_PICTURE_TYPE_B: // B-Frame
// Recovery via I- or IDR-Frame.
packet->priority = 0; // OBS_NAL_PRIORITY_DISPOSABLE
packet->drop_priority = 2; // OBS_NAL_PRIORITY_HIGH
break;
case AV_PICTURE_TYPE_BI: // BI-Frame, theoretically identical to I-Frame.
// Recovery via I- or IDR-Frame.
packet->priority = 2; // OBS_NAL_PRIORITY_HIGH
packet->drop_priority = 2; // OBS_NAL_PRIORITY_HIGH
break;
default: // Unknown picture type.
// Recovery only via IDR-Frame
packet->priority = 2; // OBS_NAL_PRIORITY_HIGH
packet->drop_priority = 3; // OBS_NAL_PRIORITY_HIGHEST
break;
}
}
}
// Push free frame back into pool.
push_free_frame(pop_used_frame()); push_free_frame(pop_used_frame());
return res; return res;