From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Subject: [FFmpeg-devel] [PATCH 5/5] avfilter/signature_lookup: Avoid branch when adding to linked list Date: Wed, 14 Feb 2024 13:05:34 +0100 Message-ID: <AS8P250MB074407A36091A0BCBC1BD2868F4E2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw) In-Reply-To: <AS8P250MB07447985D1C6D4DACFA426B28F4E2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/signature_lookup.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c index ff0d23c5c7..9c69c02fbf 100644 --- a/libavfilter/signature_lookup.c +++ b/libavfilter/signature_lookup.c @@ -187,7 +187,7 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont size_t i, j, k, l, hmax = 0, score; int framerate, offset, l1dist; double m; - MatchingInfo *cands = NULL, *c = NULL; + MatchingInfo cands = { 0 }, *c = &cands; struct { uint8_t size; @@ -295,16 +295,10 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont for (i = 0; i < MAX_FRAMERATE; i++) { for (j = 0; j < HOUGH_MAX_OFFSET; j++) { if (hmax < hspace[i][j].score) { - if (c == NULL) { - c = av_malloc(sizeof(MatchingInfo)); - cands = c; - } else { - c->next = av_malloc(sizeof(MatchingInfo)); - c = c->next; - - } + c->next = av_malloc(sizeof(MatchingInfo)); + c = c->next; if (!c) { - sll_free(&cands); + sll_free(&cands.next); goto error; } c->framerateratio = (i+1.0) / 30; @@ -325,7 +319,7 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont error: av_freep(&hspace); av_free(hspaces); - return cands; + return cands.next; } static int iterate_frame(double frr, FineSignature **a, FineSignature **b, int fcount, int *bcount, int dir) -- 2.34.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 prev parent reply other threads:[~2024-02-14 12:04 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-14 12:03 [FFmpeg-devel] [PATCH 1/5] avfilter/vf_signature: Allocate arrays together Andreas Rheinhardt 2024-02-14 12:05 ` [FFmpeg-devel] [PATCH 2/5] avfilter/signature_lookup: Check for allocation error Andreas Rheinhardt 2024-02-14 12:05 ` [FFmpeg-devel] [PATCH 3/5] avfilter/signature_lookup: Allocate buffers jointly Andreas Rheinhardt 2024-02-14 12:05 ` [FFmpeg-devel] [PATCH 4/5] avfilter/signature_lookup: Remove useless error logs Andreas Rheinhardt 2024-02-14 12:05 ` Andreas Rheinhardt [this message] 2024-02-14 12:17 ` [FFmpeg-devel] [PATCH 1/5] avfilter/vf_signature: Allocate arrays together epirat07 2024-02-14 12:24 ` Andreas Rheinhardt 2024-02-18 2:48 ` Andreas Rheinhardt
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=AS8P250MB074407A36091A0BCBC1BD2868F4E2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \ --to=andreas.rheinhardt@outlook.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