* [FFmpeg-devel] [PATCH 2/5] avcodec/vbn(dec|enc): Avoid leaving stale pointers in context
2022-04-12 19:23 [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Andreas Rheinhardt
@ 2022-04-12 19:25 ` Andreas Rheinhardt
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 3/5] avcodec/vbn(dec|enc): Avoid always-false checks Andreas Rheinhardt
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Rheinhardt @ 2022-04-12 19:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Therefore move the (Get|Put)ByteContext from the context to the stack.
It is transient anyway.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/vbndec.c | 11 ++++-------
libavcodec/vbnenc.c | 3 +--
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c
index 916421925d..56bfb1d544 100644
--- a/libavcodec/vbndec.c
+++ b/libavcodec/vbndec.c
@@ -34,7 +34,6 @@
typedef struct VBNContext {
TextureDSPContext texdsp;
TextureDSPThreadContext dec;
- GetByteContext gb;
} VBNContext;
static av_cold int vbn_init(AVCodecContext *avctx)
@@ -44,11 +43,9 @@ static av_cold int vbn_init(AVCodecContext *avctx)
return 0;
}
-static int decompress(AVCodecContext *avctx, int compression, uint8_t **outbuf)
+static int decompress(AVCodecContext *avctx, GetByteContext *gb,
+ int compression, uint8_t **outbuf)
{
- VBNContext *ctx = avctx->priv_data;
- GetByteContext *gb = &ctx->gb;
-
if (compression == VBN_COMPRESSION_NONE) // outbuf is left NULL because gb->buf can be used directly
return bytestream2_get_bytes_left(gb);
@@ -61,7 +58,7 @@ static int vbn_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
VBNContext *ctx = avctx->priv_data;
- GetByteContext *gb = &ctx->gb;
+ GetByteContext gb0, *const gb = &gb0;
uint8_t *image_buf = NULL;
int image_len;
int width, height, components, format, compression, pix_fmt, linesize, data_size;
@@ -139,7 +136,7 @@ static int vbn_decode_frame(AVCodecContext *avctx,
return AVERROR_PATCHWELCOME;
}
- image_len = decompress(avctx, compression, &image_buf);
+ image_len = decompress(avctx, gb, compression, &image_buf);
if (image_len < 0)
return image_len;
diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c
index 0b2c4dced2..03d36ccc86 100644
--- a/libavcodec/vbnenc.c
+++ b/libavcodec/vbnenc.c
@@ -37,7 +37,6 @@
typedef struct VBNContext {
AVClass *class;
TextureDSPContext dxtc;
- PutByteContext pb;
int format;
TextureDSPThreadContext enc;
} VBNContext;
@@ -46,7 +45,7 @@ static int vbn_encode(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet)
{
VBNContext *ctx = avctx->priv_data;
- PutByteContext *pb = &ctx->pb;
+ PutByteContext pb0, *const pb = &pb0;
int ret;
ptrdiff_t linesize;
int64_t pkt_size;
--
2.32.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 8+ messages in thread* [FFmpeg-devel] [PATCH 3/5] avcodec/vbn(dec|enc): Avoid always-false checks
2022-04-12 19:23 [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Andreas Rheinhardt
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 2/5] avcodec/vbn(dec|enc): Avoid leaving stale pointers in context Andreas Rheinhardt
@ 2022-04-12 19:25 ` Andreas Rheinhardt
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 4/5] avcodec/vbnenc: Add AV_CODEC_CAP_DR1 Andreas Rheinhardt
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Rheinhardt @ 2022-04-12 19:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Do this by switching to bytestream2_(get|put)_le32u() from
bytestream2_(get|put)_le32(); it has after all already been checked
that the packet contains at least a full header, making all
the implicit checks in bytestream2_(get|put)_le32() dead code.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/vbndec.c | 20 ++++++++++----------
libavcodec/vbnenc.c | 22 +++++++++++-----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c
index 56bfb1d544..a6046c766a 100644
--- a/libavcodec/vbndec.c
+++ b/libavcodec/vbndec.c
@@ -71,20 +71,20 @@ static int vbn_decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA;
}
- if (bytestream2_get_le32(gb) != VBN_MAGIC ||
- bytestream2_get_le32(gb) != VBN_MAJOR ||
- bytestream2_get_le32(gb) != VBN_MINOR) {
+ if (bytestream2_get_le32u(gb) != VBN_MAGIC ||
+ bytestream2_get_le32u(gb) != VBN_MAJOR ||
+ bytestream2_get_le32u(gb) != VBN_MINOR) {
av_log(avctx, AV_LOG_ERROR, "Invalid VBN header\n");
return AVERROR_INVALIDDATA;
}
- width = bytestream2_get_le32(gb);
- height = bytestream2_get_le32(gb);
- components = bytestream2_get_le32(gb);
- format = bytestream2_get_le32(gb);
- pix_fmt = bytestream2_get_le32(gb);
- bytestream2_get_le32(gb); // mipmaps
- data_size = bytestream2_get_le32(gb);
+ width = bytestream2_get_le32u(gb);
+ height = bytestream2_get_le32u(gb);
+ components = bytestream2_get_le32u(gb);
+ format = bytestream2_get_le32u(gb);
+ pix_fmt = bytestream2_get_le32u(gb);
+ bytestream2_get_le32u(gb); // mipmaps
+ data_size = bytestream2_get_le32u(gb);
bytestream2_seek(gb, VBN_HEADER_SIZE, SEEK_SET);
compression = format & 0xffffff00;
diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c
index 03d36ccc86..ec04566a32 100644
--- a/libavcodec/vbnenc.c
+++ b/libavcodec/vbnenc.c
@@ -97,18 +97,18 @@ static int vbn_encode(AVCodecContext *avctx, AVPacket *pkt,
memset(pkt->data, 0, VBN_HEADER_SIZE);
bytestream2_init_writer(pb, pkt->data, pkt_size);
- bytestream2_put_le32(pb, VBN_MAGIC);
- bytestream2_put_le32(pb, VBN_MAJOR);
- bytestream2_put_le32(pb, VBN_MINOR);
- bytestream2_put_le32(pb, frame->width);
- bytestream2_put_le32(pb, frame->height);
- bytestream2_put_le32(pb, frame->format == AV_PIX_FMT_RGBA ? 4 : 3);
- bytestream2_put_le32(pb, ctx->format);
- bytestream2_put_le32(pb, frame->format == AV_PIX_FMT_RGBA ? VBN_PIX_RGBA : VBN_PIX_RGB);
- bytestream2_put_le32(pb, 0); // mipmaps
- bytestream2_put_le32(pb, pkt_size - VBN_HEADER_SIZE);
+ bytestream2_put_le32u(pb, VBN_MAGIC);
+ bytestream2_put_le32u(pb, VBN_MAJOR);
+ bytestream2_put_le32u(pb, VBN_MINOR);
+ bytestream2_put_le32u(pb, frame->width);
+ bytestream2_put_le32u(pb, frame->height);
+ bytestream2_put_le32u(pb, frame->format == AV_PIX_FMT_RGBA ? 4 : 3);
+ bytestream2_put_le32u(pb, ctx->format);
+ bytestream2_put_le32u(pb, frame->format == AV_PIX_FMT_RGBA ? VBN_PIX_RGBA : VBN_PIX_RGB);
+ bytestream2_put_le32u(pb, 0); // mipmaps
+ bytestream2_put_le32u(pb, pkt_size - VBN_HEADER_SIZE);
bytestream2_seek_p(pb, 64, SEEK_SET);
- bytestream2_put_le32(pb, pkt_size - VBN_HEADER_SIZE);
+ bytestream2_put_le32u(pb, pkt_size - VBN_HEADER_SIZE);
if (ctx->format == VBN_FORMAT_DXT1 || ctx->format == VBN_FORMAT_DXT5) {
ctx->enc.frame_data.in = (frame->height - 1) * frame->linesize[0] + frame->data[0];
--
2.32.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 8+ messages in thread* [FFmpeg-devel] [PATCH 4/5] avcodec/vbnenc: Add AV_CODEC_CAP_DR1
2022-04-12 19:23 [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Andreas Rheinhardt
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 2/5] avcodec/vbn(dec|enc): Avoid leaving stale pointers in context Andreas Rheinhardt
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 3/5] avcodec/vbn(dec|enc): Avoid always-false checks Andreas Rheinhardt
@ 2022-04-12 19:25 ` Andreas Rheinhardt
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 5/5] avcodec/mss12: Constify slice context->parent context pointer Andreas Rheinhardt
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Andreas Rheinhardt @ 2022-04-12 19:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
This encoder uses ff_get_encode_buffer().
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/vbnenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c
index ec04566a32..de35a44d3f 100644
--- a/libavcodec/vbnenc.c
+++ b/libavcodec/vbnenc.c
@@ -153,7 +153,7 @@ const FFCodec ff_vbn_encoder = {
.p.long_name = NULL_IF_CONFIG_SMALL("Vizrt Binary Image"),
.p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_VBN,
- .p.capabilities = AV_CODEC_CAP_SLICE_THREADS,
+ .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
.p.priv_class = &vbnenc_class,
.init = vbn_init,
FF_CODEC_ENCODE_CB(vbn_encode),
--
2.32.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 8+ messages in thread* [FFmpeg-devel] [PATCH 5/5] avcodec/mss12: Constify slice context->parent context pointer
2022-04-12 19:23 [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Andreas Rheinhardt
` (2 preceding siblings ...)
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 4/5] avcodec/vbnenc: Add AV_CODEC_CAP_DR1 Andreas Rheinhardt
@ 2022-04-12 19:25 ` Andreas Rheinhardt
2022-04-12 19:29 ` Paul B Mahol
2022-04-12 19:27 ` [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Paul B Mahol
2022-04-12 22:08 ` Marton Balint
5 siblings, 1 reply; 8+ messages in thread
From: Andreas Rheinhardt @ 2022-04-12 19:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/mss12.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h
index 6f68fc3db6..27aa2d56b1 100644
--- a/libavcodec/mss12.h
+++ b/libavcodec/mss12.h
@@ -68,7 +68,7 @@ typedef struct PixContext {
struct MSS12Context;
typedef struct SliceContext {
- struct MSS12Context *c;
+ const struct MSS12Context *c;
Model intra_region, inter_region;
Model pivot, edge_mode, split_mode;
PixContext intra_pix_ctx, inter_pix_ctx;
--
2.32.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function
2022-04-12 19:23 [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Andreas Rheinhardt
` (3 preceding siblings ...)
2022-04-12 19:25 ` [FFmpeg-devel] [PATCH 5/5] avcodec/mss12: Constify slice context->parent context pointer Andreas Rheinhardt
@ 2022-04-12 19:27 ` Paul B Mahol
2022-04-12 22:08 ` Marton Balint
5 siblings, 0 replies; 8+ messages in thread
From: Paul B Mahol @ 2022-04-12 19:27 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Andreas Rheinhardt
lgtm
_______________________________________________
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".
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function
2022-04-12 19:23 [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Andreas Rheinhardt
` (4 preceding siblings ...)
2022-04-12 19:27 ` [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function Paul B Mahol
@ 2022-04-12 22:08 ` Marton Balint
5 siblings, 0 replies; 8+ messages in thread
From: Marton Balint @ 2022-04-12 22:08 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Tue, 12 Apr 2022, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavcodec/vbndec.c | 6 ------
> libavcodec/vbnenc.c | 6 ------
> 2 files changed, 12 deletions(-)
Thanks, all the VBN patches in this series LGTM.
Regards,
Marton
>
> diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c
> index d6f8121e12..916421925d 100644
> --- a/libavcodec/vbndec.c
> +++ b/libavcodec/vbndec.c
> @@ -176,11 +176,6 @@ out:
> return ret;
> }
>
> -static av_cold int vbn_close(AVCodecContext *avctx)
> -{
> - return 0;
> -}
> -
> const FFCodec ff_vbn_decoder = {
> .p.name = "vbn",
> .p.long_name = NULL_IF_CONFIG_SMALL("Vizrt Binary Image"),
> @@ -188,7 +183,6 @@ const FFCodec ff_vbn_decoder = {
> .p.id = AV_CODEC_ID_VBN,
> .init = vbn_init,
> FF_CODEC_DECODE_CB(vbn_decode_frame),
> - .close = vbn_close,
> .priv_data_size = sizeof(VBNContext),
> .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
> .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE
> diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c
> index 5c855bcd73..0b2c4dced2 100644
> --- a/libavcodec/vbnenc.c
> +++ b/libavcodec/vbnenc.c
> @@ -132,11 +132,6 @@ static av_cold int vbn_init(AVCodecContext *avctx)
> return 0;
> }
>
> -static av_cold int vbn_close(AVCodecContext *avctx)
> -{
> - return 0;
> -}
> -
> #define OFFSET(x) offsetof(VBNContext, x)
> #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
> static const AVOption options[] = {
> @@ -163,7 +158,6 @@ const FFCodec ff_vbn_encoder = {
> .p.priv_class = &vbnenc_class,
> .init = vbn_init,
> FF_CODEC_ENCODE_CB(vbn_encode),
> - .close = vbn_close,
> .priv_data_size = sizeof(VBNContext),
> .p.pix_fmts = (const enum AVPixelFormat[]) {
> AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE,
> --
> 2.32.0
>
> _______________________________________________
> 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".
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 8+ messages in thread