xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

encoders/generic: Don't use a pointer for AVPacket

Browse Source 
Also allocate 8MB of storage initially, and free the buffers in the packet on stop.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-22 15:57:23 +02:00
parent c61b2aead1
commit 9f8e4b67c6
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/encoders/generic.cpp
+11 -13
View File
@@ -544,16 +544,14 @@ encoder::generic::generic(obs_data_t* settings, obs_encoder_t* encoder)
} else if (this->codec->type == AVMEDIA_TYPE_AUDIO) { } else if (this->codec->type == AVMEDIA_TYPE_AUDIO) {
} }
// Create Packet av_init_packet(&this->current_packet);
this->current_packet = av_packet_alloc(); av_new_packet(&this->current_packet, 8 * 1024 * 1024); // 8 MB precached Packet size.
if (!this->current_packet) {
PLOG_ERROR("Failed to allocate packet storage.");
throw std::runtime_error("Failed to allocate packet storage.");
}
} }
encoder::generic::~generic() encoder::generic::~generic()
{ {
av_packet_unref(&this->current_packet);
this->frame_queue.clear(); this->frame_queue.clear();
this->frame_queue_used.clear(); this->frame_queue_used.clear();
this->swscale.finalize(); this->swscale.finalize();
@@ -786,15 +784,14 @@ bool encoder::generic::video_encode_texture(uint32_t, int64_t, uint64_t, uint64_
int encoder::generic::receive_packet(bool* received_packet, struct encoder_packet* packet) int encoder::generic::receive_packet(bool* received_packet, struct encoder_packet* packet)
{ {
av_init_packet(this->current_packet); int res = avcodec_receive_packet(this->context, &this->current_packet);
int res = avcodec_receive_packet(this->context, this->current_packet);
if (res == 0) { if (res == 0) {
packet->type = OBS_ENCODER_VIDEO; packet->type = OBS_ENCODER_VIDEO;
packet->pts = this->current_packet->pts; packet->pts = this->current_packet.pts;
packet->dts = this->current_packet->dts; packet->dts = this->current_packet.dts;
packet->data = this->current_packet->data; packet->data = this->current_packet.data;
packet->size = this->current_packet->size; packet->size = this->current_packet.size;
packet->keyframe = !!(this->current_packet->flags & AV_PKT_FLAG_KEY); packet->keyframe = !!(this->current_packet.flags & AV_PKT_FLAG_KEY);
packet->drop_priority = 0; packet->drop_priority = 0;
*received_packet = true; *received_packet = true;
@@ -803,6 +800,7 @@ int encoder::generic::receive_packet(bool* received_packet, struct encoder_packe
frame_queue.push(uframe); frame_queue.push(uframe);
} }
} }
return res; return res;
} }
source/encoders/generic.hpp
+1 -1
View File
@@ -67,7 +67,7 @@ namespace encoder {
ffmpeg::avframe_queue frame_queue; ffmpeg::avframe_queue frame_queue;
ffmpeg::avframe_queue frame_queue_used; ffmpeg::avframe_queue frame_queue_used;
ffmpeg::swscale swscale; ffmpeg::swscale swscale;
AVPacket* current_packet = nullptr; AVPacket current_packet;
int64_t lag_in_frames; int64_t lag_in_frames;
int64_t frame_count; int64_t frame_count;