Re: [FFmpeg-devel] [PATCH 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
On Tue, Jun 30, 2015 at 11:53:03AM +0200, Nedeljko Babic wrote:
From: Jovan Zelincevic jovan.zelince...@imgtec.com
Move existing code to the new template files
Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com
---
libavcodec/aacdec.c| 3132
+---
libavcodec/{aacdec.c = aacdec_template.c} | 623 +---
libavcodec/cbrt_tablegen.c | 16 -
.../{cbrt_tablegen.c = cbrt_tablegen_template.c} |0
libavcodec/sinewin_tablegen.c | 25 -
...ewin_tablegen.c = sinewin_tablegen_template.c} |0
6 files changed, 97 insertions(+), 3699 deletions(-)
copy libavcodec/{aacdec.c = aacdec_template.c} (85%)
copy libavcodec/{cbrt_tablegen.c = cbrt_tablegen_template.c} (100%)
copy libavcodec/{sinewin_tablegen.c = sinewin_tablegen_template.c} (100%)
applied
btw, the diff would have had ~40% fewer added lines shown if done by
using git ... --patience
might make sense to use in the future
thanks
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The bravest are surely those who have the clearest vision
of what is before them, glory and danger alike, and yet
notwithstanding go out to meet it. -- Thucydides
signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
From: Jovan Zelincevic jovan.zelince...@imgtec.com
Move existing code to the new template files
Signed-off-by: Nedeljko Babic nedeljko.ba...@imgtec.com
---
libavcodec/aacdec.c| 3132 +---
libavcodec/{aacdec.c = aacdec_template.c} | 623 +---
libavcodec/cbrt_tablegen.c | 16 -
.../{cbrt_tablegen.c = cbrt_tablegen_template.c} |0
libavcodec/sinewin_tablegen.c | 25 -
...ewin_tablegen.c = sinewin_tablegen_template.c} |0
6 files changed, 97 insertions(+), 3699 deletions(-)
copy libavcodec/{aacdec.c = aacdec_template.c} (85%)
copy libavcodec/{cbrt_tablegen.c = cbrt_tablegen_template.c} (100%)
copy libavcodec/{sinewin_tablegen.c = sinewin_tablegen_template.c} (100%)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 622cc5c..1d1abc9 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -32,55 +32,6 @@
* @author Maxim Gavrilov ( maxim.gavrilov gmail com )
*/
-/*
- * supported tools
- *
- * Support? Name
- * N (code in SoC repo) gain control
- * Yblock switching
- * Ywindow shapes - standard
- * Nwindow shapes - Low Delay
- * Yfilterbank - standard
- * N (code in SoC repo) filterbank - Scalable Sample Rate
- * YTemporal Noise Shaping
- * YLong Term Prediction
- * Yintensity stereo
- * Ychannel coupling
- * Yfrequency domain prediction
- * YPerceptual Noise Substitution
- * YMid/Side stereo
- * NScalable Inverse AAC Quantization
- * NFrequency Selective Switch
- * Nupsampling filter
- * Yquantization coding - AAC
- * Nquantization coding - TwinVQ
- * Nquantization coding - BSAC
- * NAAC Error Resilience tools
- * NError Resilience payload syntax
- * NError Protection tool
- * NCELP
- * NSilence Compression
- * NHVXC
- * NHVXC 4kbits/s VR
- * NStructured Audio tools
- * NStructured Audio Sample Bank Format
- * NMIDI
- * NHarmonic and Individual Lines plus Noise
- * NText-To-Speech Interface
- * YSpectral Band Replication
- * Y (not in this code) Layer-1
- * Y (not in this code) Layer-2
- * Y (not in this code) Layer-3
- * NSinuSoidal Coding (Transient, Sinusoid, Noise)
- * YParametric Stereo
- * NDirect Stream Transfer
- * YEnhanced AAC Low Delay (ER AAC ELD)
- *
- * Note: - HE AAC v1 comprises LC AAC with Spectral Band Replication.
- * - HE AAC v2 comprises LC AAC with Spectral Band Replication and
- Parametric Stereo.
- */
-
#include libavutil/float_dsp.h
#include libavutil/opt.h
#include avcodec.h
@@ -108,1450 +59,19 @@
#include string.h
#if ARCH_ARM
-# include arm/aac.h
-#elif ARCH_MIPS
-# include mips/aacdec_mips.h
-#endif
-
-static VLC vlc_scalefactors;
-static VLC vlc_spectral[11];
-
-static int output_configure(AACContext *ac,
-uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
-enum OCStatus oc_type, int get_new_frame);
-
-#define overread_err Input buffer exhausted before END element found\n
-
-static int count_channels(uint8_t (*layout)[3], int tags)
-{
-int i, sum = 0;
-for (i = 0; i tags; i++) {
-int syn_ele = layout[i][0];
-int pos = layout[i][2];
-sum += (1 + (syn_ele == TYPE_CPE)) *
- (pos != AAC_CHANNEL_OFF pos != AAC_CHANNEL_CC);
-}
-return sum;
-}
-
-/**
- * Check for the channel element in the current channel position configuration.
- * If it exists, make sure the appropriate element is allocated and map the
- * channel order to match the internal FFmpeg channel layout.
- *
- * @param che_pos current channel position configuration
- * @param type channel element type
- * @param id channel element id
- * @param channels count of the number of channels in the configuration
- *
- * @return Returns error status. 0 - OK, !0 - error
- */
-static av_cold int che_configure(AACContext *ac,
- enum ChannelPosition che_pos,
- int type, int id, int *channels)
-{
-if (*channels = MAX_CHANNELS)
-return AVERROR_INVALIDDATA;
-if (che_pos) {
-if (!ac-che[type][id]) {
-if (!(ac-che[type][id] = av_mallocz(sizeof(ChannelElement
-return AVERROR(ENOMEM);
-ff_aac_sbr_ctx_init(ac, ac-che[type][id]-sbr);
-}
-
Re: [FFmpeg-devel] [PATCH 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
On Sat, Jun 27, 2015 at 02:43:31AM +0200, Michael Niedermayer wrote: On Fri, Jun 12, 2015 at 08:15:51AM +, Nedeljko Babic wrote: On Thu, Jun 11, 2015 at 4:08 PM, Nedeljko Babic nedeljko.babic at imgtec.com wrote: From: Jovan Zelincevic jovan.zelincevic at imgtec.com Move existing code to the new template files Please setup your Git to track renames (add -M parameter), this is really hard to review in this form. This patch is just moving parts of the code that can be used in both float and in fixed aac in appropriate template files. It does not do renames (or anything else for that matter). For example, the parts of code are moved from aacdec.c to new aacdec_template.c, but original file is still present with what was left of the code. Adding -M will not change anything in the patch. I tried from -M20% to -M75% just to be sure. this needs -C like in git format-patch -1 -C -C -C #P it seems a single -C is enough, i thought yesterday it required multiple -C Ok, I'll recreate the patches with this option and resend them. Thanks. -Nedeljko ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
On Sat, Jun 27, 2015 at 02:43:31AM +0200, Michael Niedermayer wrote: On Fri, Jun 12, 2015 at 08:15:51AM +, Nedeljko Babic wrote: On Thu, Jun 11, 2015 at 4:08 PM, Nedeljko Babic nedeljko.ba...@imgtec.com wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Move existing code to the new template files Please setup your Git to track renames (add -M parameter), this is really hard to review in this form. This patch is just moving parts of the code that can be used in both float and in fixed aac in appropriate template files. It does not do renames (or anything else for that matter). For example, the parts of code are moved from aacdec.c to new aacdec_template.c, but original file is still present with what was left of the code. Adding -M will not change anything in the patch. I tried from -M20% to -M75% just to be sure. this needs -C like in git format-patch -1 -C -C -C #P it seems a single -C is enough, i thought yesterday it required multiple -C [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Awnsering whenever a program halts or runs forever is On a turing machine, in general impossible (turings halting problem). On any real computer, always possible as a real computer has a finite number of states N, and will either halt in less than N cycles or never halt. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
On Fri, Jun 12, 2015 at 08:15:51AM +, Nedeljko Babic wrote:
On Thu, Jun 11, 2015 at 4:08 PM, Nedeljko Babic
nedeljko.ba...@imgtec.com wrote:
From: Jovan Zelincevic jovan.zelince...@imgtec.com
Move existing code to the new template files
Please setup your Git to track renames (add -M parameter), this is
really hard to review in this form.
This patch is just moving parts of the code that can be used in both float and
in fixed aac in appropriate template files.
It does not do renames (or anything else for that matter).
For example, the parts of code are moved from aacdec.c to new
aacdec_template.c,
but original file is still present with what was left of the code.
Adding -M will not change anything in the patch.
I tried from -M20% to -M75% just to be sure.
this needs -C
like in
git format-patch -1 -C -C -C #P
libavcodec/aacdec.c| 3132 +---
libavcodec/{aacdec.c = aacdec_template.c} | 543
libavcodec/cbrt_tablegen.c | 16 -
.../{cbrt_tablegen.c = cbrt_tablegen_template.c} |0
libavcodec/sinewin_tablegen.c | 25 -
...ewin_tablegen.c = sinewin_tablegen_template.c} |0
6 files changed, 57 insertions(+), 3659 deletions(-)
copy libavcodec/{aacdec.c = aacdec_template.c} (87%)
copy libavcodec/{cbrt_tablegen.c = cbrt_tablegen_template.c} (100%)
copy libavcodec/{sinewin_tablegen.c = sinewin_tablegen_template.c} (100%)
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The educated differ from the uneducated as much as the living from the
dead. -- 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 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
On Thu, Jun 11, 2015 at 4:08 PM, Nedeljko Babic nedeljko.ba...@imgtec.com wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Move existing code to the new template files Please setup your Git to track renames (add -M parameter), this is really hard to review in this form. This patch is just moving parts of the code that can be used in both float and in fixed aac in appropriate template files. It does not do renames (or anything else for that matter). For example, the parts of code are moved from aacdec.c to new aacdec_template.c, but original file is still present with what was left of the code. Adding -M will not change anything in the patch. I tried from -M20% to -M75% just to be sure. - Nedeljko ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 01/12] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
On Thu, Jun 11, 2015 at 4:08 PM, Nedeljko Babic nedeljko.ba...@imgtec.com wrote: From: Jovan Zelincevic jovan.zelince...@imgtec.com Move existing code to the new template files Please setup your Git to track renames (add -M parameter), this is really hard to review in this form. - Hendrik ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
