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

Merge commit '52730e0f867fe77b7d2353d8b44e92edb7079ca5'

Browse Source 
* commit '52730e0f867fe77b7d2353d8b44e92edb7079ca5':
  iir_filter: Change type of array stride parameters to ptrdiff_t

The merge also updates the MIPS code and drop the extra log.h include.

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-20 11:26:00 +01:00
commit 8316a0e08b
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/iirfilter.c
View File

@ -278,7 +278,8 @@ av_cold struct FFIIRFilterState *ff_iir_filter_init_state(int order)
void ff_iir_filter(const struct FFIIRFilterCoeffs *c, void ff_iir_filter(const struct FFIIRFilterCoeffs *c,
struct FFIIRFilterState *s, int size, struct FFIIRFilterState *s, int size,
const int16_t *src, int sstep, int16_t *dst, int dstep) const int16_t *src, ptrdiff_t sstep,
int16_t *dst, ptrdiff_t dstep)
{ {
if (c->order == 2) { if (c->order == 2) {
FILTER_O2(int16_t, S16) FILTER_O2(int16_t, S16)
@ -291,7 +292,8 @@ void ff_iir_filter(const struct FFIIRFilterCoeffs *c,
void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *c, void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *c,
struct FFIIRFilterState *s, int size, struct FFIIRFilterState *s, int size,
const float *src, int sstep, float *dst, int dstep) const float *src, ptrdiff_t sstep,
float *dst, ptrdiff_t dstep)
{ {
if (c->order == 2) { if (c->order == 2) {
FILTER_O2(float, FLT) FILTER_O2(float, FLT)

10
libavcodec/iirfilter.h
View File

@ -27,7 +27,8 @@
#ifndef AVCODEC_IIRFILTER_H #ifndef AVCODEC_IIRFILTER_H
#define AVCODEC_IIRFILTER_H #define AVCODEC_IIRFILTER_H
#include "avcodec.h" #include <stddef.h>
#include <stdint.h>
struct FFIIRFilterCoeffs; struct FFIIRFilterCoeffs;
struct FFIIRFilterState; struct FFIIRFilterState;
@ -61,7 +62,7 @@ typedef struct FFIIRFilterContext {
*/ */
void (*filter_flt)(const struct FFIIRFilterCoeffs *coeffs, void (*filter_flt)(const struct FFIIRFilterCoeffs *coeffs,
struct FFIIRFilterState *state, int size, struct FFIIRFilterState *state, int size,
const float *src, int sstep, float *dst, int dstep); const float *src, ptrdiff_t sstep, float *dst, ptrdiff_t dstep);
} FFIIRFilterContext; } FFIIRFilterContext;
/** /**
@ -125,7 +126,7 @@ void ff_iir_filter_free_statep(struct FFIIRFilterState **state);
* @param dstep destination stride * @param dstep destination stride
*/ */
void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state,
int size, const int16_t *src, int sstep, int16_t *dst, int dstep); int size, const int16_t *src, ptrdiff_t sstep, int16_t *dst, ptrdiff_t dstep);
/** /**
* Perform IIR filtering on floating-point input samples. * Perform IIR filtering on floating-point input samples.
@ -140,6 +141,7 @@ void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterSta
*/ */
void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *coeffs, void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *coeffs,
struct FFIIRFilterState *state, int size, struct FFIIRFilterState *state, int size,
const float *src, int sstep, float *dst, int dstep); const float *src, ptrdiff_t sstep,
float *dst, ptrdiff_t dstep);
#endif /* AVCODEC_IIRFILTER_H */ #endif /* AVCODEC_IIRFILTER_H */

8
libavcodec/mips/iirfilter_mips.c
View File

@ -67,9 +67,9 @@ typedef struct FFIIRFilterState {
float x[1]; float x[1];
} FFIIRFilterState; } FFIIRFilterState;
static void ff_iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c, static void iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c,
struct FFIIRFilterState *s, int size, struct FFIIRFilterState *s, int size,
const float *src, int sstep, float *dst, int dstep) const float *src, ptrdiff_t sstep, float *dst, ptrdiff_t dstep)
{ {
if (c->order == 2) { if (c->order == 2) {
int i; int i;
@ -202,7 +202,7 @@ static void ff_iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c,
void ff_iir_filter_init_mips(FFIIRFilterContext *f) { void ff_iir_filter_init_mips(FFIIRFilterContext *f) {
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
f->filter_flt = ff_iir_filter_flt_mips; f->filter_flt = iir_filter_flt_mips;
#endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */ #endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
} }