Showing the changes to libavfilter (12 of 12 files). Show all
Unified · Split
| @@ -416,8 +416,6 @@ static int aeval_config_output(AVFilterLink *outlink) · 415 unmodified lines | |||
| 416 | return 0; | 416 | return 0; |
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb)) | ||
| 420 | |||
| 421 | static int filter_frame(AVFilterLink *inlink, AVFrame *in) | 419 | static int filter_frame(AVFilterLink *inlink, AVFrame *in) |
| 422 | { | 420 | { |
| 423 | EvalContext *eval = inlink->dst->priv; | 421 | EvalContext *eval = inlink->dst->priv; |
| @@ -335,10 +335,6 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar · 334 unmodified lines | |||
| 335 | return ret; | 335 | return ret; |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) | ||
| 339 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 340 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb)) | ||
| 341 | |||
| 342 | static int filter_frame(AVFilterLink *inlink, AVFrame *buf) | 338 | static int filter_frame(AVFilterLink *inlink, AVFrame *buf) |
| 343 | { | 339 | { |
| 344 | AVFilterContext *ctx = inlink->dst; | 340 | AVFilterContext *ctx = inlink->dst; |
| @@ -325,9 +325,6 @@ static double get_concatdec_select(AVFrame *frame, int64_t pts) · 324 unmodified lines | |||
| 325 | return NAN; | 325 | return NAN; |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) | ||
| 329 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 330 | |||
| 331 | static void select_frame(AVFilterContext *ctx, AVFrame *frame) | 328 | static void select_frame(AVFilterContext *ctx, AVFrame *frame) |
| 332 | { | 329 | { |
| 333 | SelectContext *select = ctx->priv; | 330 | SelectContext *select = ctx->priv; |
| @@ -475,9 +475,6 @@ static av_cold void uninit(AVFilterContext *ctx) · 474 unmodified lines | |||
| 475 | av_freep(&s->intervals); | 475 | av_freep(&s->intervals); |
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 479 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb)) | ||
| 480 | |||
| 481 | static int filter_frame(AVFilterLink *inlink, AVFrame *ref) | 478 | static int filter_frame(AVFilterLink *inlink, AVFrame *ref) |
| 482 | { | 479 | { |
| 483 | AVFilterContext *ctx = inlink->dst; | 480 | AVFilterContext *ctx = inlink->dst; |
| @@ -234,6 +234,10 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts · 233 unmodified lines | |||
| 234 | 234 | ||
| 235 | void ff_command_queue_pop(AVFilterContext *filter); | 235 | void ff_command_queue_pop(AVFilterContext *filter); |
| 236 | 236 | ||
| 237 | #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) | ||
| 238 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 239 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) | ||
| 240 | |||
| 237 | /* misc trace functions */ | 241 | /* misc trace functions */ |
| 238 | 242 | ||
| 239 | #define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func) | 243 | #define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func) |
| @@ -142,10 +142,6 @@ static int config_input(AVFilterLink *inlink) · 141 unmodified lines | |||
| 142 | return 0; | 142 | return 0; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) | ||
| 146 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 147 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb)) | ||
| 148 | |||
| 149 | #define BUF_SIZE 64 | 145 | #define BUF_SIZE 64 |
| 150 | 146 | ||
| 151 | static inline char *double2int64str(char *buf, double v) | 147 | static inline char *double2int64str(char *buf, double v) |
| @@ -55,7 +55,6 @@ enum var_name { · 54 unmodified lines | |||
| 55 | VAR_T, | 55 | VAR_T, |
| 56 | VAR_VARS_NB | 56 | VAR_VARS_NB |
| 57 | }; | 57 | }; |
| 58 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) | ||
| 59 | 58 | ||
| 60 | static int set_expr(AVExpr **pexpr, const char *expr, const char *option, void *log_ctx) | 59 | static int set_expr(AVExpr **pexpr, const char *expr, const char *option, void *log_ctx) |
| 61 | { | 60 | { |
| @@ -249,8 +249,6 @@ static int query_formats(AVFilterContext *ctx) · 248 unmodified lines | |||
| 249 | return ff_set_common_formats(ctx, fmts_list); | 249 | return ff_set_common_formats(ctx, fmts_list); |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) | ||
| 253 | |||
| 254 | static int filter_frame(AVFilterLink *inlink, AVFrame *in) | 252 | static int filter_frame(AVFilterLink *inlink, AVFrame *in) |
| 255 | { | 253 | { |
| 256 | AVFilterContext *ctx = inlink->dst; | 254 | AVFilterContext *ctx = inlink->dst; |
| @@ -363,9 +363,6 @@ static void apply_lut10(HueContext *s, · 362 unmodified lines | |||
| 363 | } | 363 | } |
| 364 | } | 364 | } |
| 365 | 365 | ||
| 366 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 367 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) | ||
| 368 | |||
| 369 | static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) | 366 | static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) |
| 370 | { | 367 | { |
| 371 | HueContext *hue = inlink->dst->priv; | 368 | HueContext *hue = inlink->dst->priv; |
| @@ -415,8 +415,6 @@ static av_always_inline void simple_rotate(uint8_t *dst, const uint8_t *src, int · 414 unmodified lines | |||
| 415 | } | 415 | } |
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb)) | ||
| 419 | |||
| 420 | static int filter_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) | 418 | static int filter_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) |
| 421 | { | 419 | { |
| 422 | ThreadData *td = arg; | 420 | ThreadData *td = arg; |
| @@ -647,8 +647,6 @@ static int scale_slice(AVFilterLink *link, AVFrame *out_buf, AVFrame *cur_pic, s · 646 unmodified lines | |||
| 647 | out,out_stride); | 647 | out,out_stride); |
| 648 | } | 648 | } |
| 649 | 649 | ||
| 650 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) | ||
| 651 | |||
| 652 | static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out) | 650 | static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out) |
| 653 | { | 651 | { |
| 654 | AVFilterContext *ctx = link->dst; | 652 | AVFilterContext *ctx = link->dst; |
| @@ -155,9 +155,6 @@ static double get_natural_factor(const VignetteContext *s, int x, int y) · 154 unmodified lines | |||
| 155 | } | 155 | } |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) | ||
| 159 | #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) | ||
| 160 | |||
| 161 | static void update_context(VignetteContext *s, AVFilterLink *inlink, AVFrame *frame) | 158 | static void update_context(VignetteContext *s, AVFilterLink *inlink, AVFrame *frame) |
| 162 | { | 159 | { |
| 163 | int x, y; | 160 | int x, y; |