lavfi: Keep frame-based metadata.

Author: kuehnelth

cmdutils.c

@@ -1034,6 +1034,7 @@ int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
     frame->top_field_first  = picref->video->top_field_first;
     frame->key_frame        = picref->video->key_frame;
     frame->pict_type        = picref->video->pict_type;
+    frame->metadata         = picref->metadata;
 
     return 1;
 }

libavfilter/avfilter.c

@@ -64,6 +64,8 @@ AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)
         }
         *ret->audio = *ref->audio;
     }
+    ret->metadata = NULL;
+    av_dict_copy(&ret->metadata, ref->metadata, 0);
     ret->perms &= pmask;
     ret->buf->refcount ++;
     return ret;
@@ -77,6 +79,7 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref)
         ref->buf->free(ref->buf);
     av_free(ref->video);
     av_free(ref->audio);
+    av_dict_free(&ref->metadata);
     av_free(ref);
 }
 

libavfilter/avfilter.h

@@ -149,6 +149,7 @@ typedef struct AVFilterBufferRef {
     enum AVMediaType type;      ///< media type of buffer data
     AVFilterBufferRefVideoProps *video; ///< video buffer specific properties
     AVFilterBufferRefAudioProps *audio; ///< audio buffer specific properties
+    AVDictionary *metadata;
 } AVFilterBufferRef;
 
 /**

libavfilter/vsrc_buffer.c

@@ -56,6 +56,7 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame,
     c->frame.top_field_first = frame->top_field_first;
     c->frame.key_frame = frame->key_frame;
     c->frame.pict_type = frame->pict_type;
+    c->frame.metadata  = frame->metadata;
     c->pts = pts;
     c->pixel_aspect = pixel_aspect;
     c->has_frame = 1;
@@ -137,6 +138,8 @@ static int request_frame(AVFilterLink *link)
     picref->video->top_field_first = c->frame.top_field_first;
     picref->video->key_frame       = c->frame.key_frame;
     picref->video->pict_type       = c->frame.pict_type;
+    picref->metadata               = NULL;
+    av_dict_copy(&picref->metadata, c->frame.metadata, 0);
     avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0));
     avfilter_draw_slice(link, 0, link->h, 1);
     avfilter_end_frame(link);