summaryrefslogtreecommitdiff
path: root/libavcodec/psymodel.c
Commit message (Collapse)AuthorAgeFilesLines
* lavc/psymodel: check for av_malloc failureGanesh Ajjanagadde2016-03-231-1/+6
| | | | | | | | | | No idea why in commit 01ecb7172b684f1c4b3e748f95c5a9a494ca36ec the checks were removed; this can lead to NULL pointer dereferences. This effectively reverts that portion of the commit. Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com>
* AAC encoder: improve SF range utilizationClaudio Freire2015-12-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does 4 things, all of which interact and thus it woudln't be possible to commit them separately without causing either quality regressions or assertion failures. Fate comparison targets don't all reflect improvements in quality, yet listening tests show substantially improved quality and stability. 1. Increase SF range utilization. The spec requires SF delta values to be constrained within the range -60..60. The previous code was applying that range to the whole SF array and not only the deltas of consecutive values, because doing so requires smarter code: zeroing or otherwise skipping a band may invalidate lots of SF choices. This patch implements that logic to allow the coders to utilize the full dynamic range of scalefactors, increasing quality quite considerably, and fixing delta-SF-related assertion failures, since now the limitation is enforced rather than asserted. 2. PNS tweaks The previous modification makes big improvements in twoloop's efficiency, and every time that happens PNS logic needs to be tweaked accordingly to avoid it from stepping all over twoloop's decisions. This patch includes modifications of the sort. 3. Account for lowpass cutoff during PSY analysis The closer PSY's allocation is to final allocation the better the quality is, and given these modifications, twoloop is now very efficient at avoiding holes. Thus, to compute accurate thresholds, PSY needs to account for the lowpass applied implicitly during twoloop (by zeroing high bands). This patch makes twoloop set the cutoff in psymodel's context the first time it runs, and makes PSY account for it during threshold computation, making PE and threshold computations closer to the final allocation and thus achieving better subjective quality. 4. Tweaks to RC lambda tracking loop in relation to PNS Without this tweak some corner cases cause quality regressions. Basically, lambda needs to react faster to overall bitrate efficiency changes since now PNS can be quite successful in enforcing maximum bitrates, when PSY allocates too many bits to the lower bands, suppressing the signals RC logic uses to lower lambda in those cases and causing aggressive PNS. This tweak makes PNS much less aggressive, though it can still use some further tweaks. Also update MIPS specializations and adjust fuzz Also in lavc/mips/aacpsy_mips.h: remove trailing whitespace
* AAC encoder: cosmetics from last commitClaudio Freire2015-10-111-12/+12
| | | | Reindent
* AAC encoder: Extensive improvementsClaudio Freire2015-10-111-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finalizes merging of the work in the patches in ticket #2686. Improvements to twoloop and RC logic are extensive. The non-exhaustive list of twoloop improvments includes: - Tweaks to distortion limits on the RD optimization phase of twoloop - Deeper search in twoloop - PNS information marking to let twoloop decide when to use it (turned out having the decision made separately wasn't working) - Tonal band detection and priorization - Better band energy conservation rules - Strict hole avoidance For rate control: - Use psymodel's bit allocation to allow proper use of the bit reservoir. Don't work against the bit reservoir by moving lambda in the opposite direction when psymodel decides to allocate more/less bits to a frame. - Retry the encode if the effective rate lies outside a reasonable margin of psymodel's allocation or the selected ABR. - Log average lambda at the end. Useful info for everyone, but especially for tuning of the various encoder constants that relate to lambda feedback. Psy: - Do not apply lowpass with a FIR filter, instead just let the coder zero bands above the cutoff. The FIR filter induces group delay, and while zeroing bands causes ripple, it's lost in the quantization noise. - Experimental VBR bit allocation code - Tweak automatic lowpass filter threshold to maximize audio bandwidth at all bitrates while still providing acceptable, stable quality. I/S: - Phase decision fixes. Unrelated to #2686, but the bugs only surfaced when the merge was finalized. Measure I/S band energy accounting for phase, and prevent I/S and M/S from being applied both. PNS: - Avoid marking short bands with PNS when they're part of a window group in which there's a large variation of energy from one window to the next. PNS can't preserve those and the effect is extremely noticeable. M/S: - Implement BMLD protection similar to the specified in ISO-IEC/13818:7-2003, Appendix C Section 6.1. Since M/S decision doesn't conform to section 6.1, a different method had to be implemented, but should provide equivalent protection. - Move the decision logic closer to the method specified in ISO-IEC/13818:7-2003, Appendix C Section 6.1. Specifically, make sure M/S needs less bits than dual stereo. - Don't apply M/S in bands that are using I/S Now, this of course needed adjustments in the compare targets and fuzz factors of the AAC encoder's fate tests, but if wondering why the targets go up (more distortion), consider the previous coder was using too many bits on LF content (far more than required by psy), and thus those signals will now be more distorted, not less. The extra distortion isn't audible though, I carried extensive ABX testing to make sure. A very similar patch was also extensively tested by Kamendo2 in the context of #2686.
* Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'Michael Niedermayer2015-06-011-0/+12
|\ | | | | | | | | | | | | | | | | | | * commit '03927cb73399e6f07185fc7f8851d7612b4187b6': psymodel: Check memory allocation Conflicts: libavcodec/psymodel.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: Check memory allocationVittorio Giovara2015-05-311-0/+12
| |
* | avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointerMichael Niedermayer2014-10-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the ↵Michael Niedermayer2014-10-141-1/+1
| | | | | | | | | | | | pointers as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/psymodel: use av_malloc(z)_array()Michael Niedermayer2014-04-131-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Avoid a null pointer dereference on oom in the aac encoder.Carl Eugen Hoyos2013-06-301-1/+1
| | | | | | | | Fixes ticket #2732.
* | mips: Optimization of IIR filter functionBojan Zivkovic2013-03-201-2/+7
| | | | | | | | | | | | Signed-off-by: Bojan Zivkovic <bojan@mips.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | psymodel: dont apply lowpass filters with a cutoff close to the nyquistMichael Niedermayer2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | The IIR filter numerically diverges in such cases, this could easily be fixed but would make the filter slower on some platforms Fixes Ticket2246 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-1/+1
| |
* | aacenc: new default cutoffMichael Niedermayer2012-07-291-0/+3
| | | | | | | | | | | | | | Improves subjective quality Formula and testing by: kamedo2 <fujisakihir90@yahoo.co.jp> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-241-11/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove ffmpeg. aacenc: Simplify windowing aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples. aacenc: Deinterleave input samples before processing. aacenc: Store channel count in AACEncContext. aacenc: Move Q^3/4 calculation to it's own table aacenc: Request normalized float samples instead of converting s16 samples to float. aacpsy: Replace an if with FFMAX in LAME windowing. aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons aacenc: cosmetics: move init() and end() to the bottom of the file. aacenc: aac_encode_init() cleanup XWD encoder and decoder vc1: don't read the interpfrm and bfraction elements for interlaced frames mxfdec: fix memleak on mxf_read_close() westwood: split the AUD and VQA demuxers into separate files. Conflicts: .gitignore Changelog Makefile configure doc/ffmpeg.texi ffmpeg.c libavcodec/Makefile libavcodec/aacenc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/img2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacenc: Deinterleave input samples before processing.Nathan Caldwell2012-01-231-10/+6
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: Request normalized float samples instead of converting s16 samples ↵Nathan Caldwell2012-01-231-4/+3
| | | | | | | | | | | | to float. Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-301-5/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rational-test: Add proper main() declaration to fix gcc warnings. configure: Add vdpau and dxva2 to configure results output. Remove unused, never built libavutil/pca.[ch] matroskadec: forward parsing errors to caller. av_find_stream_info: simplify EAGAIN handling. aacenc: Fix determination of Mid/Side Mode. psymodel: Remove the single channel analysis function aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel. psymodel: Add channels and channel groups to the psymodel. ARM: remove check for PLD instruction fate: move amr[nw]b test rules into separate files ogg: fix double free when finding length of small chained oggs. swscale: implement >8bit scaling support. build: fix creation of tools dir with make 3.81 build: Mark all-yes Makefile target as phony. pixfmt: fix YUV422/444 wrong endian comment build: create output directories as needed Add new yuv444 pixfmts to avcodec_align_dimensions2 Conflicts: Makefile configure libavutil/pca.c libavutil/pca.h libavutil/pixfmt.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: Add channels and channel groups to the psymodel.Nathan Caldwell2011-06-291-5/+31
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-091-13/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Fix an oob array read. cosmetics: trim trailing whitespace in postproc Ban strncpy() it's too easy to misuse. psymodel: Remove wrapper functions. aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. regtest: remove redundant flags in jpg test regtest: use run_ffmpeg in do_image_formats regtest: simplify encoding functions ffmpeg.c: check for interlaced flag in the correct place. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: Remove wrapper functions.Nathan Caldwell2011-05-081-13/+0
| | | | | | | | Instead use the function pointers directly.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cosmetics: vertical alignment and line wrapJustin Ruggles2011-01-201-2/+3
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add memory allocation failure checks to ff_iir_filter_init_coeffs().Justin Ruggles2011-01-201-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | cosmetics: vertical alignment and line wrapJustin Ruggles2011-01-211-2/+3
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 75b98610a7ce7acf34f583a04aaccd8c619947fe)
* | Add memory allocation failure checks to ff_iir_filter_init_coeffs().Justin Ruggles2011-01-211-1/+1
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d42dc217ed2b0f886ffc50b26c2bbff1fee5feca)
* psymodel: Const correct FFPsyWindowInfo.Alex Converse2010-08-301-1/+1
| | | | Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a leak in the AAC encoderMartin Storsjö2010-07-101-0/+1
| | | | Originally committed as revision 24159 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l: Revert r23867. It didn't make any sense.Alex Converse2010-06-281-3/+0
| | | | Originally committed as revision 23868 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_psy_preprocess_end() act like av_freep().Alex Converse2010-06-281-0/+3
| | | | Originally committed as revision 23867 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Don't lowpass the input unless specifically requested.Alex Converse2010-04-021-5/+2
| | | | | | The heuristic for estimating a good cutoff is busted. Originally committed as revision 22779 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use cutoff frequency to adjust bandwidth in the generic psymodel preprocess.Alex Converse2009-07-141-1/+3
| | | | Originally committed as revision 19429 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove unnecessary {} around if/for blocks;Diego Biurrun2009-07-081-4/+2
| | | | | | move statements after if/for to the next line. Originally committed as revision 19378 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: prettyprinting, K&R style, break overly long linesDiego Biurrun2009-07-081-2/+2
| | | | Originally committed as revision 19377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Pretty print the AAC encoder.Alex Converse2009-07-081-11/+11
| | | | Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge the AAC encoder from SoC svn. It is still considered experimental.Alex Converse2009-07-081-0/+130
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status