Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
218aefce
Commit
218aefce
authored
Feb 07, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dsputil: Move LOCAL_ALIGNED macros to libavutil
parent
059866eb
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
47 additions
and
35 deletions
+47
-35
aacps.c
libavcodec/aacps.c
+1
-1
aacsbr.c
libavcodec/aacsbr.c
+1
-0
ac3enc.c
libavcodec/ac3enc.c
+1
-1
ac3enc_template.c
libavcodec/ac3enc_template.c
+1
-0
bink.c
libavcodec/bink.c
+1
-0
dcadec.c
libavcodec/dcadec.c
+1
-1
dnxhdenc.c
libavcodec/dnxhdenc.c
+1
-0
dsputil.c
libavcodec/dsputil.c
+1
-0
dsputil.h
libavcodec/dsputil.h
+0
-26
dv.c
libavcodec/dv.c
+1
-0
dvdec.c
libavcodec/dvdec.c
+1
-1
h264_loopfilter.c
libavcodec/h264_loopfilter.c
+1
-1
imc.c
libavcodec/imc.c
+1
-0
ituh263dec.c
libavcodec/ituh263dec.c
+1
-0
mpc7.c
libavcodec/mpc7.c
+1
-0
mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+1
-0
mpegvideo_motion.c
libavcodec/mpegvideo_motion.c
+2
-0
mpegaudiodec_altivec.c
libavcodec/ppc/mpegaudiodec_altivec.c
+1
-1
ra288.c
libavcodec/ra288.c
+1
-0
rv34.c
libavcodec/rv34.c
+0
-1
simple_idct.c
libavcodec/simple_idct.c
+0
-1
takdec.c
libavcodec/takdec.c
+1
-0
mpegaudiodec.c
libavcodec/x86/mpegaudiodec.c
+1
-1
internal.h
libavutil/internal.h
+26
-0
No files found.
libavcodec/aacps.c
View file @
218aefce
...
@@ -21,13 +21,13 @@
...
@@ -21,13 +21,13 @@
#include <stdint.h>
#include <stdint.h>
#include "libavutil/common.h"
#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/mathematics.h"
#include "libavutil/mathematics.h"
#include "avcodec.h"
#include "avcodec.h"
#include "get_bits.h"
#include "get_bits.h"
#include "aacps.h"
#include "aacps.h"
#include "aacps_tablegen.h"
#include "aacps_tablegen.h"
#include "aacpsdata.c"
#include "aacpsdata.c"
#include "dsputil.h"
#define PS_BASELINE 0 ///< Operate in Baseline PS mode
#define PS_BASELINE 0 ///< Operate in Baseline PS mode
///< Baseline implies 10 or 20 stereo bands,
///< Baseline implies 10 or 20 stereo bands,
...
...
libavcodec/aacsbr.c
View file @
218aefce
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
#include "fft.h"
#include "fft.h"
#include "aacps.h"
#include "aacps.h"
#include "sbrdsp.h"
#include "sbrdsp.h"
#include "libavutil/internal.h"
#include "libavutil/libm.h"
#include "libavutil/libm.h"
#include <stdint.h>
#include <stdint.h>
...
...
libavcodec/ac3enc.c
View file @
218aefce
...
@@ -34,10 +34,10 @@
...
@@ -34,10 +34,10 @@
#include "libavutil/avstring.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/crc.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "avcodec.h"
#include "put_bits.h"
#include "put_bits.h"
#include "dsputil.h"
#include "ac3dsp.h"
#include "ac3dsp.h"
#include "ac3.h"
#include "ac3.h"
#include "fft.h"
#include "fft.h"
...
...
libavcodec/ac3enc_template.c
View file @
218aefce
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#include <stdint.h>
#include <stdint.h>
#include "libavutil/internal.h"
/* prototypes for static functions in ac3enc_fixed.c and ac3enc_float.c */
/* prototypes for static functions in ac3enc_fixed.c and ac3enc_float.c */
...
...
libavcodec/bink.c
View file @
218aefce
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
*/
*/
#include "libavutil/imgutils.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "dsputil.h"
#include "binkdata.h"
#include "binkdata.h"
...
...
libavcodec/dcadec.c
View file @
218aefce
...
@@ -29,12 +29,12 @@
...
@@ -29,12 +29,12 @@
#include "libavutil/channel_layout.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "libavutil/intmath.h"
#include "libavutil/intmath.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
#include "libavutil/mathematics.h"
#include "libavutil/samplefmt.h"
#include "libavutil/samplefmt.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "fft.h"
#include "fft.h"
#include "get_bits.h"
#include "get_bits.h"
#include "put_bits.h"
#include "put_bits.h"
...
...
libavcodec/dnxhdenc.c
View file @
218aefce
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
//#define DEBUG
//#define DEBUG
#define RC_VARIANCE 1 // use variance or ssd for fast rc
#define RC_VARIANCE 1 // use variance or ssd for fast rc
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "dsputil.h"
...
...
libavcodec/dsputil.c
View file @
218aefce
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
*/
*/
#include "libavutil/imgutils.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "avcodec.h"
#include "avcodec.h"
#include "copy_block.h"
#include "copy_block.h"
#include "dsputil.h"
#include "dsputil.h"
...
...
libavcodec/dsputil.h
View file @
218aefce
...
@@ -417,30 +417,4 @@ void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
...
@@ -417,30 +417,4 @@ void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
# define STRIDE_ALIGN 8
# define STRIDE_ALIGN 8
#endif
#endif
// Some broken preprocessors need a second expansion
// to be forced to tokenize __VA_ARGS__
#define E(x) x
#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \
uint8_t la_##v[sizeof(t s o) + (a)]; \
t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \
DECLARE_ALIGNED(a, t, la_##v) s o; \
t (*v) o = la_##v
#define LOCAL_ALIGNED(a, t, v, ...) E(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,))
#if HAVE_LOCAL_ALIGNED_8
# define LOCAL_ALIGNED_8(t, v, ...) E(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
#else
# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__)
#endif
#if HAVE_LOCAL_ALIGNED_16
# define LOCAL_ALIGNED_16(t, v, ...) E(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
#else
# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__)
#endif
#endif
/* AVCODEC_DSPUTIL_H */
#endif
/* AVCODEC_DSPUTIL_H */
libavcodec/dv.c
View file @
218aefce
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
* DV codec.
* DV codec.
*/
*/
#include "libavutil/internal.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "dsputil.h"
...
...
libavcodec/dvdec.c
View file @
218aefce
...
@@ -35,9 +35,9 @@
...
@@ -35,9 +35,9 @@
* DV decoder
* DV decoder
*/
*/
#include "libavutil/internal.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "internal.h"
#include "internal.h"
#include "get_bits.h"
#include "get_bits.h"
#include "put_bits.h"
#include "put_bits.h"
...
...
libavcodec/h264_loopfilter.c
View file @
218aefce
...
@@ -25,9 +25,9 @@
...
@@ -25,9 +25,9 @@
* @author Michael Niedermayer <michaelni@gmx.at>
* @author Michael Niedermayer <michaelni@gmx.at>
*/
*/
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
#include "internal.h"
#include "internal.h"
#include "dsputil.h"
#include "avcodec.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "mpegvideo.h"
#include "h264.h"
#include "h264.h"
...
...
libavcodec/imc.c
View file @
218aefce
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
#include "libavutil/channel_layout.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "avcodec.h"
#include "avcodec.h"
#include "get_bits.h"
#include "get_bits.h"
#include "dsputil.h"
#include "dsputil.h"
...
...
libavcodec/ituh263dec.c
View file @
218aefce
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
//#define DEBUG
//#define DEBUG
#include <limits.h>
#include <limits.h>
#include "libavutil/internal.h"
#include "libavutil/mathematics.h"
#include "libavutil/mathematics.h"
#include "dsputil.h"
#include "dsputil.h"
#include "avcodec.h"
#include "avcodec.h"
...
...
libavcodec/mpc7.c
View file @
218aefce
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
*/
*/
#include "libavutil/channel_layout.h"
#include "libavutil/channel_layout.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h"
#include "libavutil/lfg.h"
#include "avcodec.h"
#include "avcodec.h"
#include "get_bits.h"
#include "get_bits.h"
...
...
libavcodec/mpegvideo_enc.c
View file @
218aefce
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
* The simplest mpeg encoder (well, it was the simplest!).
* The simplest mpeg encoder (well, it was the simplest!).
*/
*/
#include "libavutil/internal.h"
#include "libavutil/intmath.h"
#include "libavutil/intmath.h"
#include "libavutil/mathematics.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixdesc.h"
...
...
libavcodec/mpegvideo_motion.c
View file @
218aefce
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
*/
*/
#include <string.h>
#include <string.h>
#include "libavutil/internal.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "mpegvideo.h"
...
...
libavcodec/ppc/mpegaudiodec_altivec.c
View file @
218aefce
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
#include "dsputil_altivec.h"
#include "dsputil_altivec.h"
#include "libavutil/attributes.h"
#include "libavutil/attributes.h"
#include "libavutil/internal.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegaudiodsp.h"
#include "libavcodec/mpegaudiodsp.h"
#define MACS(rt, ra, rb) rt+=(ra)*(rb)
#define MACS(rt, ra, rb) rt+=(ra)*(rb)
...
...
libavcodec/ra288.c
View file @
218aefce
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include "libavutil/channel_layout.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "avcodec.h"
#include "avcodec.h"
#include "internal.h"
#include "internal.h"
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
...
...
libavcodec/rv34.c
View file @
218aefce
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
#include "libavutil/internal.h"
#include "libavutil/internal.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "mpegvideo.h"
#include "golomb.h"
#include "golomb.h"
#include "internal.h"
#include "internal.h"
...
...
libavcodec/simple_idct.c
View file @
218aefce
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "avcodec.h"
#include "dsputil.h"
#include "mathops.h"
#include "mathops.h"
#include "simple_idct.h"
#include "simple_idct.h"
...
...
libavcodec/takdec.c
View file @
218aefce
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
* @author Paul B Mahol
* @author Paul B Mahol
*/
*/
#include "libavutil/internal.h"
#include "libavutil/samplefmt.h"
#include "libavutil/samplefmt.h"
#include "tak.h"
#include "tak.h"
#include "avcodec.h"
#include "avcodec.h"
...
...
libavcodec/x86/mpegaudiodec.c
View file @
218aefce
...
@@ -21,9 +21,9 @@
...
@@ -21,9 +21,9 @@
#include "libavutil/attributes.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/cpu.h"
#include "libavutil/internal.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegaudiodsp.h"
#include "libavcodec/mpegaudiodsp.h"
void
ff_imdct36_float_sse
(
float
*
out
,
float
*
buf
,
float
*
in
,
float
*
win
);
void
ff_imdct36_float_sse
(
float
*
out
,
float
*
buf
,
float
*
in
,
float
*
win
);
...
...
libavutil/internal.h
View file @
218aefce
...
@@ -57,6 +57,32 @@
...
@@ -57,6 +57,32 @@
# define INT_BIT (CHAR_BIT * sizeof(int))
# define INT_BIT (CHAR_BIT * sizeof(int))
#endif
#endif
// Some broken preprocessors need a second expansion
// to be forced to tokenize __VA_ARGS__
#define E(x) x
#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \
uint8_t la_##v[sizeof(t s o) + (a)]; \
t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \
DECLARE_ALIGNED(a, t, la_##v) s o; \
t (*v) o = la_##v
#define LOCAL_ALIGNED(a, t, v, ...) E(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,))
#if HAVE_LOCAL_ALIGNED_8
# define LOCAL_ALIGNED_8(t, v, ...) E(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
#else
# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__)
#endif
#if HAVE_LOCAL_ALIGNED_16
# define LOCAL_ALIGNED_16(t, v, ...) E(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
#else
# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__)
#endif
#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\
#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\
{\
{\
p = av_malloc(size);\
p = av_malloc(size);\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment