RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 15:23:11 +00:00
Code Issues Projects Releases Wiki Activity

libswscale/options: Add parent_log_context_offset to AVClass

Browse Source 
This allows to associate log messages from slice contexts to
the user-visible SwsContext.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-18 04:46:45 +02:00
parent d69332e688
commit a1255a350d
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libswscale/options.c
View File

@ -91,6 +91,7 @@ const AVClass ff_sws_context_class = {
.class_name = "SWScaler", .class_name = "SWScaler",
.item_name = sws_context_to_name, .item_name = sws_context_to_name,
.option = swscale_options, .option = swscale_options,
.parent_log_context_offset = OFFSET(parent),
.category = AV_CLASS_CATEGORY_SWSCALER, .category = AV_CLASS_CATEGORY_SWSCALER,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };

2
libswscale/swscale_internal.h
View File

@ -301,6 +301,8 @@ typedef struct SwsContext {
*/ */
const AVClass *av_class; const AVClass *av_class;
struct SwsContext *parent;
AVSliceThread *slicethread; AVSliceThread *slicethread;
struct SwsContext **slice_ctx; struct SwsContext **slice_ctx;
int *slice_err; int *slice_err;

2
libswscale/utils.c
View File

@ -1214,6 +1214,8 @@ static int context_init_threaded(SwsContext *c,
if (!c->slice_ctx[i]) if (!c->slice_ctx[i])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
c->slice_ctx[i]->parent = c;
ret = av_opt_copy((void*)c->slice_ctx[i], (void*)c); ret = av_opt_copy((void*)c->slice_ctx[i], (void*)c);
if (ret < 0) if (ret < 0)
return ret; return ret;