Re: [FFmpeg-devel] [PATCH 06/12] libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [2/3]
On Tue, Jun 30, 2015 at 11:53:08AM +0200, Nedeljko Babic wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Create tables for fixed point code. Can you make the first line of the commit messages a bit more informative when looking at it with git log --oneline they would all be nearly identical and one wouldnt know which is doing what Ok. I'll make changes in the new patch set. -Nedeljko ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 06/12] libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [2/3]
On Tue, Jun 30, 2015 at 11:53:08AM +0200, Nedeljko Babic wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Create tables for fixed point code. Can you make the first line of the commit messages a bit more informative when looking at it with git log --oneline they would all be nearly identical and one wouldnt know which is doing what [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Democracy is the form of government in which you can choose your dictator signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 06/12] libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [2/3]
From: Jovan Zelincevic jovan.zelince...@imgtec.com
Create tables for fixed point code.
Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com
---
libavcodec/Makefile| 5 +-
.../{aacsbr_tablegen.c = aacsbr_fixed_tablegen.c} | 7 +-
.../{aacsbr_tablegen.c = aacsbr_fixed_tablegen.h} | 21 +-
libavcodec/aacsbr_tablegen.c | 1 +
libavcodec/aacsbr_tablegen.h | 101 +---
libavcodec/aacsbr_tablegen_common.h| 129 +
libavcodec/aacsbrdata.h| 522 ++---
7 files changed, 408 insertions(+), 378 deletions(-)
copy libavcodec/{aacsbr_tablegen.c = aacsbr_fixed_tablegen.c} (84%)
copy libavcodec/{aacsbr_tablegen.c = aacsbr_fixed_tablegen.h} (71%)
create mode 100644 libavcodec/aacsbr_tablegen_common.h
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5cd06e7..642da3d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -922,6 +922,7 @@ TOOLS = fourcc2pixfmt
HOSTPROGS = aac_tablegen\
aacps_tablegen \
aacsbr_tablegen \
+aacsbr_fixed_tablegen \
cabac_tablegen \
cbrt_tablegen \
cbrt_fixed_tablegen \
@@ -952,7 +953,8 @@ else
$(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0
endif
-GEN_HEADERS = cabac_tables.h cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h
aacsbr_tables.h aac_tables.h dsd_tables.h dv_tables.h \
+GEN_HEADERS = cabac_tables.h cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h
aacsbr_tables.h \
+ aacsbr_fixed_tables.h aac_tables.h dsd_tables.h dv_tables.h \
sinewin_tables.h sinewin_fixed_tables.h mpegaudio_tables.h
motionpixels_tables.h \
pcm_tables.h qdm2_tables.h
GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS))
@@ -965,6 +967,7 @@ $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
$(SUBDIR)aacdec_fixed.o: $(SUBDIR)cbrt_fixed_tables.h
$(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
$(SUBDIR)aacsbr.o: $(SUBDIR)aacsbr_tables.h
+$(SUBDIR)aacsbr_fixed.o: $(SUBDIR)aacsbr_fixed_tables.h
$(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
$(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h
$(SUBDIR)cabac.o: $(SUBDIR)cabac_tables.h
diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.c
similarity index 84%
copy from libavcodec/aacsbr_tablegen.c
copy to libavcodec/aacsbr_fixed_tablegen.c
index c3c0f0c..7117dbd 100644
--- a/libavcodec/aacsbr_tablegen.c
+++ b/libavcodec/aacsbr_fixed_tablegen.c
@@ -22,8 +22,9 @@
#include stdlib.h
#define CONFIG_HARDCODED_TABLES 0
+#define USE_FIXED 1
#include libavutil/common.h
-#include aacsbr_tablegen.h
+#include aacsbr_fixed_tablegen.h
#include tableprint.h
int main(void)
@@ -32,8 +33,8 @@ int main(void)
write_fileheader();
-WRITE_ARRAY_ALIGNED(static const, 32, float, sbr_qmf_window_ds);
-WRITE_ARRAY_ALIGNED(static const, 32, float, sbr_qmf_window_us);
+WRITE_ARRAY_ALIGNED(static const, 32, int32_t, sbr_qmf_window_ds);
+WRITE_ARRAY_ALIGNED(static const, 32, int32_t, sbr_qmf_window_us);
return 0;
}
diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.h
similarity index 71%
copy from libavcodec/aacsbr_tablegen.c
copy to libavcodec/aacsbr_fixed_tablegen.h
index c3c0f0c..1439ebe 100644
--- a/libavcodec/aacsbr_tablegen.c
+++ b/libavcodec/aacsbr_fixed_tablegen.h
@@ -20,20 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include stdlib.h
-#define CONFIG_HARDCODED_TABLES 0
-#include libavutil/common.h
-#include aacsbr_tablegen.h
-#include tableprint.h
+#ifndef AVCODEC_AACSBR_FIXED_TABLEGEN_H
+#define AVCODEC_AACSBR_FIXED_TABLEGEN_H
-int main(void)
-{
-aacsbr_tableinit();
+#include aacsbr_tablegen_common.h
-write_fileheader();
+#if CONFIG_HARDCODED_TABLES
+#include libavcodec/aacsbr_fixed_tables.h
+#endif /* CONFIG_HARDCODED_TABLES */
-WRITE_ARRAY_ALIGNED(static const, 32, float, sbr_qmf_window_ds);
-WRITE_ARRAY_ALIGNED(static const, 32, float, sbr_qmf_window_us);
-
-return 0;
-}
+#endif /* AVCODEC_AACSBR_FIXED_TABLEGEN_H */
diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_tablegen.c
index c3c0f0c..4f58270 100644
--- a/libavcodec/aacsbr_tablegen.c
+++ b/libavcodec/aacsbr_tablegen.c
@@ -22,6 +22,7 @@
#include stdlib.h
#define CONFIG_HARDCODED_TABLES 0
+#define USE_FIXED 0
#include libavutil/common.h
#include aacsbr_tablegen.h
#include tableprint.h
diff --git a/libavcodec/aacsbr_tablegen.h b/libavcodec/aacsbr_tablegen.h
index 56fdccc..d86eba7 100644
--- a/libavcodec/aacsbr_tablegen.h
+++
[FFmpeg-devel] [PATCH 06/12] libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [2/3]
From: Jovan Zelincevic jovan.zelince...@imgtec.com
Create tables for fixed point code.
Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com
---
libavcodec/Makefile | 5 +-
libavcodec/aacsbr_fixed_tablegen.c | 40 +++
libavcodec/aacsbr_fixed_tablegen.h | 32 +++
libavcodec/aacsbr_tablegen.c| 1 +
libavcodec/aacsbr_tablegen.h| 101 +--
libavcodec/aacsbr_tablegen_common.h | 129 +
libavcodec/aacsbrdata.h | 522 ++--
7 files changed, 469 insertions(+), 361 deletions(-)
create mode 100644 libavcodec/aacsbr_fixed_tablegen.c
create mode 100644 libavcodec/aacsbr_fixed_tablegen.h
create mode 100644 libavcodec/aacsbr_tablegen_common.h
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 36d93ee..70e16e5 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -916,6 +916,7 @@ TOOLS = fourcc2pixfmt
HOSTPROGS = aac_tablegen\
aacps_tablegen \
aacsbr_tablegen \
+aacsbr_fixed_tablegen \
cabac_tablegen \
cbrt_tablegen \
cbrt_fixed_tablegen \
@@ -946,7 +947,8 @@ else
$(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0
endif
-GEN_HEADERS = cabac_tables.h cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h
aacsbr_tables.h aac_tables.h dsd_tables.h dv_tables.h \
+GEN_HEADERS = cabac_tables.h cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h
aacsbr_tables.h \
+ aacsbr_fixed_tables.h aac_tables.h dsd_tables.h dv_tables.h \
sinewin_tables.h sinewin_fixed_tables.h mpegaudio_tables.h
motionpixels_tables.h \
pcm_tables.h qdm2_tables.h
GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS))
@@ -959,6 +961,7 @@ $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
$(SUBDIR)aacdec_fixed.o: $(SUBDIR)cbrt_fixed_tables.h
$(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
$(SUBDIR)aacsbr.o: $(SUBDIR)aacsbr_tables.h
+$(SUBDIR)aacsbr_fixed.o: $(SUBDIR)aacsbr_fixed_tables.h
$(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
$(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h
$(SUBDIR)cabac.o: $(SUBDIR)cabac_tables.h
diff --git a/libavcodec/aacsbr_fixed_tablegen.c
b/libavcodec/aacsbr_fixed_tablegen.c
new file mode 100644
index 000..7117dbd
--- /dev/null
+++ b/libavcodec/aacsbr_fixed_tablegen.c
@@ -0,0 +1,40 @@
+/*
+ * Header file for hardcoded AAC SBR windows
+ *
+ * Copyright (c) 2014 Reimar Döffinger reimar.doeffin...@gmx.de
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include stdlib.h
+#define CONFIG_HARDCODED_TABLES 0
+#define USE_FIXED 1
+#include libavutil/common.h
+#include aacsbr_fixed_tablegen.h
+#include tableprint.h
+
+int main(void)
+{
+aacsbr_tableinit();
+
+write_fileheader();
+
+WRITE_ARRAY_ALIGNED(static const, 32, int32_t, sbr_qmf_window_ds);
+WRITE_ARRAY_ALIGNED(static const, 32, int32_t, sbr_qmf_window_us);
+
+return 0;
+}
diff --git a/libavcodec/aacsbr_fixed_tablegen.h
b/libavcodec/aacsbr_fixed_tablegen.h
new file mode 100644
index 000..1439ebe
--- /dev/null
+++ b/libavcodec/aacsbr_fixed_tablegen.h
@@ -0,0 +1,32 @@
+/*
+ * Header file for hardcoded AAC SBR windows
+ *
+ * Copyright (c) 2014 Reimar Döffinger reimar.doeffin...@gmx.de
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation,
