Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: "Tomas Härdin" <tjoppen@acc.umu.se>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 4/8] libavcodec/jpeg2000_parser: LUTify info_marker()
Date: Tue, 31 May 2022 12:00:05 +0200
Message-ID: <f6ed6aafe63460228efc73a1b231be3d2aea9239.camel@acc.umu.se> (raw)
In-Reply-To: <152f94f0779c645542f5a678d9392ee53584d45a.camel@acc.umu.se>

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0004-libavcodec-jpeg2000_parser-LUTify-info_marker.patch --]
[-- Type: text/x-patch, Size: 2011 bytes --]

From d84f106d1eac7a3ea98935d11dc65e0afe8a8fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Fri, 20 May 2022 14:41:38 +0200
Subject: [PATCH 4/8] libavcodec/jpeg2000_parser: LUTify info_marker()

This speeds find_frame_end() up by 39% according to valgrind
---
 libavcodec/jpeg2000_parser.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/libavcodec/jpeg2000_parser.c b/libavcodec/jpeg2000_parser.c
index c6d8416d43..88e4a142f8 100644
--- a/libavcodec/jpeg2000_parser.c
+++ b/libavcodec/jpeg2000_parser.c
@@ -65,13 +65,25 @@ static inline void reset_context(JPEG2000ParserContext *m)
 */
 static uint8_t info_marker(uint16_t marker)
 {
-    if (marker == 0xFF92 || marker == 0xFF4F ||
-        marker == 0xFF90 || marker == 0xFF93 ||
-        marker == 0xFFD9)
-        return 0;
-    else
-        if (marker > 0xFF00) return 1;
-    return 0;
+    static const uint8_t lut[256] = {
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, // 0xFF4F
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xFF90 0xFF92 0xFF93
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, // 0xFFD9
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    };
+    return marker < 0xFF00 ? 0 : lut[marker & 0xFF];
 }
 
 /**
-- 
2.30.2


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

  parent reply	other threads:[~2022-05-31 10:00 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-31  9:58 [FFmpeg-devel] [PATCH 1/8] libavcodec/jpeg2000_parser: Speed up long skips Tomas Härdin
2022-05-31  9:59 ` [FFmpeg-devel] [PATCH 2/8] libavcodec/jpeg2000_parser: Simplify, fix reset_context() Tomas Härdin
2022-06-01 16:50   ` Michael Niedermayer
2022-05-31  9:59 ` [FFmpeg-devel] [PATCH 3/8] libavcodec/jpeg2000_parser: next_state is just a temporary Tomas Härdin
2022-06-01 16:43   ` Michael Niedermayer
2022-05-31 10:00 ` Tomas Härdin [this message]
2022-06-01 16:40   ` [FFmpeg-devel] [PATCH 4/8] libavcodec/jpeg2000_parser: LUTify info_marker() Michael Niedermayer
2022-05-31 10:00 ` [FFmpeg-devel] [PATCH 5/8] libavcodec/jpeg2000_parser: Rearrange ifs Tomas Härdin
2022-06-01 16:36   ` Michael Niedermayer
2022-05-31 10:00 ` [FFmpeg-devel] [PATCH 6/8] libavcodec/jpeg2000_parser: Reindent Tomas Härdin
2022-05-31 10:01 ` [FFmpeg-devel] [PATCH 7/8] libavcodec/jpeg2000_parser: Localize m->bytes_read Tomas Härdin
2022-06-01 16:38   ` Michael Niedermayer
2022-05-31 10:01 ` [FFmpeg-devel] [PATCH 8/8] libavcodec/jpeg2000: Call av_codec_is_encoder() only once in init_prec() Tomas Härdin
2022-06-01 16:34   ` Michael Niedermayer
2022-06-01  9:59 ` [FFmpeg-devel] [PATCH 1/8] libavcodec/jpeg2000_parser: Speed up long skips Anton Khirnov
2022-06-01 12:34   ` Tomas Härdin
2022-06-01 13:29     ` Anton Khirnov
2022-06-01 16:21 ` Michael Niedermayer
2022-06-01 16:23   ` Michael Niedermayer
2022-06-02  9:54     ` Tomas Härdin
2022-06-02 19:19       ` Michael Niedermayer
2022-06-03  9:17         ` Tomas Härdin
2022-06-03 14:58           ` Michael Niedermayer
2022-06-10  9:12 ` Tomas Härdin

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=f6ed6aafe63460228efc73a1b231be3d2aea9239.camel@acc.umu.se \
    --to=tjoppen@acc.umu.se \
    --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