January 2021 - ffmpeg-cvslog - lists.ffmpeg.org

dnn_backend_openvino.c: remove extra semicolon
by Guo, Yejun 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Guo, Yejun <yejun.guo(a)intel.com> | Tue Jan 26 08:22:27 2021 +0800| [eccc7971c2eb2c4aca0fa321298d5e1957c0cb4c] | committer: Guo, Yejun dnn_backend_openvino.c: remove extra semicolon > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eccc7971c2eb2c4ac… --- libavfilter/dnn/dnn_backend_openvino.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 9329891c3f..beca256390 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -485,7 +485,7 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu if (init_model_ov(ov_model) != DNN_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO exectuable network or inference request\n"); return DNN_ERROR; - }; + } } task.done = 0; @@ -601,7 +601,7 @@ DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, const char *input_n if (init_model_ov(ov_model) != DNN_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO exectuable network or inference request\n"); return DNN_ERROR; - }; + } } task.done = 0; @@ -648,7 +648,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i if (init_model_ov(ov_model) != DNN_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO exectuable network or inference request\n"); return DNN_ERROR; - }; + } } task->done = 0;

1 0

dnn: remove type cast which is not necessary
by Guo, Yejun 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Guo, Yejun <yejun.guo(a)intel.com> | Fri Jan 22 22:20:15 2021 +0800| [06c01f1763bd2a9266659be6097d2fc07e014163] | committer: Guo, Yejun dnn: remove type cast which is not necessary > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06c01f1763bd2a926… --- libavfilter/dnn/dnn_backend_native.c | 10 +++++----- libavfilter/dnn/dnn_backend_native_layer_avgpool.c | 2 +- libavfilter/dnn/dnn_backend_native_layer_conv2d.c | 4 ++-- libavfilter/dnn/dnn_backend_native_layer_dense.c | 2 +- libavfilter/dnn/dnn_backend_native_layer_depth2space.c | 2 +- libavfilter/dnn/dnn_backend_native_layer_mathbinary.c | 2 +- libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 2 +- libavfilter/dnn/dnn_backend_native_layer_maximum.c | 2 +- libavfilter/dnn/dnn_backend_native_layer_pad.c | 2 +- libavfilter/dnn/dnn_backend_openvino.c | 16 ++++++++-------- libavfilter/dnn/dnn_backend_tf.c | 16 ++++++++-------- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native.c b/libavfilter/dnn/dnn_backend_native.c index 1f89ee4110..87f3568cc2 100644 --- a/libavfilter/dnn/dnn_backend_native.c +++ b/libavfilter/dnn/dnn_backend_native.c @@ -50,7 +50,7 @@ static DNNReturnType execute_model_native(const DNNModel *model, const char *inp static DNNReturnType get_input_native(void *model, DNNData *input, const char *input_name) { - NativeModel *native_model = (NativeModel *)model; + NativeModel *native_model = model; NativeContext *ctx = &native_model->ctx; for (int i = 0; i < native_model->operands_num; ++i) { @@ -78,7 +78,7 @@ static DNNReturnType get_output_native(void *model, const char *input_name, int const char *output_name, int *output_width, int *output_height) { DNNReturnType ret; - NativeModel *native_model = (NativeModel *)model; + NativeModel *native_model = model; NativeContext *ctx = &native_model->ctx; AVFrame *in_frame = av_frame_alloc(); AVFrame *out_frame = NULL; @@ -269,7 +269,7 @@ static DNNReturnType execute_model_native(const DNNModel *model, const char *inp const char **output_names, uint32_t nb_output, AVFrame *out_frame, int do_ioproc) { - NativeModel *native_model = (NativeModel *)model->model; + NativeModel *native_model = model->model; NativeContext *ctx = &native_model->ctx; int32_t layer; DNNData input, output; @@ -382,7 +382,7 @@ static DNNReturnType execute_model_native(const DNNModel *model, const char *inp DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, const char *input_name, AVFrame *in_frame, const char **output_names, uint32_t nb_output, AVFrame *out_frame) { - NativeModel *native_model = (NativeModel *)model->model; + NativeModel *native_model = model->model; NativeContext *ctx = &native_model->ctx; if (!in_frame) { @@ -428,7 +428,7 @@ void ff_dnn_free_model_native(DNNModel **model) if (*model) { if ((*model)->model) { - native_model = (NativeModel *)(*model)->model; + native_model = (*model)->model; if (native_model->layers) { for (layer = 0; layer < native_model->layers_num; ++layer){ if (native_model->layers[layer].type == DLT_CONV2D){ diff --git a/libavfilter/dnn/dnn_backend_native_layer_avgpool.c b/libavfilter/dnn/dnn_backend_native_layer_avgpool.c index 8164bb45a6..dcfb8c816f 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_avgpool.c +++ b/libavfilter/dnn/dnn_backend_native_layer_avgpool.c @@ -66,7 +66,7 @@ int ff_dnn_execute_layer_avg_pool(DnnOperand *operands, const int32_t *input_ope int width = operands[input_operand_index].dims[2]; int channel = operands[input_operand_index].dims[3]; const float *input = operands[input_operand_index].data; - const AvgPoolParams *avgpool_params = (const AvgPoolParams *)parameters; + const AvgPoolParams *avgpool_params = parameters; int kernel_strides = avgpool_params->strides; int src_linesize = width * channel; diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index 210db7c77e..b5c2c394ef 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -116,7 +116,7 @@ static void * dnn_execute_layer_conv2d_thread(void *threadarg) int width = operands[input_operand_index].dims[2]; int channel = operands[input_operand_index].dims[3]; const float *input = operands[input_operand_index].data; - const ConvolutionalParams *conv_params = (const ConvolutionalParams *)(thread_common_param->parameters); + const ConvolutionalParams *conv_params = thread_common_param->parameters; int radius = conv_params->kernel_size >> 1; int src_linesize = width * conv_params->input_num; @@ -192,7 +192,7 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera #endif ThreadParam **thread_param = av_malloc_array(thread_num, sizeof(*thread_param)); ThreadCommonParam thread_common_param; - const ConvolutionalParams *conv_params = (const ConvolutionalParams *)(parameters); + const ConvolutionalParams *conv_params = parameters; int height = operands[input_operand_indexes[0]].dims[1]; int width = operands[input_operand_indexes[0]].dims[2]; int pad_size = (conv_params->padding_method == VALID) ? (conv_params->kernel_size - 1) / 2 * conv_params->dilation : 0; diff --git a/libavfilter/dnn/dnn_backend_native_layer_dense.c b/libavfilter/dnn/dnn_backend_native_layer_dense.c index 8629b52cfb..117590d7bb 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_dense.c +++ b/libavfilter/dnn/dnn_backend_native_layer_dense.c @@ -92,7 +92,7 @@ int ff_dnn_execute_layer_dense(DnnOperand *operands, const int32_t *input_operan int width = operands[input_operand_index].dims[2]; int channel = operands[input_operand_index].dims[3]; const float *input = operands[input_operand_index].data; - const DenseParams *dense_params = (const DenseParams *)parameters; + const DenseParams *dense_params = parameters; int src_linesize = width * channel; DnnOperand *output_operand = &operands[output_operand_index]; diff --git a/libavfilter/dnn/dnn_backend_native_layer_depth2space.c b/libavfilter/dnn/dnn_backend_native_layer_depth2space.c index 26942eb3ab..2fde6d1ba4 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_depth2space.c +++ b/libavfilter/dnn/dnn_backend_native_layer_depth2space.c @@ -53,7 +53,7 @@ int ff_dnn_execute_layer_depth2space(DnnOperand *operands, const int32_t *input_ int32_t output_operand_index, const void *parameters, NativeContext *ctx) { float *output; - const DepthToSpaceParams *params = (const DepthToSpaceParams *)parameters; + const DepthToSpaceParams *params = parameters; int block_size = params->block_size; int32_t input_operand_index = input_operand_indexes[0]; int number = operands[input_operand_index].dims[0]; diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c index 2a23bfaa77..c116188bab 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c @@ -152,7 +152,7 @@ int ff_dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ { const DnnOperand *input = &operands[input_operand_indexes[0]]; DnnOperand *output = &operands[output_operand_index]; - const DnnLayerMathBinaryParams *params = (const DnnLayerMathBinaryParams *)parameters; + const DnnLayerMathBinaryParams *params = parameters; for (int i = 0; i < 4; ++i) output->dims[i] = input->dims[i]; diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index 77e36c6ed3..1bb05d02a7 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -57,7 +57,7 @@ int ff_dnn_execute_layer_math_unary(DnnOperand *operands, const int32_t *input_o { const DnnOperand *input = &operands[input_operand_indexes[0]]; DnnOperand *output = &operands[output_operand_index]; - const DnnLayerMathUnaryParams *params = (const DnnLayerMathUnaryParams *)parameters; + const DnnLayerMathUnaryParams *params = parameters; int dims_count; const float *src; float *dst; diff --git a/libavfilter/dnn/dnn_backend_native_layer_maximum.c b/libavfilter/dnn/dnn_backend_native_layer_maximum.c index baae889755..65af553765 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_maximum.c +++ b/libavfilter/dnn/dnn_backend_native_layer_maximum.c @@ -54,7 +54,7 @@ int ff_dnn_execute_layer_maximum(DnnOperand *operands, const int32_t *input_oper { const DnnOperand *input = &operands[input_operand_indexes[0]]; DnnOperand *output = &operands[output_operand_index]; - const DnnLayerMaximumParams *params = (const DnnLayerMaximumParams *)parameters; + const DnnLayerMaximumParams *params = parameters; int dims_count; const float *src; float *dst; diff --git a/libavfilter/dnn/dnn_backend_native_layer_pad.c b/libavfilter/dnn/dnn_backend_native_layer_pad.c index 8d5d47883a..a60451a8de 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_pad.c +++ b/libavfilter/dnn/dnn_backend_native_layer_pad.c @@ -81,7 +81,7 @@ int ff_dnn_execute_layer_pad(DnnOperand *operands, const int32_t *input_operand_ int32_t before_paddings; int32_t after_paddings; float* output; - const LayerPadParams *params = (const LayerPadParams *)parameters; + const LayerPadParams *params = parameters; // suppose format is <N, H, W, C> int32_t input_operand_index = input_operand_indexes[0]; diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 573344e628..9329891c3f 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -394,7 +394,7 @@ static DNNReturnType execute_model_ov(RequestItem *request) static DNNReturnType get_input_ov(void *model, DNNData *input, const char *input_name) { - OVModel *ov_model = (OVModel *)model; + OVModel *ov_model = model; OVContext *ctx = &ov_model->ctx; char *model_input_name = NULL; char *all_input_names = NULL; @@ -446,7 +446,7 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu const char *output_name, int *output_width, int *output_height) { DNNReturnType ret; - OVModel *ov_model = (OVModel *)model; + OVModel *ov_model = model; OVContext *ctx = &ov_model->ctx; TaskItem task; RequestItem request; @@ -527,7 +527,7 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options, av_freep(&model); return NULL; } - model->model = (void *)ov_model; + model->model = ov_model; ov_model->model = model; ov_model->ctx.class = &dnn_openvino_class; ctx = &ov_model->ctx; @@ -569,7 +569,7 @@ err: DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, const char *input_name, AVFrame *in_frame, const char **output_names, uint32_t nb_output, AVFrame *out_frame) { - OVModel *ov_model = (OVModel *)model->model; + OVModel *ov_model = model->model; OVContext *ctx = &ov_model->ctx; TaskItem task; RequestItem request; @@ -623,7 +623,7 @@ DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, const char *input_n DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *input_name, AVFrame *in_frame, const char **output_names, uint32_t nb_output, AVFrame *out_frame) { - OVModel *ov_model = (OVModel *)model->model; + OVModel *ov_model = model->model; OVContext *ctx = &ov_model->ctx; RequestItem *request; TaskItem *task; @@ -677,7 +677,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out) { - OVModel *ov_model = (OVModel *)model->model; + OVModel *ov_model = model->model; TaskItem *task = ff_queue_peek_front(ov_model->task_queue); if (!task) { @@ -698,7 +698,7 @@ DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **i DNNReturnType ff_dnn_flush_ov(const DNNModel *model) { - OVModel *ov_model = (OVModel *)model->model; + OVModel *ov_model = model->model; OVContext *ctx = &ov_model->ctx; RequestItem *request; IEStatusCode status; @@ -741,7 +741,7 @@ DNNReturnType ff_dnn_flush_ov(const DNNModel *model) void ff_dnn_free_model_ov(DNNModel **model) { if (*model){ - OVModel *ov_model = (OVModel *)(*model)->model; + OVModel *ov_model = (*model)->model; while (ff_safe_queue_size(ov_model->request_queue) != 0) { RequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); if (item && item->infer_request) { diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index f77f3dd817..71a2a308b5 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -97,7 +97,7 @@ static TF_Buffer *read_graph(const char *model_filename) } graph_buf = TF_NewBuffer(); - graph_buf->data = (void *)graph_data; + graph_buf->data = graph_data; graph_buf->length = size; graph_buf->data_deallocator = free_buffer; @@ -128,7 +128,7 @@ static TF_Tensor *allocate_input_tensor(const DNNData *input) static DNNReturnType get_input_tf(void *model, DNNData *input, const char *input_name) { - TFModel *tf_model = (TFModel *)model; + TFModel *tf_model = model; TFContext *ctx = &tf_model->ctx; TF_Status *status; int64_t dims[4]; @@ -165,7 +165,7 @@ static DNNReturnType get_output_tf(void *model, const char *input_name, int inpu const char *output_name, int *output_width, int *output_height) { DNNReturnType ret; - TFModel *tf_model = (TFModel *)model; + TFModel *tf_model = model; TFContext *ctx = &tf_model->ctx; AVFrame *in_frame = av_frame_alloc(); AVFrame *out_frame = NULL; @@ -586,7 +586,7 @@ static DNNReturnType load_native_model(TFModel *tf_model, const char *model_file return DNN_ERROR; } - native_model = (NativeModel *)model->model; + native_model = model->model; tf_model->graph = TF_NewGraph(); tf_model->status = TF_NewStatus(); @@ -700,7 +700,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, const char *options, } } - model->model = (void *)tf_model; + model->model = tf_model; model->get_input = &get_input_tf; model->get_output = &get_output_tf; model->options = options; @@ -714,7 +714,7 @@ static DNNReturnType execute_model_tf(const DNNModel *model, const char *input_n int do_ioproc) { TF_Output *tf_outputs; - TFModel *tf_model = (TFModel *)model->model; + TFModel *tf_model = model->model; TFContext *ctx = &tf_model->ctx; DNNData input, output; TF_Tensor **output_tensors; @@ -822,7 +822,7 @@ static DNNReturnType execute_model_tf(const DNNModel *model, const char *input_n DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, const char *input_name, AVFrame *in_frame, const char **output_names, uint32_t nb_output, AVFrame *out_frame) { - TFModel *tf_model = (TFModel *)model->model; + TFModel *tf_model = model->model; TFContext *ctx = &tf_model->ctx; if (!in_frame) { @@ -843,7 +843,7 @@ void ff_dnn_free_model_tf(DNNModel **model) TFModel *tf_model; if (*model){ - tf_model = (TFModel *)(*model)->model; + tf_model = (*model)->model; if (tf_model->graph){ TF_DeleteGraph(tf_model->graph); }

1 0

tests/dnn: enable unit test dense
by Guo, Yejun 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Guo, Yejun <yejun.guo(a)intel.com> | Fri Jan 22 21:44:14 2021 +0800| [a163aa6cf7fea184a2e72cade7a9aa4f841a23f3] | committer: Guo, Yejun tests/dnn: enable unit test dense > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a163aa6cf7fea184a… --- tests/dnn/Makefile | 1 + tests/dnn/dnn-layer-dense-test.c | 2 +- tests/fate/dnn.mak | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/dnn/Makefile b/tests/dnn/Makefile index 8afdfab5d3..ef827520de 100644 --- a/tests/dnn/Makefile +++ b/tests/dnn/Makefile @@ -1,6 +1,7 @@ DNNTESTPROGS += dnn-layer-pad DNNTESTPROGS += dnn-layer-conv2d DNNTESTPROGS += dnn-layer-depth2space +DNNTESTPROGS += dnn-layer-dense DNNTESTPROGS += dnn-layer-mathbinary DNNTESTPROGS += dnn-layer-maximum DNNTESTPROGS += dnn-layer-mathunary diff --git a/tests/dnn/dnn-layer-dense-test.c b/tests/dnn/dnn-layer-dense-test.c index 755d3ebb31..696f7505e5 100644 --- a/tests/dnn/dnn-layer-dense-test.c +++ b/tests/dnn/dnn-layer-dense-test.c @@ -59,7 +59,7 @@ static int test(void) print(list(output.flatten())) */ - ConvolutionalParams params; + DenseParams params; DnnOperand operands[2]; int32_t input_indexes[1]; float input[1*5*6*3] = { diff --git a/tests/fate/dnn.mak b/tests/fate/dnn.mak index c5e458708e..ef07ee45f8 100644 --- a/tests/fate/dnn.mak +++ b/tests/fate/dnn.mak @@ -8,6 +8,11 @@ fate-dnn-layer-conv2d: $(DNNTESTSDIR)/dnn-layer-conv2d-test$(EXESUF) fate-dnn-layer-conv2d: CMD = run $(DNNTESTSDIR)/dnn-layer-conv2d-test$(EXESUF) fate-dnn-layer-conv2d: CMP = null +FATE_DNN += fate-dnn-layer-dense +fate-dnn-layer-dense: $(DNNTESTSDIR)/dnn-layer-dense-test$(EXESUF) +fate-dnn-layer-dense: CMD = run $(DNNTESTSDIR)/dnn-layer-dense-test$(EXESUF) +fate-dnn-layer-dense: CMP = null + FATE_DNN += fate-dnn-layer-depth2space fate-dnn-layer-depth2space: $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) fate-dnn-layer-depth2space: CMD = run $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF)

1 0

avfilter/vf_pseudocolor: add slice threading
by Paul B Mahol 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 28 00:54:51 2021 +0100| [24892fa4a790d074081c1fe42a118dd3ba01bc60] | committer: Paul B Mahol avfilter/vf_pseudocolor: add slice threading > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24892fa4a790d0740… --- libavfilter/vf_pseudocolor.c | 48 +++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index e48b69c081..4c24f49bd9 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -596,13 +596,43 @@ static int config_input(AVFilterLink *inlink) return 0; } +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + +static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + PseudoColorContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame *in = td->in; + AVFrame *out = td->out; + + for (int plane = 0; plane < s->nb_planes; plane++) { + const int slice_start = (s->height[plane] * jobnr) / nb_jobs; + const int slice_end = (s->height[plane] * (jobnr+1)) / nb_jobs; + const int islice_start = (s->height[s->index] * jobnr) / nb_jobs; + ptrdiff_t ilinesize = in->linesize[s->index]; + ptrdiff_t slinesize = in->linesize[plane]; + ptrdiff_t dlinesize = out->linesize[plane]; + const uint8_t *index = in->data[s->index] + islice_start * ilinesize; + const uint8_t *src = in->data[plane] + slice_start * slinesize; + uint8_t *dst = out->data[plane] + slice_start * dlinesize; + + s->filter[plane](s->max, s->width[plane], slice_end - slice_start, + index, src, dst, ilinesize, slinesize, + dlinesize, s->lut[plane]); + } + + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; PseudoColorContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; + ThreadData td; AVFrame *out; - int plane; out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { @@ -611,18 +641,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } av_frame_copy_props(out, in); - for (plane = 0; plane < s->nb_planes; plane++) { - const uint8_t *index = in->data[s->index]; - const uint8_t *src = in->data[plane]; - uint8_t *dst = out->data[plane]; - ptrdiff_t ilinesize = in->linesize[s->index]; - ptrdiff_t slinesize = in->linesize[plane]; - ptrdiff_t dlinesize = out->linesize[plane]; - - s->filter[plane](s->max, s->width[plane], s->height[plane], - index, src, dst, ilinesize, slinesize, - dlinesize, s->lut[plane]); - } + td.out = out, td.in = in; + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(s->height[1], ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); @@ -668,5 +688,5 @@ AVFilter ff_vf_pseudocolor = { .query_formats = query_formats, .inputs = inputs, .outputs = outputs, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };

1 0

avformat/mxfenc: add Coding Equations and Color Primaries to local tags
by Marton Balint 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Mon Jan 25 22:04:05 2021 +0100| [b410b14fba8d9485e288a060d6ad7346a83440d4] | committer: Marton Balint avformat/mxfenc: add Coding Equations and Color Primaries to local tags Fixes ticket #9079. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b410b14fba8d9485e… --- libavformat/mxfenc.c | 2 ++ tests/ref/fate/copy-trac4914 | 2 +- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/mxf-opatom-user-comments | 2 +- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/mxf-user-comments | 2 +- tests/ref/fate/time_base | 2 +- tests/ref/lavf/mxf | 6 +++--- tests/ref/lavf/mxf_d10 | 2 +- tests/ref/lavf/mxf_dv25 | 2 +- tests/ref/lavf/mxf_dvcpro50 | 2 +- tests/ref/lavf/mxf_opatom | 2 +- tests/ref/lavf/mxf_opatom_audio | 2 +- 13 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 6c5331ad62..0c464d4cfd 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -361,6 +361,8 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x3217, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x03,0x02,0x07,0x00,0x00,0x00}}, /* Display F2 offset */ { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */ { 0x3210, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x02,0x01,0x01,0x01,0x02,0x00}}, /* Transfer characteristic */ + { 0x321A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x02,0x01,0x01,0x03,0x01,0x00}}, /* Coding Equations (color space) */ + { 0x3219, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x09,0x04,0x01,0x02,0x01,0x01,0x06,0x01,0x00}}, /* Color Primaries */ { 0x3213, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x02,0x00,0x00,0x00,0x00}}, /* Image Start Offset */ { 0x3214, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x03,0x00,0x00,0x00,0x00}}, /* Image End Offset */ { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */ diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index 7c8d0e9158..e8f8afb467 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,4 +1,4 @@ -b37c4d5693cdb5b9ed9b33501ffb682a *tests/data/fate/copy-trac4914.mxf +5d58a32f21b78169d925845f783054e6 *tests/data/fate/copy-trac4914.mxf 561721 tests/data/fate/copy-trac4914.mxf #tb 0: 1001/30000 #media_type 0: video diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index de4f26c6f8..3b9d9d2142 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1 +1 @@ -68f0fa62b6a676894afbbe4c34ebf70b +fe9b43f5b6e7737fe2670b660fd3d860 diff --git a/tests/ref/fate/mxf-opatom-user-comments b/tests/ref/fate/mxf-opatom-user-comments index 90e3fb229a..be57eb4e19 100644 --- a/tests/ref/fate/mxf-opatom-user-comments +++ b/tests/ref/fate/mxf-opatom-user-comments @@ -1 +1 @@ -f6760a9e710ba478bc3949f3e5c9b34a +9b3d7201c37c5783702774e46e0da141 diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index 16022b1789..acda8fe43a 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -73a891041b2fc836a893ffb49fff4fff +422d6ed4821e7bbecbcdecc553abc6e4 diff --git a/tests/ref/fate/mxf-user-comments b/tests/ref/fate/mxf-user-comments index ddf51d939c..3b77db9118 100644 --- a/tests/ref/fate/mxf-user-comments +++ b/tests/ref/fate/mxf-user-comments @@ -1 +1 @@ -1255faf854223a74d707553121e5eca3 +c77b632dbcdacd6466e1ec794917556e diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index 710fde1002..d3c97956d6 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -42863a53f6c63efbc8c5a2eb76f13f5f +e5c9da6972b6f6e7b15bcbbf20a9dbd1 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 5b16496f06..1b1fe1a734 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -27b98795036b334e100c15c7e06d948f *tests/data/lavf/lavf.mxf +1703da2e9f0ca49a5f0bcbcc6944c9c0 *tests/data/lavf/lavf.mxf 526393 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x8dddfaab -783b475a818602f54e947094d57e2981 *tests/data/lavf/lavf.mxf +b44c4f138f1a87256211c3112dd52c87 *tests/data/lavf/lavf.mxf 561721 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x96ff1b48 -02bf8f0cd8951a49e277306691cb1538 *tests/data/lavf/lavf.mxf +9ede3c95054c30eb815fbe598a1f097b *tests/data/lavf/lavf.mxf 526393 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x8dddfaab diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index 30701619e0..19e6f20b51 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -da0ebbebb50a530b14c0f06017f464b3 *tests/data/lavf/lavf.mxf_d10 +c72f1f3d6ce555f96946c421f705f880 *tests/data/lavf/lavf.mxf_d10 5332013 tests/data/lavf/lavf.mxf_d10 tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488 diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 index d4559df862..2951538cae 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -57623b3b968c0bb0d8a0bbaeef6fe657 *tests/data/lavf/lavf.mxf_dv25 +5048796729fba47e9614a177c370e850 *tests/data/lavf/lavf.mxf_dv25 3834413 tests/data/lavf/lavf.mxf_dv25 tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52 diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50 index 8bcf67d17f..9df2fc925d 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -6e82b4cc962199e2593e30851ff7ccfb *tests/data/lavf/lavf.mxf_dvcpro50 +7023122fc4bcd5c12de6a33cc78ce9b8 *tests/data/lavf/lavf.mxf_dvcpro50 7431213 tests/data/lavf/lavf.mxf_dvcpro50 tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index 1aa843a22a..bff36e02be 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -d5f56215c2b16dee204f03bfa653dd1b *tests/data/lavf/lavf.mxf_opatom +8a4c5680b0955d4e2abecfb1c37a56d4 *tests/data/lavf/lavf.mxf_opatom 4717625 tests/data/lavf/lavf.mxf_opatom tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio index 2b9306f1df..5c65a373e2 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -c45bb140605339556a77e751fda2c449 *tests/data/lavf/lavf.mxf_opatom_audio +697f4eb4a472909945222d7750145f80 *tests/data/lavf/lavf.mxf_opatom_audio 102969 tests/data/lavf/lavf.mxf_opatom_audio tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff

1 0

avcodec/h261dec: Make VLC smaller
by Andreas Rheinhardt 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Dec 29 22:09:10 2020 +0100| [9f38fac053010205806ece11e6aea9b7d3bde041] | committer: Andreas Rheinhardt avcodec/h261dec: Make VLC smaller The VLC for the macroblock address increment uses nine bits; yet there is no code with this length: All codes are either shorter or longer. So one can make the table smaller without changing the amount of codes that need more than one round of parsing. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f38fac0530102058… --- libavcodec/h261dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 817453f60c..2b3408d7b3 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -35,7 +35,7 @@ #include "h261.h" #include "internal.h" -#define H261_MBA_VLC_BITS 9 +#define H261_MBA_VLC_BITS 8 #define H261_MTYPE_VLC_BITS 6 #define H261_MV_VLC_BITS 7 #define H261_CBP_VLC_BITS 9 @@ -52,7 +52,7 @@ static av_cold void h261_decode_init_static(void) { INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35, ff_h261_mba_bits, 1, 1, - ff_h261_mba_code, 1, 1, 662); + ff_h261_mba_code, 1, 1, 540); INIT_VLC_STATIC(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10, ff_h261_mtype_bits, 1, 1, ff_h261_mtype_code, 1, 1, 80);

1 0

Revert "mpeg4videodec: raise an error if sprite_trajectory.table is NULL"
by Andreas Rheinhardt 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Sat Jan 23 17:52:52 2021 +0100| [ba96f2254adb23802752ca41f2bd926ffbf15880] | committer: Andreas Rheinhardt Revert "mpeg4videodec: raise an error if sprite_trajectory.table is NULL" This reverts commit 6ac0e7818399a57e4684202bac79f35b3561ad1e. The mpeg4video parser can reach code that presumes that a certain VLC has been initialized; yet Libav did not ensure this and Libav bug #1012 [1] is about an ensuing crash. Instead of fixing the root cause a simple check for whether said VLC has already been initialized was added; said check is inherently racy. The proper fix is of course to ensure that the VLC is initialized and commit 7c76eaeca2791261d3f4f5c98c95f44abdbd879a already ensured this, so there was no need to merge 6ac0e7818399a57e4684202bac79f35b3561ad1e at all. This commit therefore reverts said commit. [1]: https://bugzilla.libav.org/show_bug.cgi?id=1012 Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba96f2254adb23802… --- libavcodec/mpeg4videodec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 102e83f5c1..fd985f0430 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -197,10 +197,6 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g if (w <= 0 || h <= 0) return AVERROR_INVALIDDATA; - /* the decoder was not properly initialized and we cannot continue */ - if (sprite_trajectory.table == NULL) - return AVERROR_INVALIDDATA; - for (i = 0; i < ctx->num_sprite_warping_points; i++) { int length; int x = 0, y = 0;

1 0

avformat/url: Reorder elements of URLProtocol to make it smaller
by Andreas Rheinhardt 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Sun Jan 24 12:19:03 2021 +0100| [e1cba568f237466080c44f6049dbc0db0ffc469e] | committer: Andreas Rheinhardt avformat/url: Reorder elements of URLProtocol to make it smaller Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1cba568f23746608… --- libavformat/url.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/url.h b/libavformat/url.h index e33edf0cb9..1ef5ca35d5 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -87,8 +87,8 @@ typedef struct URLProtocol { int *numhandles); int (*url_get_short_seek)(URLContext *h); int (*url_shutdown)(URLContext *h, int flags); - int priv_data_size; const AVClass *priv_data_class; + int priv_data_size; int flags; int (*url_check)(URLContext *h, int mask); int (*url_open_dir)(URLContext *h);

1 0

avformat/avidec: Simplify compile-time check for DV demuxer
by Andreas Rheinhardt 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 14:18:11 2021 +0100| [d64d30bd255f96214a6d63c2fdc9f9e66a516eb7] | committer: Andreas Rheinhardt avformat/avidec: Simplify compile-time check for DV demuxer 1b373b41d940e3058cdfb3d17703e23ed665353c made it a bit harder to find out that a call to avpriv_dv_produce_packet is dead when the DV demuxer is disabled; too hard for GCC on -O0. So simplify the check a bit. Reviewed-by: Peter Ross <pross(a)xvid.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d64d30bd255f96214… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e92a449969..79000f3e81 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1483,7 +1483,7 @@ resync: } } - if (dv_demux) { + if (CONFIG_DV_DEMUXER && dv_demux) { AVBufferRef *avbuf = pkt->buf; size = avpriv_dv_produce_packet(avi->dv_demux, pkt, pkt->data, pkt->size, pkt->pos);

1 0

avfilter: add colortemperature filter
by Paul B Mahol 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Jan 25 20:22:14 2021 +0100| [a9d23d33a1fae81a1f99ecf328a5ee154eb4b986] | committer: Paul B Mahol avfilter: add colortemperature filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9d23d33a1fae81a1… --- Changelog | 1 + doc/filters.texi | 22 +++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_colortemperature.c | 280 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 306 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 8015221f50..e8ee74775e 100644 --- a/Changelog +++ b/Changelog @@ -60,6 +60,7 @@ version <next>: - Dolby E parser - shear filter - kirsch filter +- colortemperature filter version 4.3: diff --git a/doc/filters.texi b/doc/filters.texi index efd2211483..fb9995eddf 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8550,6 +8550,28 @@ For example to convert the input to SMPTE-240M, use the command: colorspace=smpte240m @end example +@section colortemperature +Adjust color temperature in video to simulate variations in ambient color temperature. + +The filter accepts the following options: + +@table @option +@item temperature +Set the temperature in Kelvin. Allowed range is from 1000 to 40000. +Default value is 6500 K. + +@item mix +Set mixing with filtered output. Allowed range is from 0 to 1. +Default value is 1. + +@item pl +Set the amount of preserving lightness. Allowed range is from 0 to 1. +Default value is 0. +@end table + +@subsection Commands +This filter supports same @ref{commands} as options. + @section convolution Apply convolution of 3x3, 5x5, 7x7 or horizontal/vertical up to 49 elements. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index fbb4e29bd0..e1c364fbc6 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -203,6 +203,7 @@ OBJS-$(CONFIG_COLORHOLD_FILTER) += vf_colorkey.o OBJS-$(CONFIG_COLORLEVELS_FILTER) += vf_colorlevels.o OBJS-$(CONFIG_COLORMATRIX_FILTER) += vf_colormatrix.o OBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o colorspace.o colorspacedsp.o +OBJS-$(CONFIG_COLORTEMPERATURE_FILTER) += vf_colortemperature.o OBJS-$(CONFIG_CONVOLUTION_FILTER) += vf_convolution.o OBJS-$(CONFIG_CONVOLUTION_OPENCL_FILTER) += vf_convolution_opencl.o opencl.o \ opencl/convolution.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index d9d36554c4..1c1cc5b276 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -192,6 +192,7 @@ extern AVFilter ff_vf_colorhold; extern AVFilter ff_vf_colorlevels; extern AVFilter ff_vf_colormatrix; extern AVFilter ff_vf_colorspace; +extern AVFilter ff_vf_colortemperature; extern AVFilter ff_vf_convolution; extern AVFilter ff_vf_convolution_opencl; extern AVFilter ff_vf_convolve; diff --git a/libavfilter/version.h b/libavfilter/version.h index bedeaa90a1..4d3473cbe3 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 7 -#define LIBAVFILTER_VERSION_MINOR 99 +#define LIBAVFILTER_VERSION_MINOR 100 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_colortemperature.c b/libavfilter/vf_colortemperature.c new file mode 100644 index 0000000000..0466573e96 --- /dev/null +++ b/libavfilter/vf_colortemperature.c @@ -0,0 +1,280 @@ +/* + * Copyright (c) 2021 Paul B Mahol + * + * 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 <float.h> + +#include "libavutil/opt.h" +#include "libavutil/imgutils.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "video.h" + +typedef struct ColorTemperatureContext { + const AVClass *class; + + float temperature; + float mix; + float preserve; + + float color[3]; + + int depth; + + int (*do_slice)(AVFilterContext *s, void *arg, + int jobnr, int nb_jobs); +} ColorTemperatureContext; + +static float saturate(float input) +{ + return av_clipf(input, 0.f, 1.f); +} + +static void kelvin2rgb(float k, float *rgb) +{ + float kelvin = k / 100.0f; + + if (kelvin <= 66.0f) { + rgb[0] = 1.0f; + rgb[1] = saturate(0.39008157876901960784f * logf(kelvin) - 0.63184144378862745098f); + } else { + const float t = fmaxf(kelvin - 60.0f, 0.0f); + rgb[0] = saturate(1.29293618606274509804f * powf(t, -0.1332047592f)); + rgb[1] = saturate(1.12989086089529411765f * powf(t, -0.0755148492f)); + } + + if (kelvin >= 66.0f) + rgb[2] = 1.0f; + else if (kelvin <= 19.0f) + rgb[2] = 0.0f; + else + rgb[2] = saturate(0.54320678911019607843f * logf(kelvin - 10.0f) - 1.19625408914f); +} + +static float lerpf(float v0, float v1, float f) +{ + return v0 + (v1 - v0) * f; +} + +static int temperature_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ColorTemperatureContext *s = ctx->priv; + AVFrame *frame = arg; + const int width = frame->width; + const int height = frame->height; + const float mix = s->mix; + const float preserve = s->preserve; + const float *color = s->color; + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr + 1)) / nb_jobs; + const int glinesize = frame->linesize[0]; + const int blinesize = frame->linesize[1]; + const int rlinesize = frame->linesize[2]; + uint8_t *gptr = frame->data[0] + slice_start * glinesize; + uint8_t *bptr = frame->data[1] + slice_start * blinesize; + uint8_t *rptr = frame->data[2] + slice_start * rlinesize; + + for (int y = slice_start; y < slice_end; y++) { + for (int x = 0; x < width; x++) { + float g = gptr[x]; + float b = bptr[x]; + float r = rptr[x]; + float nr, ng, nb; + float l0, l1, l; + + nr = r * color[0]; + ng = g * color[1]; + nb = b * color[2]; + + nr = lerpf(r, nr, mix); + ng = lerpf(g, ng, mix); + nb = lerpf(b, nb, mix); + + l0 = (FFMAX3(r, g, b) + FFMIN3(r, g, b)) + FLT_EPSILON; + l1 = (FFMAX3(nr, ng, nb) + FFMIN3(nr, ng, nb)) + FLT_EPSILON; + l = l0 / l1; + + r = nr * l; + g = ng * l; + b = nb * l; + + nr = lerpf(nr, r, preserve); + ng = lerpf(ng, g, preserve); + nb = lerpf(nb, b, preserve); + + gptr[x] = av_clip_uint8(ng); + bptr[x] = av_clip_uint8(nb); + rptr[x] = av_clip_uint8(nr); + } + + gptr += glinesize; + bptr += blinesize; + rptr += rlinesize; + } + + return 0; +} + +static int temperature_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ColorTemperatureContext *s = ctx->priv; + AVFrame *frame = arg; + const int depth = s->depth; + const int width = frame->width; + const int height = frame->height; + const float preserve = s->preserve; + const float mix = s->mix; + const float *color = s->color; + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr + 1)) / nb_jobs; + const int glinesize = frame->linesize[0] / sizeof(uint16_t); + const int blinesize = frame->linesize[1] / sizeof(uint16_t); + const int rlinesize = frame->linesize[2] / sizeof(uint16_t); + uint16_t *gptr = (uint16_t *)frame->data[0] + slice_start * glinesize; + uint16_t *bptr = (uint16_t *)frame->data[1] + slice_start * blinesize; + uint16_t *rptr = (uint16_t *)frame->data[2] + slice_start * rlinesize; + + for (int y = slice_start; y < slice_end; y++) { + for (int x = 0; x < width; x++) { + float g = gptr[x]; + float b = bptr[x]; + float r = rptr[x]; + float nr, ng, nb; + float l0, l1, l; + + nr = r * color[0]; + ng = g * color[1]; + nb = b * color[2]; + + nr = lerpf(r, nr, mix); + ng = lerpf(g, ng, mix); + nb = lerpf(b, nb, mix); + + l0 = (FFMAX3(r, g, b) + FFMIN3(r, g, b)) + FLT_EPSILON; + l1 = (FFMAX3(nr, ng, nb) + FFMIN3(nr, ng, nb)) + FLT_EPSILON; + l = l0 / l1; + + r = nr * l; + g = ng * l; + b = nb * l; + + nr = lerpf(nr, r, preserve); + ng = lerpf(ng, g, preserve); + nb = lerpf(nb, b, preserve); + + gptr[x] = av_clip_uintp2_c(ng, depth); + bptr[x] = av_clip_uintp2_c(nb, depth); + rptr[x] = av_clip_uintp2_c(nr, depth); + } + + gptr += glinesize; + bptr += blinesize; + rptr += rlinesize; + } + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *frame) +{ + AVFilterContext *ctx = inlink->dst; + ColorTemperatureContext *s = ctx->priv; + + kelvin2rgb(s->temperature, s->color); + + ctx->internal->execute(ctx, s->do_slice, frame, NULL, + FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); + + return ff_filter_frame(ctx->outputs[0], frame); +} + +static av_cold int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pixel_fmts[] = { + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, + AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, + AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_NONE + }; + + AVFilterFormats *formats = NULL; + + formats = ff_make_format_list(pixel_fmts); + if (!formats) + return AVERROR(ENOMEM); + + return ff_set_common_formats(ctx, formats); +} + +static av_cold int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + ColorTemperatureContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + + s->depth = desc->comp[0].depth; + s->do_slice = s->depth <= 8 ? temperature_slice8 : temperature_slice16; + + return 0; +} + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + .config_props = config_input, + .needs_writable = 1, + }, + { NULL } +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +#define OFFSET(x) offsetof(ColorTemperatureContext, x) +#define VF AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM + +static const AVOption colortemperature_options[] = { + { "temperature", "set the temperature in Kelvins", OFFSET(temperature), AV_OPT_TYPE_FLOAT, {.dbl=6500}, 1000, 40000, VF }, + { "mix", "set the mix with filtered output", OFFSET(mix), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, 1, VF }, + { "pl", "set the amount of preserving lightness", OFFSET(preserve), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 1, VF }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(colortemperature); + +AVFilter ff_vf_colortemperature = { + .name = "colortemperature", + .description = NULL_IF_CONFIG_SMALL("Adjust color temperature of video."), + .priv_size = sizeof(ColorTemperatureContext), + .priv_class = &colortemperature_class, + .query_formats = query_formats, + .inputs = inputs, + .outputs = outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .process_command = ff_filter_process_command, +};

1 0