diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-04-27 17:27:40 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-05-09 08:49:36 +0200 |
| commit | ab165047a6142ca0c8c333c36f4ebb96477622d7 (patch) | |
| tree | 4c402cc651c64b9574619f0ce9df3be59c00da01 | |
| parent | 5699884c2e2b76c43df405b8613e40a953338738 (diff) | |
lavfi: add a function for copying properties from AVFilterBufferRef->AVFrame
Based on a commit by Stefano Sabatini <stefano.sabatini-lala@poste.it>
| -rw-r--r-- | libavfilter/avfilter.c | 30 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 8 |
2 files changed, 38 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d1c82cee2f..f12ca3a097 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -708,6 +708,36 @@ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src) return 0; } +int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src) +{ + memcpy(dst->data, src->data, sizeof(dst->data)); + memcpy(dst->linesize, src->linesize, sizeof(dst->linesize)); + + dst->pts = src->pts; + dst->format = src->format; + + switch (src->type) { + case AVMEDIA_TYPE_VIDEO: + dst->width = src->video->w; + dst->height = src->video->h; + dst->sample_aspect_ratio = src->video->pixel_aspect; + dst->interlaced_frame = src->video->interlaced; + dst->top_field_first = src->video->top_field_first; + dst->key_frame = src->video->key_frame; + dst->pict_type = src->video->pict_type; + break; + case AVMEDIA_TYPE_AUDIO: + dst->sample_rate = src->audio->sample_rate; + dst->channel_layout = src->audio->channel_layout; + dst->nb_samples = src->audio->nb_samples; + break; + default: + return AVERROR(EINVAL); + } + + return 0; +} + void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src) { // copy common properties diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index c2049f98fe..ef61a5da6a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -848,4 +848,12 @@ static inline void avfilter_insert_outpad(AVFilterContext *f, unsigned index, */ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src); +/** + * Copy the frame properties and data pointers of src to dst, without copying + * the actual data. + * + * @return 0 on success, a negative number on error. + */ +int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src); + #endif /* AVFILTER_AVFILTER_H */ |