scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 09:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavc: repl. av_image_alloc with av_frame_get_buffer

Browse Source 
Replace av_image_alloc call wit av_frame_get_buffer.

The use of the former caused significant performance degradation (see
GH discussion CESNET/UltraGrid#241).
This commit is contained in:
Martin Pulec
2022-08-02 11:09:04 +02:00
parent c7db9c12b8
commit f67aa7c2e2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video_compress/libavcodec.cpp
View File

@@ -1289,11 +1289,7 @@ static bool configure_with(struct state_video_compress_libav *s, struct video_de
s->in_frame->height = s->codec_ctx->height; s->in_frame->height = s->codec_ctx->height;
#endif #endif
/* the image can be allocated by any means and av_image_alloc() is ret = av_frame_get_buffer(s->in_frame, 0);
* just the most convenient way if av_malloc() is to be used */
ret = av_image_alloc(s->in_frame->data, s->in_frame->linesize,
s->codec_ctx->width, s->codec_ctx->height,
fmt, 32);
if (ret < 0) { if (ret < 0) {
log_msg(LOG_LEVEL_ERROR, "Could not allocate raw picture buffer\n"); log_msg(LOG_LEVEL_ERROR, "Could not allocate raw picture buffer\n");
return false; return false;
@@ -1410,6 +1406,10 @@ static shared_ptr<video_frame> libavcodec_compress_tile(struct module *mod, shar
s->compressed_desc.height * 4); s->compressed_desc.height * 4);
#endif // LIBAVCODEC_VERSION_MAJOR >= 54 #endif // LIBAVCODEC_VERSION_MAJOR >= 54
if (int ret = av_frame_make_writable(s->in_frame)) {
print_libav_error(LOG_LEVEL_ERROR, MOD_NAME "Cannot make frame writable", ret);
return {};
}
s->in_frame->pts = frame_seq++; s->in_frame->pts = frame_seq++;
if (s->decoder != vc_memcpy) { if (s->decoder != vc_memcpy) {
@@ -1596,9 +1596,7 @@ static void cleanup(struct state_video_compress_libav *s)
avcodec_free_context(&s->codec_ctx); avcodec_free_context(&s->codec_ctx);
} }
if(s->in_frame) { if(s->in_frame) {
av_freep(s->in_frame->data); av_frame_free(&s->in_frame);
av_free(s->in_frame);
s->in_frame = NULL;
} }
free(s->decoded); free(s->decoded);
s->decoded = NULL; s->decoded = NULL;