[FFmpeg-devel] [PATCH 1/7] avcodec/dxvenc: Don't cast const away
Connor Worley
connorbworley at gmail.com
Wed Jan 24 22:49:25 EET 2024
Thanks for fixing this :)
Are you planning more work on the DXV side following this? I have a patch
to follow that replaces `decompress_texture_thread` with purely
texdsp calls (HQ BC4/BC5 textures can be decompressed with
`rgtc1u_gray_block`).
On Wed, Jan 24, 2024 at 11:49 AM Andreas Rheinhardt <
andreas.rheinhardt at outlook.com> wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> libavcodec/dxvenc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c
> index 3a5b310c9b..10473038cc 100644
> --- a/libavcodec/dxvenc.c
> +++ b/libavcodec/dxvenc.c
> @@ -56,7 +56,7 @@ static void ht_init(HTEntry *ht)
> }
> }
>
> -static uint32_t ht_lookup_and_upsert(HTEntry *ht, AVCRC *hash_ctx,
> +static uint32_t ht_lookup_and_upsert(HTEntry *ht, const AVCRC *hash_ctx,
> uint32_t key, uint32_t pos)
> {
> uint32_t ret = -1;
> @@ -74,7 +74,7 @@ static uint32_t ht_lookup_and_upsert(HTEntry *ht, AVCRC
> *hash_ctx,
> return ret;
> }
>
> -static void ht_delete(HTEntry *ht, AVCRC *hash_ctx,
> +static void ht_delete(HTEntry *ht, const AVCRC *hash_ctx,
> uint32_t key, uint32_t pos)
> {
> HTEntry *removed_entry = NULL;
> @@ -124,7 +124,7 @@ typedef struct DXVEncContext {
> enum DXVTextureFormat tex_fmt;
> int (*compress_tex)(AVCodecContext *avctx);
>
> - AVCRC *crc_ctx;
> + const AVCRC *crc_ctx;
>
> HTEntry color_lookback_ht[LOOKBACK_HT_ELEMS];
> HTEntry lut_lookback_ht[LOOKBACK_HT_ELEMS];
> @@ -309,7 +309,7 @@ static av_cold int dxv_init(AVCodecContext *avctx)
> return AVERROR(ENOMEM);
> }
>
> - ctx->crc_ctx = (AVCRC*)av_crc_get_table(AV_CRC_32_IEEE);
> + ctx->crc_ctx = av_crc_get_table(AV_CRC_32_IEEE);
> if (!ctx->crc_ctx) {
> av_log(avctx, AV_LOG_ERROR, "Could not initialize CRC table.\n");
> return AVERROR_BUG;
> --
> 2.34.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>
--
Connor Worley
More information about the ffmpeg-devel
mailing list