virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avcodec/tta: fix minor code style issues

Browse Source
This commit is contained in:
Paul B Mahol
2023-08-16 20:03:42 +02:00
parent 8f7850a22e
commit 082133fc07
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/tta.c
View File

@ -211,7 +211,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
av_log(avctx, AV_LOG_DEBUG, "data_length: %d frame_length: %d last: %d total: %d\n", av_log(avctx, AV_LOG_DEBUG, "data_length: %d frame_length: %d last: %d total: %d\n",
s->data_length, s->frame_length, s->last_frame_length, total_frames); s->data_length, s->frame_length, s->last_frame_length, total_frames);
if(s->frame_length >= UINT_MAX / (s->channels * sizeof(int32_t))){ if (s->frame_length >= UINT_MAX / (s->channels * sizeof(int32_t))) {
av_log(avctx, AV_LOG_ERROR, "frame_length too large\n"); av_log(avctx, AV_LOG_ERROR, "frame_length too large\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -306,14 +306,14 @@ static int tta_decode_frame(AVCodecContext *avctx, AVFrame *frame,
rice->sum1 += value - (rice->sum1 >> 4); rice->sum1 += value - (rice->sum1 >> 4);
if (rice->k1 > 0 && rice->sum1 < ff_tta_shift_16[rice->k1]) if (rice->k1 > 0 && rice->sum1 < ff_tta_shift_16[rice->k1])
rice->k1--; rice->k1--;
else if(rice->sum1 > ff_tta_shift_16[rice->k1 + 1]) else if (rice->sum1 > ff_tta_shift_16[rice->k1 + 1])
rice->k1++; rice->k1++;
value += ff_tta_shift_1[rice->k0]; value += ff_tta_shift_1[rice->k0];
default: default:
rice->sum0 += value - (rice->sum0 >> 4); rice->sum0 += value - (rice->sum0 >> 4);
if (rice->k0 > 0 && rice->sum0 < ff_tta_shift_16[rice->k0]) if (rice->k0 > 0 && rice->sum0 < ff_tta_shift_16[rice->k0])
rice->k0--; rice->k0--;
else if(rice->sum0 > ff_tta_shift_16[rice->k0 + 1]) else if (rice->sum0 > ff_tta_shift_16[rice->k0 + 1])
rice->k0++; rice->k0++;
} }
@ -399,7 +399,8 @@ error:
return ret; return ret;
} }
static av_cold int tta_decode_close(AVCodecContext *avctx) { static av_cold int tta_decode_close(AVCodecContext *avctx)
{
TTAContext *s = avctx->priv_data; TTAContext *s = avctx->priv_data;
if (s->bps < 3) if (s->bps < 3)

3
libavcodec/ttadata.c
View File

@ -47,7 +47,8 @@ void ff_tta_rice_init(TTARice *c, uint32_t k0, uint32_t k1)
c->sum1 = ff_tta_shift_16[k1]; c->sum1 = ff_tta_shift_16[k1];
} }
void ff_tta_filter_init(TTAFilter *c, int32_t shift) { void ff_tta_filter_init(TTAFilter *c, int32_t shift)
{
memset(c, 0, sizeof(TTAFilter)); memset(c, 0, sizeof(TTAFilter));
c->shift = shift; c->shift = shift;
c->round = ff_tta_shift_1[shift-1]; c->round = ff_tta_shift_1[shift-1];

3
libavcodec/ttadsp.c
View File

@ -22,7 +22,8 @@
static void tta_filter_process_c(int32_t *qmi, int32_t *dx, int32_t *dl, static void tta_filter_process_c(int32_t *qmi, int32_t *dx, int32_t *dl,
int32_t *error, int32_t *in, int32_t shift, int32_t *error, int32_t *in, int32_t shift,
int32_t round) { int32_t round)
{
uint32_t *qm = qmi; uint32_t *qm = qmi;
if (*error < 0) { if (*error < 0) {