...
|
...
|
@@ -251,34 +251,33 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)
|
251
|
251
|
av_frame_copy_props(outpic, inpic);
|
252
|
252
|
}
|
253
|
253
|
|
254
|
|
- /* todo: reindent */
|
255
|
|
- hue->var_values[VAR_T] = TS2T(inpic->pts, inlink->time_base);
|
256
|
|
- hue->var_values[VAR_PTS] = TS2D(inpic->pts);
|
257
|
|
-
|
258
|
|
- if (hue->saturation_expr) {
|
259
|
|
- hue->saturation = av_expr_eval(hue->saturation_pexpr, hue->var_values, NULL);
|
260
|
|
-
|
261
|
|
- if (hue->saturation < SAT_MIN_VAL || hue->saturation > SAT_MAX_VAL) {
|
262
|
|
- hue->saturation = av_clip(hue->saturation, SAT_MIN_VAL, SAT_MAX_VAL);
|
263
|
|
- av_log(inlink->dst, AV_LOG_WARNING,
|
264
|
|
- "Saturation value not in range [%d,%d]: clipping value to %0.1f\n",
|
265
|
|
- SAT_MIN_VAL, SAT_MAX_VAL, hue->saturation);
|
266
|
|
- }
|
267
|
|
- }
|
|
254
|
+ hue->var_values[VAR_T] = TS2T(inpic->pts, inlink->time_base);
|
|
255
|
+ hue->var_values[VAR_PTS] = TS2D(inpic->pts);
|
|
256
|
+
|
|
257
|
+ if (hue->saturation_expr) {
|
|
258
|
+ hue->saturation = av_expr_eval(hue->saturation_pexpr, hue->var_values, NULL);
|
268
|
259
|
|
269
|
|
- if (hue->hue_deg_expr) {
|
270
|
|
- hue->hue_deg = av_expr_eval(hue->hue_deg_pexpr, hue->var_values, NULL);
|
271
|
|
- hue->hue = hue->hue_deg * M_PI / 180;
|
272
|
|
- } else if (hue->hue_expr) {
|
273
|
|
- hue->hue = av_expr_eval(hue->hue_pexpr, hue->var_values, NULL);
|
|
260
|
+ if (hue->saturation < SAT_MIN_VAL || hue->saturation > SAT_MAX_VAL) {
|
|
261
|
+ hue->saturation = av_clip(hue->saturation, SAT_MIN_VAL, SAT_MAX_VAL);
|
|
262
|
+ av_log(inlink->dst, AV_LOG_WARNING,
|
|
263
|
+ "Saturation value not in range [%d,%d]: clipping value to %0.1f\n",
|
|
264
|
+ SAT_MIN_VAL, SAT_MAX_VAL, hue->saturation);
|
274
|
265
|
}
|
|
266
|
+ }
|
275
|
267
|
|
276
|
|
- av_log(inlink->dst, AV_LOG_DEBUG,
|
277
|
|
- "H:%0.1f s:%0.f t:%0.1f n:%d\n",
|
278
|
|
- hue->hue, hue->saturation,
|
279
|
|
- hue->var_values[VAR_T], (int)hue->var_values[VAR_N]);
|
|
268
|
+ if (hue->hue_deg_expr) {
|
|
269
|
+ hue->hue_deg = av_expr_eval(hue->hue_deg_pexpr, hue->var_values, NULL);
|
|
270
|
+ hue->hue = hue->hue_deg * M_PI / 180;
|
|
271
|
+ } else if (hue->hue_expr) {
|
|
272
|
+ hue->hue = av_expr_eval(hue->hue_pexpr, hue->var_values, NULL);
|
|
273
|
+ }
|
|
274
|
+
|
|
275
|
+ av_log(inlink->dst, AV_LOG_DEBUG,
|
|
276
|
+ "H:%0.1f s:%0.f t:%0.1f n:%d\n",
|
|
277
|
+ hue->hue, hue->saturation,
|
|
278
|
+ hue->var_values[VAR_T], (int)hue->var_values[VAR_N]);
|
280
|
279
|
|
281
|
|
- compute_sin_and_cos(hue);
|
|
280
|
+ compute_sin_and_cos(hue);
|
282
|
281
|
|
283
|
282
|
hue->var_values[VAR_N] += 1;
|
284
|
283
|
|