virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Move Parametric Stereo related ps* files to aacps*.

Browse Source 
Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-06-22 19:29:03 +00:00
parent 3b636f21da
commit fd6eb4a06c
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/Makefile
View File

@ -42,7 +42,7 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o
OBJS-$(CONFIG_VDPAU) += vdpau.o OBJS-$(CONFIG_VDPAU) += vdpau.o
# decoders/encoders/hardware accelerators # decoders/encoders/hardware accelerators
OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o ps.o OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
aacpsy.o aactab.o \ aacpsy.o aactab.o \
psymodel.o iirfilter.o \ psymodel.o iirfilter.o \
@ -668,6 +668,6 @@ $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
$(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
$(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
$(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h
$(SUBDIR)ps.o: $(SUBDIR)ps_tables.h $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
$(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
endif endif

6
libavcodec/ps.c → libavcodec/aacps.c
View File

@ -24,9 +24,9 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "ps.h" #include "aacps.h"
#include "ps_tablegen.h" #include "aacps_tablegen.h"
#include "psdata.c" #include "aacpsdata.c"
#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,

0
libavcodec/ps.h → libavcodec/aacps.h
View File

2
libavcodec/ps_tablegen.c → libavcodec/aacps_tablegen.c
View File

@ -22,7 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#define CONFIG_HARDCODED_TABLES 0 #define CONFIG_HARDCODED_TABLES 0
#include "ps_tablegen.h" #include "aacps_tablegen.h"
#include "tableprint.h" #include "tableprint.h"
void write_float_3d_array (const void *p, int b, int c, int d) void write_float_3d_array (const void *p, int b, int c, int d)

8
libavcodec/ps_tablegen.h → libavcodec/aacps_tablegen.h
View File

@ -20,14 +20,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PS_TABLEGEN_H #ifndef AACPS_TABLEGEN_H
#define PS_TABLEGEN_H #define AACPS_TABLEGEN_H
#include <stdint.h> #include <stdint.h>
#if CONFIG_HARDCODED_TABLES #if CONFIG_HARDCODED_TABLES
#define ps_tableinit() #define ps_tableinit()
#include "libavcodec/ps_tables.h" #include "libavcodec/aacps_tables.h"
#else #else
#include "../libavutil/common.h" #include "../libavutil/common.h"
#include "../libavutil/mathematics.h" #include "../libavutil/mathematics.h"
@ -209,4 +209,4 @@ static void ps_tableinit(void)
} }
#endif /* CONFIG_HARDCODED_TABLES */ #endif /* CONFIG_HARDCODED_TABLES */
#endif /* PS_TABLEGEN_H */ #endif /* AACPS_TABLEGEN_H */

0
libavcodec/psdata.c → libavcodec/aacpsdata.c
View File

2
libavcodec/aacsbr.c
View File

@ -31,7 +31,7 @@
#include "aacsbr.h" #include "aacsbr.h"
#include "aacsbrdata.h" #include "aacsbrdata.h"
#include "fft.h" #include "fft.h"
#include "ps.h" #include "aacps.h"
#include <stdint.h> #include <stdint.h>
#include <float.h> #include <float.h>

2
libavcodec/sbr.h
View File

@ -31,7 +31,7 @@
#include <stdint.h> #include <stdint.h>
#include "fft.h" #include "fft.h"
#include "ps.h" #include "aacps.h"
/** /**
* Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header.