From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/clearvideo: Move tile_do_block() upwards
Date: Mon, 7 Nov 2022 02:49:19 +0100
Message-ID: <GV1P250MB07371009F5B48154457666218F3C9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB07375837F2A522ABDA22803E8F3C9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Will avoid a forward-declaration later.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/clearvideo.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c
index 82311bc645..6ea3d7b6a2 100644
--- a/libavcodec/clearvideo.c
+++ b/libavcodec/clearvideo.c
@@ -362,6 +362,20 @@ static void mvi_update_row(MVInfo *mvi)
}
}
+static int tile_do_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src,
+ int plane, int x, int y, int dx, int dy, int size, int bias)
+{
+ int ret;
+
+ if (!bias) {
+ ret = copy_block(avctx, dst, src, plane, x, y, dx, dy, size);
+ } else {
+ ret = copyadd_block(avctx, dst, src, plane, x, y, dx, dy, size, bias);
+ }
+
+ return ret;
+}
+
static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc)
{
TileInfo *ti;
@@ -414,20 +428,6 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc)
return ti;
}
-static int tile_do_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src,
- int plane, int x, int y, int dx, int dy, int size, int bias)
-{
- int ret;
-
- if (!bias) {
- ret = copy_block(avctx, dst, src, plane, x, y, dx, dy, size);
- } else {
- ret = copyadd_block(avctx, dst, src, plane, x, y, dx, dy, size, bias);
- }
-
- return ret;
-}
-
static int restore_tree(AVCodecContext *avctx, AVFrame *dst, AVFrame *src,
int plane, int x, int y, int size,
TileInfo *tile, MV root_mv)
--
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:[~2022-11-07 1:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 1:48 [FFmpeg-devel] [PATCH 1/5] avcodec/clearvideo: Remove unnecessary level parameter Andreas Rheinhardt
2022-11-07 1:49 ` Andreas Rheinhardt [this message]
2022-11-07 1:49 ` [FFmpeg-devel] [PATCH 3/5] avcodec/clearvideo: Redo updating predicition Andreas Rheinhardt
2022-11-07 1:49 ` [FFmpeg-devel] [PATCH 4/5] avcodec/clearvideo: Use const where appropriate Andreas Rheinhardt
2022-11-07 1:49 ` [FFmpeg-devel] [PATCH 5/5] avcodec/clearvideo: Avoid allocations when decoding tiles Andreas Rheinhardt
2022-11-09 14:41 ` [FFmpeg-devel] [PATCH 1/5] avcodec/clearvideo: Remove unnecessary level parameter 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=GV1P250MB07371009F5B48154457666218F3C9@GV1P250MB0737.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