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

Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'

Browse Source 
* commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9':
  lavfi: Always propagate hw_frames_ctx through links

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
This commit is contained in:
Matthieu Bouron 2017-03-29 23:39:40 +02:00
commit b5e1ec5660
11 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -47,6 +47,7 @@
#include "libavutil/parseutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/fifo.h"
#include "libavutil/hwcontext.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/dict.h"
@ -3421,7 +3422,9 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
!av_dict_get(ost->encoder_opts, "ab", NULL, 0))
av_dict_set(&ost->encoder_opts, "b", "128000", 0);
if (ost->filter && av_buffersink_get_hw_frames_ctx(ost->filter->filter)) {
if (ost->filter && av_buffersink_get_hw_frames_ctx(ost->filter->filter) &&
((AVHWFramesContext*)av_buffersink_get_hw_frames_ctx(ost->filter->filter)->data)->format ==
av_buffersink_get_format(ost->filter->filter)) {
ost->enc_ctx->hw_frames_ctx = av_buffer_ref(av_buffersink_get_hw_frames_ctx(ost->filter->filter));
if (!ost->enc_ctx->hw_frames_ctx)
return AVERROR(ENOMEM);

14
libavfilter/avfilter.c
View File

@ -355,14 +355,12 @@ int avfilter_config_links(AVFilterContext *filter)
}
if (link->src->nb_inputs && link->src->inputs[0]->hw_frames_ctx &&
!link->hw_frames_ctx) {
AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data;
if (input_ctx->format == link->format) {
link->hw_frames_ctx = av_buffer_ref(link->src->inputs[0]->hw_frames_ctx);
if (!link->hw_frames_ctx)
return AVERROR(ENOMEM);
}
!(link->src->filter->flags_internal & FF_FILTER_FLAG_HWFRAME_AWARE)) {
av_assert0(!link->hw_frames_ctx &&
"should not be set by non-hwframe-aware filter");
link->hw_frames_ctx = av_buffer_ref(link->src->inputs[0]->hw_frames_ctx);
if (!link->hw_frames_ctx)
return AVERROR(ENOMEM);
}
if ((config_link = link->dstpad->config_props))

2
libavfilter/avfilter.h
View File

@ -268,6 +268,8 @@ typedef struct AVFilter {
int priv_size; ///< size of private data to allocate for the filter
int flags_internal; ///< Additional flags for avfilter internal use only.
/**
* Used by the filter registration system. Must not be touched by any other
* code.

6
libavfilter/internal.h
View File

@ -386,6 +386,12 @@ int ff_filter_activate(AVFilterContext *filter);
*/
void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter);
/**
* The filter is aware of hardware frames, and any hardware frame context
* should not be automatically propagated through it.
*/
#define FF_FILTER_FLAG_HWFRAME_AWARE (1 << 0)
/**
* Run one round of processing on a filter graph.
*/

2
libavfilter/vf_deinterlace_qsv.c
View File

@ -570,4 +570,6 @@ AVFilter ff_vf_deinterlace_qsv = {
.inputs = qsvdeint_inputs,
.outputs = qsvdeint_outputs,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

1
libavfilter/vf_hwdownload.c
View File

@ -214,4 +214,5 @@ AVFilter ff_vf_hwdownload = {
.priv_class = &hwdownload_class,
.inputs = hwdownload_inputs,
.outputs = hwdownload_outputs,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

1
libavfilter/vf_hwupload.c
View File

@ -231,4 +231,5 @@ AVFilter ff_vf_hwupload = {
.priv_class = &hwupload_class,
.inputs = hwupload_inputs,
.outputs = hwupload_outputs,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_hwupload_cuda.c
View File

@ -187,4 +187,6 @@ AVFilter ff_vf_hwupload_cuda = {
.inputs = cudaupload_inputs,
.outputs = cudaupload_outputs,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_scale_npp.c
View File

@ -592,4 +592,6 @@ AVFilter ff_vf_scale_npp = {
.inputs = nppscale_inputs,
.outputs = nppscale_outputs,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_scale_qsv.c
View File

@ -628,4 +628,6 @@ AVFilter ff_vf_scale_qsv = {
.inputs = qsvscale_inputs,
.outputs = qsvscale_outputs,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

1
libavfilter/vf_scale_vaapi.c
View File

@ -477,4 +477,5 @@ AVFilter ff_vf_scale_vaapi = {
.inputs = scale_vaapi_inputs,
.outputs = scale_vaapi_outputs,
.priv_class = &scale_vaapi_class,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};