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

vf_crop: Add support for cropping hardware frames

Browse Source 
Set the cropping fields in the AVFrame.
This commit is contained in:
Mark Thompson 2019-03-23 16:18:48 +00:00
parent 4ef0bea292
commit f1b359aaf5
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
libavfilter/vf_crop.c
View File

@ -98,9 +98,17 @@ static int query_formats(AVFilterContext *ctx)
for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) { for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
if (!(desc->flags & (AV_PIX_FMT_FLAG_HWACCEL | AV_PIX_FMT_FLAG_BITSTREAM)) && if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
!((desc->log2_chroma_w || desc->log2_chroma_h) && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) && continue;
(ret = ff_add_format(&formats, fmt)) < 0) if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
// Not usable if there is any subsampling but the format is
// not planar (e.g. YUYV422).
if ((desc->log2_chroma_w || desc->log2_chroma_h) &&
!(desc->flags & AV_PIX_FMT_FLAG_PLANAR))
continue;
}
ret = ff_add_format(&formats, fmt);
if (ret < 0)
return ret; return ret;
} }
@ -157,8 +165,14 @@ static int config_input(AVFilterLink *link)
s->var_values[VAR_POS] = NAN; s->var_values[VAR_POS] = NAN;
av_image_fill_max_pixsteps(s->max_step, NULL, pix_desc); av_image_fill_max_pixsteps(s->max_step, NULL, pix_desc);
s->hsub = pix_desc->log2_chroma_w;
s->vsub = pix_desc->log2_chroma_h; if (pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL) {
s->hsub = 1;
s->vsub = 1;
} else {
s->hsub = pix_desc->log2_chroma_w;
s->vsub = pix_desc->log2_chroma_h;
}
if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr),
var_names, s->var_values, var_names, s->var_values,
@ -237,9 +251,15 @@ fail_expr:
static int config_output(AVFilterLink *link) static int config_output(AVFilterLink *link)
{ {
CropContext *s = link->src->priv; CropContext *s = link->src->priv;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
link->w = s->w; if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL) {
link->h = s->h; // Hardware frames adjust the cropping regions rather than
// changing the frame size.
} else {
link->w = s->w;
link->h = s->h;
}
link->sample_aspect_ratio = s->out_sar; link->sample_aspect_ratio = s->out_sar;
return 0; return 0;
@ -252,9 +272,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
int i; int i;
frame->width = s->w;
frame->height = s->h;
s->var_values[VAR_N] = link->frame_count_out; s->var_values[VAR_N] = link->frame_count_out;
s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ? s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
NAN : frame->pts * av_q2d(link->time_base); NAN : frame->pts * av_q2d(link->time_base);
@ -285,22 +302,32 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame)
(int)s->var_values[VAR_N], s->var_values[VAR_T], s->var_values[VAR_POS], (int)s->var_values[VAR_N], s->var_values[VAR_T], s->var_values[VAR_POS],
s->x, s->y, s->x+s->w, s->y+s->h); s->x, s->y, s->x+s->w, s->y+s->h);
frame->data[0] += s->y * frame->linesize[0]; if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL) {
frame->data[0] += s->x * s->max_step[0]; frame->crop_top += s->y;
frame->crop_left += s->x;
frame->crop_bottom = frame->height - frame->crop_top - frame->crop_bottom - s->h;
frame->crop_right = frame->width - frame->crop_left - frame->crop_right - s->w;
} else {
frame->width = s->w;
frame->height = s->h;
if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & FF_PSEUDOPAL)) { frame->data[0] += s->y * frame->linesize[0];
for (i = 1; i < 3; i ++) { frame->data[0] += s->x * s->max_step[0];
if (frame->data[i]) {
frame->data[i] += (s->y >> s->vsub) * frame->linesize[i]; if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & FF_PSEUDOPAL)) {
frame->data[i] += (s->x * s->max_step[i]) >> s->hsub; for (i = 1; i < 3; i ++) {
if (frame->data[i]) {
frame->data[i] += (s->y >> s->vsub) * frame->linesize[i];
frame->data[i] += (s->x * s->max_step[i]) >> s->hsub;
}
} }
} }
}
/* alpha plane */ /* alpha plane */
if (frame->data[3]) { if (frame->data[3]) {
frame->data[3] += s->y * frame->linesize[3]; frame->data[3] += s->y * frame->linesize[3];
frame->data[3] += s->x * s->max_step[3]; frame->data[3] += s->x * s->max_step[3];
}
} }
return ff_filter_frame(link->dst->outputs[0], frame); return ff_filter_frame(link->dst->outputs[0], frame);