falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c' 

* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
  lavfi: generic hardware surface upload and download filters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n3.1
Derek Buitenhuis 9 years ago
parent
28abb216cb 07a844f32e
commit
8688d3af39
8 changed files with 473 additions and 2 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      doc/APIchanges
  2. +2
    -0
      libavfilter/Makefile
  3. +2
    -0
      libavfilter/allfilters.c
  4. +2
    -0
      libavfilter/avfilter.c
  5. +9
    -0
      libavfilter/avfilter.h
  6. +2
    -2
      libavfilter/version.h
  7. +212
    -0
      libavfilter/vf_hwdownload.c
  8. +241
    -0
      libavfilter/vf_hwupload.c

+ 3
- 0
doc/APIchanges View File

@@ -15,6 +15,9 @@ libavutil: 2015-08-28

API changes, most recent first:

2016-xx-xx - xxxxxxx - lavfi 6.42.0 - avfilter.h
Add AVFilterContext.hw_device_ctx.

2016-xx-xx - xxxxxxx - lavu 55.22.0 - hwcontext_vaapi.h
Add new installed header with VAAPI-specific hwcontext definitions.



+ 2
- 0
libavfilter/Makefile View File

@@ -181,6 +181,8 @@ OBJS-$(CONFIG_HISTEQ_FILTER) += vf_histeq.o
OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o
OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
OBJS-$(CONFIG_HQX_FILTER) += vf_hqx.o
OBJS-$(CONFIG_HWDOWNLOAD_FILTER) += vf_hwdownload.o
OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o
OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o
OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync.o
OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o


+ 2
- 0
libavfilter/allfilters.c View File

@@ -202,6 +202,8 @@ void avfilter_register_all(void)
REGISTER_FILTER(HISTOGRAM, histogram, vf);
REGISTER_FILTER(HQDN3D, hqdn3d, vf);
REGISTER_FILTER(HQX, hqx, vf);
REGISTER_FILTER(HWDOWNLOAD, hwdownload, vf);
REGISTER_FILTER(HWUPLOAD, hwupload, vf);
REGISTER_FILTER(HWUPLOAD_CUDA, hwupload_cuda, vf);
REGISTER_FILTER(HSTACK, hstack, vf);
REGISTER_FILTER(HUE, hue, vf);


+ 2
- 0
libavfilter/avfilter.c View File

@@ -762,6 +762,8 @@ void avfilter_free(AVFilterContext *filter)
if (filter->filter->priv_class)
av_opt_free(filter->priv);

av_buffer_unref(&filter->hw_device_ctx);

av_freep(&filter->name);
av_freep(&filter->input_pads);
av_freep(&filter->output_pads);


+ 9
- 0
libavfilter/avfilter.h View File

@@ -344,6 +344,15 @@ struct AVFilterContext {
*/
AVFilterInternal *internal;

/**
* For filters which will create hardware frames, sets the device the
* filter should create them in. All other filters will ignore this field:
* in particular, a filter which consumes or processes hardware frames will
* instead use the hw_frames_ctx field in AVFilterLink to carry the
* hardware context information.
*/
AVBufferRef *hw_device_ctx;

struct AVFilterCommand *command_queue;

char *enable_str; ///< enable expression string


+ 2
- 2
libavfilter/version.h View File

@@ -30,8 +30,8 @@
#include "libavutil/version.h"

#define LIBAVFILTER_VERSION_MAJOR 6
#define LIBAVFILTER_VERSION_MINOR 41
#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_MINOR 42
#define LIBAVFILTER_VERSION_MICRO 100

#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \


+ 212
- 0
libavfilter/vf_hwdownload.c View File

@@ -0,0 +1,212 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "libavutil/avassert.h"
#include "libavutil/buffer.h"
#include "libavutil/hwcontext.h"
#include "libavutil/log.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"

#include "avfilter.h"
#include "formats.h"
#include "internal.h"
#include "video.h"

typedef struct HWDownloadContext {
const AVClass *class;

AVBufferRef *hwframes_ref;
AVHWFramesContext *hwframes;
} HWDownloadContext;

static int hwdownload_query_formats(AVFilterContext *avctx)
{
AVFilterFormats *infmts = NULL;
AVFilterFormats *outfmts = NULL;
const AVPixFmtDescriptor *desc;
int err;

for (desc = av_pix_fmt_desc_next(NULL); desc;
desc = av_pix_fmt_desc_next(desc)) {
if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
err = ff_add_format(&infmts, av_pix_fmt_desc_get_id(desc));
else
err = ff_add_format(&outfmts, av_pix_fmt_desc_get_id(desc));
if (err) {
ff_formats_unref(&infmts);
ff_formats_unref(&outfmts);
return err;
}
}

ff_formats_ref(infmts, &avctx->inputs[0]->out_formats);
ff_formats_ref(outfmts, &avctx->outputs[0]->in_formats);
return 0;
}

static int hwdownload_config_input(AVFilterLink *inlink)
{
AVFilterContext *avctx = inlink->dst;
HWDownloadContext *ctx = avctx->priv;

av_buffer_unref(&ctx->hwframes_ref);

if (!inlink->hw_frames_ctx) {
av_log(ctx, AV_LOG_ERROR, "The input must have a hardware frame "
"reference.\n");
return AVERROR(EINVAL);
}

ctx->hwframes_ref = av_buffer_ref(inlink->hw_frames_ctx);
if (!ctx->hwframes_ref)
return AVERROR(ENOMEM);

ctx->hwframes = (AVHWFramesContext*)ctx->hwframes_ref->data;

return 0;
}

static int hwdownload_config_output(AVFilterLink *outlink)
{
AVFilterContext *avctx = outlink->src;
AVFilterLink *inlink = avctx->inputs[0];
HWDownloadContext *ctx = avctx->priv;
enum AVPixelFormat *formats;
int err, i, found;

if (!ctx->hwframes_ref)
return AVERROR(EINVAL);

err = av_hwframe_transfer_get_formats(ctx->hwframes_ref,
AV_HWFRAME_TRANSFER_DIRECTION_FROM,
&formats, 0);
if (err < 0)
return err;

found = 0;
for (i = 0; formats[i] != AV_PIX_FMT_NONE; i++) {
if (formats[i] == outlink->format) {
found = 1;
break;
}
}
av_freep(&formats);

if (!found) {
av_log(ctx, AV_LOG_ERROR, "Invalid output format %s for hwframe "
"download.\n", av_get_pix_fmt_name(outlink->format));
return AVERROR(EINVAL);
}

outlink->w = inlink->w;
outlink->h = inlink->h;

return 0;
}

static int hwdownload_filter_frame(AVFilterLink *link, AVFrame *input)
{
AVFilterContext *avctx = link->dst;
AVFilterLink *outlink = avctx->outputs[0];
HWDownloadContext *ctx = avctx->priv;
AVFrame *output = NULL;
int err;

if (!ctx->hwframes_ref || !input->hw_frames_ctx) {
av_log(ctx, AV_LOG_ERROR, "Input frames must have hardware context.\n");
err = AVERROR(EINVAL);
goto fail;
}
if ((void*)ctx->hwframes != input->hw_frames_ctx->data) {
av_log(ctx, AV_LOG_ERROR, "Input frame is not the in the configured "
"hwframe context.\n");
err = AVERROR(EINVAL);
goto fail;
}

output = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!output) {
err = AVERROR(ENOMEM);
goto fail;
}

err = av_hwframe_transfer_data(output, input, 0);
if (err < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to download frame: %d.\n", err);
goto fail;
}

err = av_frame_copy_props(output, input);
if (err < 0)
goto fail;

av_frame_free(&input);

return ff_filter_frame(avctx->outputs[0], output);

fail:
av_frame_free(&input);
av_frame_free(&output);
return err;
}

static av_cold void hwdownload_uninit(AVFilterContext *avctx)
{
HWDownloadContext *ctx = avctx->priv;

av_buffer_unref(&ctx->hwframes_ref);
}

static const AVClass hwdownload_class = {
.class_name = "hwdownload",
.item_name = av_default_item_name,
.option = NULL,
.version = LIBAVUTIL_VERSION_INT,
};

static const AVFilterPad hwdownload_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = hwdownload_config_input,
.filter_frame = hwdownload_filter_frame,
},
{ NULL }
};

static const AVFilterPad hwdownload_outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = hwdownload_config_output,
},
{ NULL }
};

AVFilter ff_vf_hwdownload = {
.name = "hwdownload",
.description = NULL_IF_CONFIG_SMALL("Download a hardware frame to a normal frame"),
.uninit = hwdownload_uninit,
.query_formats = hwdownload_query_formats,
.priv_size = sizeof(HWDownloadContext),
.priv_class = &hwdownload_class,
.inputs = hwdownload_inputs,
.outputs = hwdownload_outputs,
};

+ 241
- 0
libavfilter/vf_hwupload.c View File

@@ -0,0 +1,241 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "libavutil/buffer.h"
#include "libavutil/hwcontext.h"
#include "libavutil/hwcontext_internal.h"
#include "libavutil/log.h"
#include "libavutil/pixdesc.h"
#include "libavutil/opt.h"

#include "avfilter.h"
#include "formats.h"
#include "internal.h"
#include "video.h"

typedef struct HWUploadContext {
const AVClass *class;

AVBufferRef *hwdevice_ref;
AVHWDeviceContext *hwdevice;

AVBufferRef *hwframes_ref;
AVHWFramesContext *hwframes;
} HWUploadContext;

static int hwupload_query_formats(AVFilterContext *avctx)
{
HWUploadContext *ctx = avctx->priv;
AVHWFramesConstraints *constraints = NULL;
const enum AVPixelFormat *input_pix_fmts, *output_pix_fmts;
AVFilterFormats *input_formats = NULL;
int err, i;

if (!avctx->hw_device_ctx) {
av_log(ctx, AV_LOG_ERROR, "A hardware device reference is required "
"to upload frames to.\n");
return AVERROR(EINVAL);
}

ctx->hwdevice_ref = av_buffer_ref(avctx->hw_device_ctx);
if (!ctx->hwdevice_ref)
return AVERROR(ENOMEM);
ctx->hwdevice = (AVHWDeviceContext*)ctx->hwdevice_ref->data;

constraints = av_hwdevice_get_hwframe_constraints(ctx->hwdevice_ref, NULL);
if (!constraints) {
err = AVERROR(EINVAL);
goto fail;
}

input_pix_fmts = constraints->valid_sw_formats;
output_pix_fmts = constraints->valid_hw_formats;

input_formats = ff_make_format_list(output_pix_fmts);
if (!input_formats) {
err = AVERROR(ENOMEM);
goto fail;
}
if (input_pix_fmts) {
for (i = 0; input_pix_fmts[i] != AV_PIX_FMT_NONE; i++) {
err = ff_add_format(&input_formats, input_pix_fmts[i]);
if (err < 0) {
ff_formats_unref(&input_formats);
goto fail;
}
}
}

ff_formats_ref(input_formats, &avctx->inputs[0]->out_formats);

ff_formats_ref(ff_make_format_list(output_pix_fmts),
&avctx->outputs[0]->in_formats);

av_hwframe_constraints_free(&constraints);
return 0;

fail:
av_buffer_unref(&ctx->hwdevice_ref);
av_hwframe_constraints_free(&constraints);
return err;
}

static int hwupload_config_output(AVFilterLink *outlink)
{
AVFilterContext *avctx = outlink->src;
AVFilterLink *inlink = avctx->inputs[0];
HWUploadContext *ctx = avctx->priv;
int err;

av_buffer_unref(&ctx->hwframes_ref);

if (inlink->format == outlink->format) {
// The input is already a hardware format, so we just want to
// pass through the input frames in their own hardware context.
if (!inlink->hw_frames_ctx) {
av_log(ctx, AV_LOG_ERROR, "No input hwframe context.\n");
return AVERROR(EINVAL);
}

outlink->hw_frames_ctx = av_buffer_ref(inlink->hw_frames_ctx);
if (!outlink->hw_frames_ctx)
return AVERROR(ENOMEM);

return 0;
}

ctx->hwframes_ref = av_hwframe_ctx_alloc(ctx->hwdevice_ref);
if (!ctx->hwframes_ref)
return AVERROR(ENOMEM);

ctx->hwframes = (AVHWFramesContext*)ctx->hwframes_ref->data;

av_log(ctx, AV_LOG_DEBUG, "Surface format is %s.\n",
av_get_pix_fmt_name(inlink->format));

ctx->hwframes->format = outlink->format;
ctx->hwframes->sw_format = inlink->format;
ctx->hwframes->width = inlink->w;
ctx->hwframes->height = inlink->h;

err = av_hwframe_ctx_init(ctx->hwframes_ref);
if (err < 0)
goto fail;

outlink->hw_frames_ctx = av_buffer_ref(ctx->hwframes_ref);
if (!outlink->hw_frames_ctx) {
err = AVERROR(ENOMEM);
goto fail;
}

return 0;

fail:
av_buffer_unref(&ctx->hwframes_ref);
return err;
}

static int hwupload_filter_frame(AVFilterLink *link, AVFrame *input)
{
AVFilterContext *avctx = link->dst;
AVFilterLink *outlink = avctx->outputs[0];
HWUploadContext *ctx = avctx->priv;
AVFrame *output = NULL;
int err;

if (input->format == outlink->format)
return ff_filter_frame(outlink, input);

output = av_frame_alloc();
if (!output) {
err = AVERROR(ENOMEM);
goto fail;
}

err = av_hwframe_get_buffer(ctx->hwframes_ref, output, 0);
if (err < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to allocate frame to upload to.\n");
goto fail;
}

output->width = input->width;
output->height = input->height;

err = av_hwframe_transfer_data(output, input, 0);
if (err < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to upload frame: %d.\n", err);
goto fail;
}

err = av_frame_copy_props(output, input);
if (err < 0)
goto fail;

av_frame_free(&input);

return ff_filter_frame(outlink, output);

fail:
av_frame_free(&input);
av_frame_free(&output);
return err;
}

static av_cold void hwupload_uninit(AVFilterContext *avctx)
{
HWUploadContext *ctx = avctx->priv;

av_buffer_unref(&ctx->hwframes_ref);
av_buffer_unref(&ctx->hwdevice_ref);
}

static const AVClass hwupload_class = {
.class_name = "hwupload",
.item_name = av_default_item_name,
.option = NULL,
.version = LIBAVUTIL_VERSION_INT,
};

static const AVFilterPad hwupload_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = hwupload_filter_frame,
},
{ NULL }
};

static const AVFilterPad hwupload_outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = hwupload_config_output,
},
{ NULL }
};

AVFilter ff_vf_hwupload = {
.name = "hwupload",
.description = NULL_IF_CONFIG_SMALL("Upload a normal frame to a hardware frame"),
.uninit = hwupload_uninit,
.query_formats = hwupload_query_formats,
.priv_size = sizeof(HWUploadContext),
.priv_class = &hwupload_class,
.inputs = hwupload_inputs,
.outputs = hwupload_outputs,
};

Write Preview
Loading…
Cancel
Save