Commit 09a1416d authored by Roger Pau Monné's avatar Roger Pau Monné Committed by Carl Eugen Hoyos

Add key_frame and pict_type to AVFilterBufferRefVideo.

parent d3b379b9
...@@ -827,6 +827,8 @@ int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, ...@@ -827,6 +827,8 @@ int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize)); memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize));
frame->interlaced_frame = picref->video->interlaced; frame->interlaced_frame = picref->video->interlaced;
frame->top_field_first = picref->video->top_field_first; frame->top_field_first = picref->video->top_field_first;
frame->key_frame = picref->video->key_frame;
frame->pict_type = picref->video->pict_type;
return 1; return 1;
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 78 #define LIBAVFILTER_VERSION_MINOR 79
#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
...@@ -115,6 +115,8 @@ typedef struct AVFilterBufferRefVideoProps { ...@@ -115,6 +115,8 @@ typedef struct AVFilterBufferRefVideoProps {
AVRational pixel_aspect; ///< pixel aspect ratio AVRational pixel_aspect; ///< pixel aspect ratio
int interlaced; ///< is frame interlaced int interlaced; ///< is frame interlaced
int top_field_first; ///< field order int top_field_first; ///< field order
int pict_type; ///< Picture type of the frame
int key_frame; ///< 1 -> keyframe, 0-> not
} AVFilterBufferRefVideoProps; } AVFilterBufferRefVideoProps;
/** /**
......
...@@ -93,6 +93,8 @@ int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, ...@@ -93,6 +93,8 @@ int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize));
c->frame.interlaced_frame= frame->interlaced_frame; c->frame.interlaced_frame= frame->interlaced_frame;
c->frame.top_field_first = frame->top_field_first; c->frame.top_field_first = frame->top_field_first;
c->frame.key_frame = frame->key_frame;
c->frame.pict_type = frame->pict_type;
c->pts = pts; c->pts = pts;
c->pixel_aspect = pixel_aspect; c->pixel_aspect = pixel_aspect;
c->has_frame = 1; c->has_frame = 1;
...@@ -182,6 +184,8 @@ static int request_frame(AVFilterLink *link) ...@@ -182,6 +184,8 @@ static int request_frame(AVFilterLink *link)
picref->video->pixel_aspect = c->pixel_aspect; picref->video->pixel_aspect = c->pixel_aspect;
picref->video->interlaced = c->frame.interlaced_frame; picref->video->interlaced = c->frame.interlaced_frame;
picref->video->top_field_first = c->frame.top_field_first; 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;
avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0)); avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0));
avfilter_draw_slice(link, 0, link->h, 1); avfilter_draw_slice(link, 0, link->h, 1);
avfilter_end_frame(link); avfilter_end_frame(link);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment