RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 20:37:04 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/lagarith: Use void* instead of AVCodecContext* as logctx

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-28 21:48:04 +02:00
parent 08dd036b9f
commit 3ea73bc78a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/lagarith.c
View File

@ -166,17 +166,17 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
/* Read probabilities from bitstream */ /* Read probabilities from bitstream */
for (i = 1; i < 257; i++) { for (i = 1; i < 257; i++) {
if (lag_decode_prob(gb, &rac->prob[i]) < 0) { if (lag_decode_prob(gb, &rac->prob[i]) < 0) {
av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability encountered.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if ((uint64_t)cumul_prob + rac->prob[i] > UINT_MAX) { if ((uint64_t)cumul_prob + rac->prob[i] > UINT_MAX) {
av_log(rac->avctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); av_log(rac->logctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
cumul_prob += rac->prob[i]; cumul_prob += rac->prob[i];
if (!rac->prob[i]) { if (!rac->prob[i]) {
if (lag_decode_prob(gb, &prob)) { if (lag_decode_prob(gb, &prob)) {
av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability run encountered.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (prob > 256 - i) if (prob > 256 - i)
@ -189,7 +189,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
} }
if (!cumul_prob) { if (!cumul_prob) {
av_log(rac->avctx, AV_LOG_ERROR, "All probabilities are 0!\n"); av_log(rac->logctx, AV_LOG_ERROR, "All probabilities are 0!\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -207,7 +207,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
scaled_cumul_prob += rac->prob[i]; scaled_cumul_prob += rac->prob[i];
} }
if (scaled_cumul_prob <= 0) { if (scaled_cumul_prob <= 0) {
av_log(rac->avctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for (; i < 257; i++) { for (; i < 257; i++) {
@ -221,7 +221,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
cumulative_target = 1U << scale_factor; cumulative_target = 1U << scale_factor;
if (scaled_cumul_prob > cumulative_target) { if (scaled_cumul_prob > cumulative_target) {
av_log(rac->avctx, AV_LOG_ERROR, av_log(rac->logctx, AV_LOG_ERROR,
"Scaled probabilities are larger than target!\n"); "Scaled probabilities are larger than target!\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -463,7 +463,7 @@ static int lag_decode_arith_plane(LagarithContext *l, uint8_t *dst,
const uint8_t *src_end = src + src_size; const uint8_t *src_end = src + src_size;
int ret; int ret;
rac.avctx = l->avctx; rac.logctx = l->avctx;
l->zeros = 0; l->zeros = 0;
if(src_size < 2) if(src_size < 2)

3
libavcodec/lagarithrac.h
View File

@ -32,11 +32,10 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
typedef struct lag_rac { typedef struct lag_rac {
AVCodecContext *avctx; void *logctx;
unsigned low; unsigned low;
unsigned range; unsigned range;
unsigned scale; /**< Number of bits of precision in range. */ unsigned scale; /**< Number of bits of precision in range. */