virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

qcelpdec: change asserts to av_asserts

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-26 18:32:27 +00:00
parent fdf9296df7
commit 1fa0284c57
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/qcelpdec.c
View File

@ -29,6 +29,7 @@
#include <stddef.h> #include <stddef.h>
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "avcodec.h" #include "avcodec.h"
@ -40,9 +41,6 @@
#include "acelp_vectors.h" #include "acelp_vectors.h"
#include "lsp.h" #include "lsp.h"
#undef NDEBUG
#include <assert.h>
typedef enum { typedef enum {
I_F_Q = -1, /**< insufficient frame quality */ I_F_Q = -1, /**< insufficient frame quality */
SILENCE, SILENCE,
@ -135,7 +133,7 @@ static int decode_lspf(QCELPContext *q, float *lspf)
} else { } else {
erasure_coeff = QCELP_LSP_OCTAVE_PREDICTOR; erasure_coeff = QCELP_LSP_OCTAVE_PREDICTOR;
assert(q->bitrate == I_F_Q); av_assert2(q->bitrate == I_F_Q);
if (q->erasure_count > 1) if (q->erasure_count > 1)
erasure_coeff *= q->erasure_count < 4 ? 0.9 : 0.7; erasure_coeff *= q->erasure_count < 4 ? 0.9 : 0.7;
@ -239,7 +237,7 @@ static void decode_gain_and_index(QCELPContext *q, float *gain)
av_clip((q->prev_g1[0] + q->prev_g1[1]) / 2 - 5, 0, 54); av_clip((q->prev_g1[0] + q->prev_g1[1]) / 2 - 5, 0, 54);
subframes_count = 8; subframes_count = 8;
} else { } else {
assert(q->bitrate == I_F_Q); av_assert2(q->bitrate == I_F_Q);
g1[0] = q->prev_g1[1]; g1[0] = q->prev_g1[1];
switch (q->erasure_count) { switch (q->erasure_count) {
@ -486,7 +484,7 @@ static void apply_pitch_filters(QCELPContext *q, float *cdn_vector)
else else
max_pitch_gain = 0.0; max_pitch_gain = 0.0;
} else { } else {
assert(q->bitrate == SILENCE); av_assert2(q->bitrate == SILENCE);
max_pitch_gain = 1.0; max_pitch_gain = 1.0;
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)