[FFmpeg-cvslog] r23720 - in trunk/libavcodec: Makefile aacps.c aacps.h aacps_tablegen.c aacps_tablegen.h aacpsdata.c aacsbr.c ps.c ps.h ps_tablegen.c ps_tablegen.h psdata.c sbr.h

[alexc]

Author: alexc
Date: Tue Jun 22 21:29:03 2010
New Revision: 23720

Log:
Move Parametric Stereo related ps* files to aacps*.

Added:
   trunk/libavcodec/aacps.c
      - copied, changed from r23712, trunk/libavcodec/ps.c
   trunk/libavcodec/aacps.h
      - copied unchanged from r23711, trunk/libavcodec/ps.h
   trunk/libavcodec/aacps_tablegen.c
      - copied, changed from r23711, trunk/libavcodec/ps_tablegen.c
   trunk/libavcodec/aacps_tablegen.h
      - copied, changed from r23711, trunk/libavcodec/ps_tablegen.h
   trunk/libavcodec/aacpsdata.c
      - copied unchanged from r23711, trunk/libavcodec/psdata.c
Deleted:
   trunk/libavcodec/ps.c
   trunk/libavcodec/ps.h
   trunk/libavcodec/ps_tablegen.c
   trunk/libavcodec/ps_tablegen.h
   trunk/libavcodec/psdata.c
Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/aacsbr.c
   trunk/libavcodec/sbr.h

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Tue Jun 22 21:24:09 2010	(r23719)
+++ trunk/libavcodec/Makefile	Tue Jun 22 21:29:03 2010	(r23720)
@@ -42,7 +42,7 @@ OBJS-$(CONFIG_VAAPI)                   +
 OBJS-$(CONFIG_VDPAU)                   += vdpau.o
 
 # 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    \
                                           aacpsy.o aactab.o      \
                                           psymodel.o iirfilter.o \
@@ -668,6 +668,6 @@ $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegau
 $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_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
 endif

Copied and modified: trunk/libavcodec/aacps.c (from r23712, trunk/libavcodec/ps.c)
==============================================================================
--- trunk/libavcodec/ps.c	Tue Jun 22 21:06:35 2010	(r23712, copy source)
+++ trunk/libavcodec/aacps.c	Tue Jun 22 21:29:03 2010	(r23720)
@@ -24,9 +24,9 @@
 #include "libavutil/mathematics.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "ps.h"
-#include "ps_tablegen.h"
-#include "psdata.c"
+#include "aacps.h"
+#include "aacps_tablegen.h"
+#include "aacpsdata.c"
 
 #define PS_BASELINE 0  //< Operate in Baseline PS mode
                        //< Baseline implies 10 or 20 stereo bands,

Copied and modified: trunk/libavcodec/aacps_tablegen.c (from r23711, trunk/libavcodec/ps_tablegen.c)
==============================================================================
--- trunk/libavcodec/ps_tablegen.c	Tue Jun 22 17:02:09 2010	(r23711, copy source)
+++ trunk/libavcodec/aacps_tablegen.c	Tue Jun 22 21:29:03 2010	(r23720)
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 #define CONFIG_HARDCODED_TABLES 0
-#include "ps_tablegen.h"
+#include "aacps_tablegen.h"
 #include "tableprint.h"
 
 void write_float_3d_array (const void *p, int b, int c, int d)

Copied and modified: trunk/libavcodec/aacps_tablegen.h (from r23711, trunk/libavcodec/ps_tablegen.h)
==============================================================================
--- trunk/libavcodec/ps_tablegen.h	Tue Jun 22 17:02:09 2010	(r23711, copy source)
+++ trunk/libavcodec/aacps_tablegen.h	Tue Jun 22 21:29:03 2010	(r23720)
@@ -20,14 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PS_TABLEGEN_H
-#define PS_TABLEGEN_H
+#ifndef AACPS_TABLEGEN_H
+#define AACPS_TABLEGEN_H
 
 #include <stdint.h>
 
 #if CONFIG_HARDCODED_TABLES
 #define ps_tableinit()
-#include "libavcodec/ps_tables.h"
+#include "libavcodec/aacps_tables.h"
 #else
 #include "../libavutil/common.h"
 #include "../libavutil/mathematics.h"
@@ -209,4 +209,4 @@ static void ps_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* PS_TABLEGEN_H */
+#endif /* AACPS_TABLEGEN_H */

Modified: trunk/libavcodec/aacsbr.c
==============================================================================
--- trunk/libavcodec/aacsbr.c	Tue Jun 22 21:24:09 2010	(r23719)
+++ trunk/libavcodec/aacsbr.c	Tue Jun 22 21:29:03 2010	(r23720)
@@ -31,7 +31,7 @@
 #include "aacsbr.h"
 #include "aacsbrdata.h"
 #include "fft.h"
-#include "ps.h"
+#include "aacps.h"
 
 #include <stdint.h>
 #include <float.h>

Modified: trunk/libavcodec/sbr.h
==============================================================================
--- trunk/libavcodec/sbr.h	Tue Jun 22 21:24:09 2010	(r23719)
+++ trunk/libavcodec/sbr.h	Tue Jun 22 21:29:03 2010	(r23720)
@@ -31,7 +31,7 @@
 
 #include <stdint.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.