summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* EC: fix dest index for non 420 chroma.Michael Niedermayer2012-04-301-0/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* isom: remove duplicate line.Michael Niedermayer2012-04-301-1/+0
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* isom: Clarify comment for 'ec-3' fourccDerek Buitenhuis2012-04-301-1/+1
| | | | | Signed-off-by: Derek Buitenhuis <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* ffmpeg: add the edge at the correct place in allocating of the buffer.Michael Niedermayer2012-04-291-1/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-297-51/+132
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: 4xm: fix invalid array indexing rv34dsp: factorize a multiplication in the noround inverse transform rv40: perform bitwise checks in loop filter rv34: remove inline keyword from rv34_decode_block(). rv40: change a logical test into a bitwise one. rv34: remove constant parameter rv40: don't always do the full prev_type search dsputil x86: revert a test back to its previous value rv34dsp x86: implement MMX2 inverse transform Merged-by: Michael Niedermayer <[email protected]>
| * 4xm: fix invalid array indexingMans Rullgard2012-04-291-9/+12
| | | | | | | | | | | | Indexing outside arrays is invalid and breaks with gcc 4.8. Signed-off-by: Mans Rullgard <[email protected]>
| * rv34dsp: factorize a multiplication in the noround inverse transformChristophe GISQUET2012-04-281-9/+9
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * rv40: perform bitwise checks in loop filterChristophe Gisquet2012-04-281-8/+8
| | | | | | | | | | | | Down from 95 kcycles to 93 (including all called functions). Signed-off-by: Ronald S. Bultje <[email protected]>
| * rv34: remove inline keyword from rv34_decode_block().Ronald S. Bultje2012-04-281-1/+1
| | | | | | | | Force-inlining increases object size by 8kB and causes a 2% slowdown.
| * rv40: change a logical test into a bitwise one.Christophe Gisquet2012-04-281-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * rv34: remove constant parameterChristophe Gisquet2012-04-281-11/+6
| | | | | | | | | | | | is_block2 was always 0, so just remove it, and change accordingly the code. Signed-off-by: Ronald S. Bultje <[email protected]>
| * rv40: don't always do the full prev_type searchChristophe Gisquet2012-04-281-11/+14
| | | | | | | | | | | | 120->100 cycles. Signed-off-by: Ronald S. Bultje <[email protected]>
| * dsputil x86: revert a test back to its previous valueChristophe GISQUET2012-04-281-1/+1
| | | | | | | | | | | | Commit 356ee8d caused the initial inversion. Signed-off-by: Ronald S. Bultje <[email protected]>
| * rv34dsp x86: implement MMX2 inverse transformChristophe Gisquet2012-04-282-0/+80
| | | | | | | | | | | | 141 cycles down to 51. Signed-off-by: Ronald S. Bultje <[email protected]>
* | lavfi/buffersink: fix header inclusion guard nameStefano Sabatini2012-04-291-3/+3
| |
* | Simplify camstudio decoding and fix odd 16bit decoding.Carl Eugen Hoyos2012-04-292-105/+10
| | | | | | | | Fixes ticket #1220.
* | swr: use memcpy when input and output matchMichael Niedermayer2012-04-291-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: add sample format to AudioDataMichael Niedermayer2012-04-292-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: add set_audiodata_fmt() and use it to simplify codeMichael Niedermayer2012-04-292-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: int32_to_int16_mmx/sseMichael Niedermayer2012-04-292-1/+36
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | rmenc: more than 2 streams are not currently possible.Reimar Döffinger2012-04-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that just extending the RMMuxContext.streams array would avoid it. It is also possible that two audio streams will fail to mux correctly as well, though at least it should not crash for this reason. I do not feel like checking either of these. This patch fixes trac issue #1022 (at least it makes it exit with a proper error message instead of crashing). Signed-off-by: Reimar Döffinger <[email protected]>
* | nutdec: minor simplification.Reimar Döffinger2012-04-291-5/+3
| | | | | | | | | | | | | | Also fixes an (incorrect) "control reaches end of non-void function" warning with some compilers. Signed-off-by: Reimar Döffinger <[email protected]>
* | nutdec: replace assert with av_assert0.Reimar Döffinger2012-04-291-11/+9
| | | | | | | | Signed-off-by: Reimar Döffinger <[email protected]>
* | swr: float_to_int16_sse2()Michael Niedermayer2012-04-292-0/+36
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: float_to_int32_sse2()Michael Niedermayer2012-04-292-0/+40
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-284-9/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: new assembly version of get_cabac for x86_64 with PIC h264: use one table instead of several for cabac functions h264: (trivial) remove unneeded macro argument in x86/cabac.h libschroedingerdec: check malloc segment: reorder seg_write_header allocation avio: make avio_close(NULL) a no-op mov: Parse EC3SpecificBox (dec3 atom). Conflicts: libavcodec/cabac.c libavcodec/x86/cabac.h Merged-by: Michael Niedermayer <[email protected]>
| * h264: new assembly version of get_cabac for x86_64 with PICRoland Scheidegger2012-04-283-24/+121
| | | | | | | | | | | | | | | | | | | | This adds a hand-optimized assembly version for get_cabac much like the existing one, but it works if the table offsets are RIP-relative. Compared to the non-RIP-relative version this adds 2 lea instructions and it needs one extra register. get_cabac() gets about 40% faster, for an overall speedup of about 5%. Signed-off-by: Ronald S. Bultje <[email protected]>
| * h264: use one table instead of several for cabac functionsRoland Scheidegger2012-04-286-48/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | The reason is this is easier for PIC code (in particular on darwin...). Keep the old names as pointers (static in cabac_functions.h so gcc knows these are just immediate offsets) so the c code can nicely stay the same (alternatively could use offsets directly in the functions needing the tables). This should produce the same code as before with non-pic and better code (confirmed) with pic. The assembly uses the new table but still won't work for PIC case. Signed-off-by: Ronald S. Bultje <[email protected]>
| * h264: (trivial) remove unneeded macro argument in x86/cabac.hRoland Scheidegger2012-04-281-3/+3
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * libschroedingerdec: check mallocJordi Ortiz2012-04-281-0/+5
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
| * segment: reorder seg_write_header allocationLuca Barbato2012-04-271-8/+6
| | | | | | | | | | As pointed by Paul B Mahol <[email protected]> the previous code could lead to null pointer dereference.
| * avio: make avio_close(NULL) a no-opLuca Barbato2012-04-271-1/+5
| | | | | | | | Its behaviour in line with ffurl_close(NULL).
| * mov: Parse EC3SpecificBox (dec3 atom).Yusuke Nakamura2012-04-271-0/+29
| | | | | | | | | | | | | | | | Skip to parse fields for additional independent substreams and its associated dependent substreams since libavcodec's E-AC-3 decoder does not support them yet. Signed-off-by: Justin Ruggles <[email protected]>
* | lavc: minor bump for the new fields in AVFrame.Nicolas George2012-04-281-1/+1
| |
* | lavc: add a sample_rate field to AVFrame.Nicolas George2012-04-283-0/+12
| | | | | | | | The field is filled with the codec context information.
* | lavc: add a channel_layout field to AVFrame.Nicolas George2012-04-283-0/+13
| | | | | | | | | | | | The field is filled with the codec context information. FIXME need a minor version bump.
* | h264: new assembly version of get_cabac for x86_64 with PICRoland Scheidegger2012-04-283-25/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a hand-optimized assembly version for get_cabac much like the existing one, but it works if the table offsets are RIP-relative. Compared to the non-RIP-relative version this adds 2 lea instructions and it needs one extra register. There is a surprisingly large performance improvement over the c version (more so than the generated assembly seems to suggest) just in get_cabac, I measured roughly 40% faster for get_cabac on a K8. However, overall the difference is not that big, I measured roughly 5% on a test clip on a K8 and a Core2. Hopefully it still compiles on x86 32bit... Now that only one table is used, there's some chance even darwin as compiles this (apparently the label arithmetic used previously doesn't work if it involves symbols defined in a different file, thanks to Ronald S. Bultje for helping me with this). Signed-off-by: Michael Niedermayer <[email protected]>
* | h264: use one table instead of several for cabac functionsRoland Scheidegger2012-04-286-48/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | The reason is this is easier for PIC code (in particular on darwin...). Keep the old names as pointers (static in cabac_functions.h so gcc knows these are just immediate offsets) so the c code can nicely stay the same (alternatively could use offsets directly in the functions needing the tables). This should produce the same code as before with non-pic and better code (confirmed) with pic. The assembly uses the new table but still won't work for PIC case. Signed-off-by: Michael Niedermayer <[email protected]>
* | h264: (trivial) make ff_h264_lps_state staticRoland Scheidegger2012-04-281-7/+7
| | | | | | | | | | | | | | not used outside the cabac test functions (which probably means it's a bad test if it doesn't use the same tables as the real functions?) Signed-off-by: Michael Niedermayer <[email protected]>
* | h264: (trivial) remove unneeded macro argument in x86/cabac.hRoland Scheidegger2012-04-281-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | src_buffer: add forgotten avfilter_unref_buffer.Nicolas George2012-04-281-0/+1
| |
* | swr: add int16_to_float_sse2()Michael Niedermayer2012-04-282-0/+39
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf remove duplicated check in has_durationJean First2012-04-281-2/+0
| | | | | | | | | | | | | | | | | | this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a few lines above since cdced09e. I removed the first check to reduce the differences to libav. Signed-off-by: Jean First <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter: filter_samples: read pts before filtering.Nicolas George2012-04-281-5/+7
| | | | | | | | | | The call to the next filter_sample will likely unref the current buffer, so it is not possible to read it afterwards.
* | swr: add int32_to_float_sse2Michael Niedermayer2012-04-282-0/+51
| | | | | | | | | | | | could be done for sse/3dnow too if someone wants Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: int16->int32: use the old index negate trick to avoid 2 addsMichael Niedermayer2012-04-281-11/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: more correct cglobal parameters to int16->int32Michael Niedermayer2012-04-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avio: change ffurl_alloc return code.Nicolas George2012-04-281-1/+1
| | | | | | | | | | If the designated protocol is not found, return AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).
* | swr: seperate functions for aligned & unalignedMichael Niedermayer2012-04-282-8/+18
| | | | | | | | | | | | If someone has an idea on how to do this cleaner, its welcome Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: add int16_to_int32_mmx/sseMichael Niedermayer2012-04-286-2/+127
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>