RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwcontext: Add frame context mapping for nontrivial contexts 

Some frames contexts are not usable without additional format-specific
state in hwctx.  This change adds new functions frames_derive_from and
frames_derive_to to initialise this state appropriately when deriving
a frames context which will require it to be set.

(cherry picked from commit 27978155bc)
This commit is contained in:
Mark Thompson 2017-03-04 23:57:39 +00:00
parent 045ff8d30a
commit ec3dbeae81
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/hwcontext.c
View File

@ -819,7 +819,14 @@ int av_hwframe_ctx_create_derived(AVBufferRef **derived_frame_ctx,
goto fail;
}
ret = av_hwframe_ctx_init(dst_ref);
ret = AVERROR(ENOSYS);
if (src->internal->hw_type->frames_derive_from)
ret = src->internal->hw_type->frames_derive_from(dst, src, flags);
if (ret == AVERROR(ENOSYS) &&
dst->internal->hw_type->frames_derive_to)
ret = dst->internal->hw_type->frames_derive_to(dst, src, flags);
if (ret == AVERROR(ENOSYS))
ret = 0;
if (ret)
goto fail;

5
libavutil/hwcontext_internal.h
View File

@ -92,6 +92,11 @@ typedef struct HWContextType {
const AVFrame *src, int flags);
int (*map_from)(AVHWFramesContext *ctx, AVFrame *dst,
const AVFrame *src, int flags);
int (*frames_derive_to)(AVHWFramesContext *dst_ctx,
AVHWFramesContext *src_ctx, int flags);
int (*frames_derive_from)(AVHWFramesContext *dst_ctx,
AVHWFramesContext *src_ctx, int flags);
} HWContextType;
struct AVHWDeviceInternal {