From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avcodec/setts_bsf: don't repeatedly set start pts and dts
Date: Thu, 17 Mar 2022 00:00:37 -0300
Message-ID: <20220317030037.10486-1-jamrial@gmail.com> (raw)
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/setts_bsf.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c
index b7732214ee..3c666b5061 100644
--- a/libavcodec/setts_bsf.c
+++ b/libavcodec/setts_bsf.c
@@ -91,9 +91,6 @@ typedef struct SetTSContext {
int64_t frame_number;
- int64_t start_pts;
- int64_t start_dts;
-
double var_values[VAR_VARS_NB];
AVExpr *ts_expr;
@@ -149,8 +146,8 @@ static int setts_init(AVBSFContext *ctx)
ctx->time_base_out = s->time_base;
s->frame_number= 0;
- s->start_pts = AV_NOPTS_VALUE;
- s->start_dts = AV_NOPTS_VALUE;
+ s->var_values[VAR_STARTPTS] = AV_NOPTS_VALUE;
+ s->var_values[VAR_STARTDTS] = AV_NOPTS_VALUE;
s->var_values[VAR_NOPTS] = AV_NOPTS_VALUE;
s->var_values[VAR_TB] = ctx->time_base_in.den ? av_q2d(ctx->time_base_in) : 0;
s->var_values[VAR_TB_OUT]= ctx->time_base_out.den ? av_q2d(ctx->time_base_out) : 0;
@@ -174,11 +171,11 @@ static int setts_filter(AVBSFContext *ctx, AVPacket *pkt)
return AVERROR(EAGAIN);
}
- if (s->start_pts == AV_NOPTS_VALUE)
- s->start_pts = s->cur_pkt->pts;
+ if (s->var_values[VAR_STARTPTS] == AV_NOPTS_VALUE)
+ s->var_values[VAR_STARTPTS] = s->cur_pkt->pts;
- if (s->start_dts == AV_NOPTS_VALUE)
- s->start_dts = s->cur_pkt->dts;
+ if (s->var_values[VAR_STARTDTS] == AV_NOPTS_VALUE)
+ s->var_values[VAR_STARTDTS] = s->cur_pkt->dts;
s->var_values[VAR_N] = s->frame_number++;
s->var_values[VAR_TS] = s->cur_pkt->dts;
@@ -195,8 +192,6 @@ static int setts_filter(AVBSFContext *ctx, AVPacket *pkt)
s->var_values[VAR_NEXT_PTS] = pkt->pts;
s->var_values[VAR_NEXT_DTS] = pkt->dts;
s->var_values[VAR_NEXT_DUR] = pkt->duration;
- s->var_values[VAR_STARTPTS] = s->start_pts;
- s->var_values[VAR_STARTDTS] = s->start_dts;
new_ts = llrint(av_expr_eval(s->ts_expr, s->var_values, NULL));
new_duration = llrint(av_expr_eval(s->duration_expr, s->var_values, NULL));
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2022-03-17 3:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-17 3:00 James Almer [this message]
2022-03-17 17:28 ` Paul B Mahol
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220317030037.10486-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git