virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Roger Pau Monné 2011-04-16 10:09:15 +02:00 committed by Anton Khirnov
parent 7a11c82fb7
commit 10d39405fa
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.c
View File

@ -922,6 +922,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;
} }

3
doc/APIchanges
View File

@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first: API changes, most recent first:
2011-04-xx - xxxxxx - lavfi 2.3.0 - avfilter.h
Add pict_type and key_frame fields to AVFilterBufferRefVideo.
2011-04-xx - xxxxxx - lavfi 2.2.0 - vsrc_buffer 2011-04-xx - xxxxxx - lavfi 2.2.0 - vsrc_buffer
Add sample_aspect_ratio fields to vsrc_buffer arguments Add sample_aspect_ratio fields to vsrc_buffer arguments

4
libavfilter/avfilter.h
View File

@ -26,7 +26,7 @@
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 2 #define LIBAVFILTER_VERSION_MINOR 3
#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 {
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;
/** /**

4
libavfilter/vsrc_buffer.c
View File

@ -54,6 +54,8 @@ int av_vsrc_buffer_add_frame(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;
@ -133,6 +135,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);