Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
On Tue, Jun 30, 2015 at 11:53:06AM +0200, Nedeljko Babic wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Build system modified There are several warnings occurring during build after this patch is applied. The cause of most of these warnings is in that some definitions needed here are logical part of sbr module and are added in later patches. When this patches are applied these warnings stop occurring. The only warning that is added here and is not fixed with later patches is warning that warns that type mismatch for table ff_aac_eld_window_480. The reason for this warning is in that ER AAC ELD 480 is not integrated in to the fixed point implementation at this moment and there is no fixed point version of this table. Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com --- configure | 1 + libavcodec/Makefile | 13 ++--- libavcodec/aacdec.c | 1 - libavcodec/aacdec_fixed.c | 1 - libavcodec/allcodecs.c| 1 + 5 files changed, 12 insertions(+), 5 deletions(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 3 Rare item - Common item with rare defect or maybe just a lie Professional - 'Toy' made in china, not functional except as doorstop Experts will know - The seller hopes you are not an expert signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
Cause for these warnings is similar as for the first ones: needed definitions are added in later patches (that make changes in sbr module). When all the patches are applied there are no warnings here. if it breaks nothing then temporary warnings are probably ok. Some people might argue about that though ... its probably a good idea to amend the commit message to explain the cause and future disappearance of the warnings Ok. I'll change commit message for this patch in new patch set. Thanks, Nedeljko ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
From: Jovan Zelincevic jovan.zelince...@imgtec.com Build system modified There are several warnings occurring during build after this patch is applied. The cause of most of these warnings is in that some definitions needed here are logical part of sbr module and are added in later patches. When this patches are applied these warnings stop occurring. The only warning that is added here and is not fixed with later patches is warning that warns that type mismatch for table ff_aac_eld_window_480. The reason for this warning is in that ER AAC ELD 480 is not integrated in to the fixed point implementation at this moment and there is no fixed point version of this table. Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com --- configure | 1 + libavcodec/Makefile | 13 ++--- libavcodec/aacdec.c | 1 - libavcodec/aacdec_fixed.c | 1 - libavcodec/allcodecs.c| 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 6c1c290..56ac6aa 100755 --- a/configure +++ b/configure @@ -2124,6 +2124,7 @@ qsvenc_select=qsv # decoders / encoders aac_decoder_select=imdct15 mdct sinewin +aac_fixed_decoder_select=mdct sinewin aac_encoder_select=audio_frame_queue iirfilter mdct sinewin aac_latm_decoder_select=aac_decoder aac_latm_parser ac3_decoder_select=ac3_parser ac3dsp bswapdsp fmtconvert mdct diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bcb9217..5cd06e7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -102,7 +102,7 @@ OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT)+= rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_SHARED) += log2_tab.o -OBJS-$(CONFIG_SINEWIN) += sinewin.o +OBJS-$(CONFIG_SINEWIN) += sinewin.o sinewin_fixed.o OBJS-$(CONFIG_SNAPPY) += snappy.o OBJS-$(CONFIG_STARTCODE) += startcode.o OBJS-$(CONFIG_TEXTUREDSP) += texturedsp.o @@ -119,6 +119,8 @@ OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \ aacadtsdec.o mpeg4audio.o kbdwin.o \ sbrdsp.o aacpsdsp.o +OBJS-$(CONFIG_AAC_FIXED_DECODER) += aacdec_fixed.o aactab.o \ + aacadtsdec.o mpeg4audio.o kbdwin.o OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o\ aacpsy.o aactab.o \ psymodel.o mpeg4audio.o kbdwin.o @@ -922,6 +924,7 @@ HOSTPROGS = aac_tablegen \ aacsbr_tablegen \ cabac_tablegen \ cbrt_tablegen \ +cbrt_fixed_tablegen \ cos_tablegen\ dsd_tablegen\ dv_tablegen \ @@ -930,6 +933,7 @@ HOSTPROGS = aac_tablegen \ pcm_tablegen\ qdm2_tablegen \ sinewin_tablegen\ +sinewin_fixed_tablegen \ CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF) @@ -948,8 +952,8 @@ else $(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0 endif -GEN_HEADERS = cabac_tables.h cbrt_tables.h aacps_tables.h aacsbr_tables.h aac_tables.h dsd_tables.h dv_tables.h \ - sinewin_tables.h mpegaudio_tables.h motionpixels_tables.h \ +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 \ + 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)) @@ -958,13 +962,16 @@ $(GEN_HEADERS): $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) ifdef CONFIG_HARDCODED_TABLES $(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)aactab.o: $(SUBDIR)aac_tables.h +$(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h $(SUBDIR)cabac.o: $(SUBDIR)cabac_tables.h $(SUBDIR)dsddec.o: $(SUBDIR)dsd_tables.h $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h $(SUBDIR)sinewin.o:
Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
From: Jovan Zelincevic jovan.zelincevic at imgtec.com Build system modified Signed-off-by: Nedeljko Babic nedeljko.babic at imgtec.com --- configure | 1 + libavcodec/Makefile | 13 ++--- libavcodec/aacdec.c | 1 - libavcodec/aacdec_fixed.c | 1 - libavcodec/allcodecs.c| 1 + 5 files changed, 12 insertions(+), 5 deletions(-) this adds some build warnings: In file included from libavcodec/aacdec_fixed.c:426:0: libavcodec/aacdec_template.c: In function ‘apply_tns’: libavcodec/aacdec_template.c:2360:13: warning: passing argument 1 of ‘compute_lpc_coefs’ from incompatible pointer type [enabled by default] libavcodec/lpc.h:155:19: note: expected ‘const float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c:2360:13: warning: passing argument 3 of ‘compute_lpc_coefs’ from incompatible pointer type [enabled by default] libavcodec/lpc.h:155:19: note: expected ‘float *’ but argument is of type ‘int *’ These warnings are added because this part of code logically belongs to sbr module and definitions of macros for types used here are added in later patches (for sbr module). When code is built with all the patches there are no warnings here. Is this a problem? libavcodec/aacdec_template.c: In function ‘imdct_and_windowing_ld’: libavcodec/aacdec_template.c:2570:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] This warning is due to me trying to simplify the code a little bit... I tried to avoid adding additional #if just for declaration of one variable so this declaration is in the code. libavcodec/aacdec_template.c: In function ‘imdct_and_windowing_eld’: libavcodec/aacdec_template.c:2599:64: warning: pointer type mismatch in conditional expression [enabled by default] As I mentioned earlier post, ER AAC ELD 480 added to float aac decoder a while ago is not integrated in to the fixed point implementation. This warning is here because there is no ff_aac_eld_window_480 table defined for fixed point implementation. I think that it should stay here as a remainder for additional work that needs to be done on fixed point aac. In file included from libavcodec/aacdec_fixed.c:426:0: libavcodec/aacdec_template.c: In function ‘spectral_to_sample’: libavcodec/aacdec_template.c:2739:25: warning: passing argument 4 of ‘ff_sbr_apply’ from incompatible pointer type [enabled by default] libavcodec/aacsbr.h:46:6: note: expected ‘float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c:2739:25: warning: passing argument 5 of ‘ff_sbr_apply’ from incompatible pointer type [enabled by default] libavcodec/aacsbr.h:46:6: note: expected ‘float *’ but argument is of type ‘int *’ Cause for these warnings is similar as for the first ones: needed definitions are added in later patches (that make changes in sbr module). When all the patches are applied there are no warnings here. Thanks, - Nedeljko ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
These are all the patches for implementing fixed point AAC decoder in ffmpeg for now. -Nedeljko Od: ffmpeg-devel-boun...@ffmpeg.org [ffmpeg-devel-boun...@ffmpeg.org] u ime korisnika Cary Tetrick [ctetri...@gmail.com] Poslato: 27. jun 2015 1:31 Za: FFmpeg development discussions and patches Tema: Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4] Are there any patches supporting Intel QSV encoding that will work with recent versions of ffmpeg on Windows? Thanks. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
On Mon, Jun 29, 2015 at 11:21:13AM +, Nedeljko Babic wrote: From: Jovan Zelincevic jovan.zelincevic at imgtec.com Build system modified Signed-off-by: Nedeljko Babic nedeljko.babic at imgtec.com --- configure | 1 + libavcodec/Makefile | 13 ++--- libavcodec/aacdec.c | 1 - libavcodec/aacdec_fixed.c | 1 - libavcodec/allcodecs.c| 1 + 5 files changed, 12 insertions(+), 5 deletions(-) this adds some build warnings: In file included from libavcodec/aacdec_fixed.c:426:0: libavcodec/aacdec_template.c: In function ‘apply_tns’: libavcodec/aacdec_template.c:2360:13: warning: passing argument 1 of ‘compute_lpc_coefs’ from incompatible pointer type [enabled by default] libavcodec/lpc.h:155:19: note: expected ‘const float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c:2360:13: warning: passing argument 3 of ‘compute_lpc_coefs’ from incompatible pointer type [enabled by default] libavcodec/lpc.h:155:19: note: expected ‘float *’ but argument is of type ‘int *’ These warnings are added because this part of code logically belongs to sbr module and definitions of macros for types used here are added in later patches (for sbr module). When code is built with all the patches there are no warnings here. Is this a problem? libavcodec/aacdec_template.c: In function ‘imdct_and_windowing_ld’: libavcodec/aacdec_template.c:2570:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] This warning is due to me trying to simplify the code a little bit... I tried to avoid adding additional #if just for declaration of one variable so this declaration is in the code. libavcodec/aacdec_template.c: In function ‘imdct_and_windowing_eld’: libavcodec/aacdec_template.c:2599:64: warning: pointer type mismatch in conditional expression [enabled by default] As I mentioned earlier post, ER AAC ELD 480 added to float aac decoder a while ago is not integrated in to the fixed point implementation. This warning is here because there is no ff_aac_eld_window_480 table defined for fixed point implementation. I think that it should stay here as a remainder for additional work that needs to be done on fixed point aac. In file included from libavcodec/aacdec_fixed.c:426:0: libavcodec/aacdec_template.c: In function ‘spectral_to_sample’: libavcodec/aacdec_template.c:2739:25: warning: passing argument 4 of ‘ff_sbr_apply’ from incompatible pointer type [enabled by default] libavcodec/aacsbr.h:46:6: note: expected ‘float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c:2739:25: warning: passing argument 5 of ‘ff_sbr_apply’ from incompatible pointer type [enabled by default] libavcodec/aacsbr.h:46:6: note: expected ‘float *’ but argument is of type ‘int *’ Cause for these warnings is similar as for the first ones: needed definitions are added in later patches (that make changes in sbr module). When all the patches are applied there are no warnings here. if it breaks nothing then temporary warnings are probably ok. Some people might argue about that though ... its probably a good idea to amend the commit message to explain the cause and future disappearance of the warnings [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No great genius has ever existed without some touch of madness. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
On Thu, Jun 11, 2015 at 04:08:49PM +0200, Nedeljko Babic wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Build system modified Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com --- configure | 1 + libavcodec/Makefile | 13 ++--- libavcodec/aacdec.c | 1 - libavcodec/aacdec_fixed.c | 1 - libavcodec/allcodecs.c| 1 + 5 files changed, 12 insertions(+), 5 deletions(-) this adds some build warnings: In file included from libavcodec/aacdec_fixed.c:426:0: libavcodec/aacdec_template.c: In function ‘apply_tns’: libavcodec/aacdec_template.c:2360:13: warning: passing argument 1 of ‘compute_lpc_coefs’ from incompatible pointer type [enabled by default] libavcodec/lpc.h:155:19: note: expected ‘const float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c:2360:13: warning: passing argument 3 of ‘compute_lpc_coefs’ from incompatible pointer type [enabled by default] libavcodec/lpc.h:155:19: note: expected ‘float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c: In function ‘imdct_and_windowing_ld’: libavcodec/aacdec_template.c:2570:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] libavcodec/aacdec_template.c: In function ‘imdct_and_windowing_eld’: libavcodec/aacdec_template.c:2599:64: warning: pointer type mismatch in conditional expression [enabled by default] In file included from libavcodec/aacdec_fixed.c:426:0: libavcodec/aacdec_template.c: In function ‘spectral_to_sample’: libavcodec/aacdec_template.c:2739:25: warning: passing argument 4 of ‘ff_sbr_apply’ from incompatible pointer type [enabled by default] libavcodec/aacsbr.h:46:6: note: expected ‘float *’ but argument is of type ‘int *’ libavcodec/aacdec_template.c:2739:25: warning: passing argument 5 of ‘ff_sbr_apply’ from incompatible pointer type [enabled by default] libavcodec/aacsbr.h:46:6: note: expected ‘float *’ but argument is of type ‘int *’ [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Breaking DRM is a little like attempting to break through a door even though the window is wide open and the only thing in the house is a bunch of things you dont want and which you would get tomorrow for free anyway signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 04/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
Are there any patches supporting Intel QSV encoding that will work with recent versions of ffmpeg on Windows? Thanks. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
