From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ralf: Move variable from context to stack
Date: Wed, 7 Sep 2022 17:06:56 +0200
Message-ID: <GV1P250MB0737177263EDBC72A2962F708F419@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB0737118807137F9A8923CA488F419@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/ralf.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index 8f8e49f535..591598d8fc 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -63,7 +63,6 @@ typedef struct RALFContext {
unsigned bias[2]; ///< a constant value added to channel data after filtering
- int num_blocks; ///< number of blocks inside the frame
int sample_offset;
int block_size[1 << 12]; ///< size of the blocks
int block_pts[1 << 12]; ///< block start time (in milliseconds)
@@ -418,7 +417,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
int16_t *samples1;
int ret;
GetBitContext gb;
- int table_size, table_bytes, i;
+ int table_size, table_bytes, num_blocks;
const uint8_t *src, *block_pointer;
int src_size;
int bytes_left;
@@ -462,17 +461,17 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
return AVERROR_INVALIDDATA;
}
init_get_bits(&gb, src + 2, table_size);
- ctx->num_blocks = 0;
+ num_blocks = 0;
while (get_bits_left(&gb) > 0) {
- if (ctx->num_blocks >= FF_ARRAY_ELEMS(ctx->block_size))
+ if (num_blocks >= FF_ARRAY_ELEMS(ctx->block_size))
return AVERROR_INVALIDDATA;
- ctx->block_size[ctx->num_blocks] = get_bits(&gb, 13 + avctx->ch_layout.nb_channels);
+ ctx->block_size[num_blocks] = get_bits(&gb, 13 + avctx->ch_layout.nb_channels);
if (get_bits1(&gb)) {
- ctx->block_pts[ctx->num_blocks] = get_bits(&gb, 9);
+ ctx->block_pts[num_blocks] = get_bits(&gb, 9);
} else {
- ctx->block_pts[ctx->num_blocks] = 0;
+ ctx->block_pts[num_blocks] = 0;
}
- ctx->num_blocks++;
+ num_blocks++;
}
frame->nb_samples = ctx->max_frame_size;
@@ -483,7 +482,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
block_pointer = src + table_bytes + 2;
bytes_left = src_size - table_bytes - 2;
ctx->sample_offset = 0;
- for (i = 0; i < ctx->num_blocks; i++) {
+ for (int i = 0; i < num_blocks; i++) {
if (bytes_left < ctx->block_size[i]) {
av_log(avctx, AV_LOG_ERROR, "I'm pedaling backwards\n");
break;
--
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-09-07 15:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 15:06 [FFmpeg-devel] [PATCH 1/2] avcodec/ralf: Move frame allocation after error checks Andreas Rheinhardt
2022-09-07 15:06 ` Andreas Rheinhardt [this message]
2022-09-09 23:44 ` 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=GV1P250MB0737177263EDBC72A2962F708F419@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