har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,048 Commits 2 Branches 401 Tags
Commit Graph

11585 Commits

Author SHA1 Message Date
Reinhard Tartler
ba90f93852 Backport AAC-HE v2 from trunk 
This patch has seen testing for a couple of weeks in ubuntu maverick and debian/experimental w/o negative feedback so far.



Originally committed as revision 24576 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-07-28 20:14:28 +00:00
Reinhard Tartler
61eb165514 ac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3 
if any E-AC-3 frames have been detected instead of switching back and forth for
AC-3 core + dependent E-AC-3 substream(s).
Fixes Issue 2022.

backport r24103 by jbr


Originally committed as revision 24136 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-07-09 01:16:42 +00:00
Jean-Daniel Dupas
32fa7cecd7 Some fields were incorrectly reset (to NULL) when calling avcodec_copy_context(). 
Patch by Jean-Daniel Dupas, devlists shadowlab org 


backport r23344 by cehoyos


Originally committed as revision 23793 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-26 14:24:14 +00:00
Reinhard Tartler
b9ebd7dc7d 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1. 
backport r23660 by alexc


Originally committed as revision 23747 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-24 05:46:58 +00:00
James Zern
db06ddf8c6 Add WebM muxer 
Patch by James Zern <jzern at google>

backport r23474 by conrad


Originally committed as revision 23549 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-09 15:54:27 +00:00
James Zern
c3cd8890fe VP8 encoding via libvpx. 
Patch by James Zern, Google, Inc.


backport r23449 by cehoyos


Originally committed as revision 23455 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-03 21:36:38 +00:00
Reinhard Tartler
4b51239df3 disable (native) vorbis encoder for the 0.6 branch 
Originally committed as revision 23416 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-01 20:14:00 +00:00
Reinhard Tartler
f7f9f18f83 Treat SIPP like xvid, fixed issue1966 
backport r23336 by michael


Originally committed as revision 23385 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 15:07:08 +00:00
Reinhard Tartler
8f3504c3ca Mark vorbis encoder as experimental. 
backport r23339 by cehoyos


Originally committed as revision 23381 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:34:37 +00:00
Reinhard Tartler
bf20d5e4bb Mark AAC encoder as experimental. 
backport r23350 by alexc


Originally committed as revision 23380 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:33:50 +00:00
Janne Grunau
3fa19f6828 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it. 
Patch by Janne Grunau, janne-ffmpeg jannau net 


backport r23334,23337-23338 by cehoyos and stefano


Originally committed as revision 23379 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:33:02 +00:00
Reinhard Tartler
4e62a67389 Check for VUI overeading and reset num_reoder_frames. 
This helps the video from issue1831


backport r23328 by michael


Originally committed as revision 23378 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:25:18 +00:00
Reinhard Tartler
46ac6315fd api-example: Try to avoid decoding incomplete frames 
Use a larger input audio buffer, refill it when it has less than 4 KB data
left.


backport r23323 by mstorsjo


Originally committed as revision 23377 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:20:05 +00:00
James Zern
8261cce1f0 VP8 decoding via libvpx 
Patch by James Zern for Google, Inc., jzern google com

backportd r23191,23303,23307-23308 by conrad, cehoyos and mstorsjo

Originally committed as revision 23374 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:03:03 +00:00
Cyril Russo
e63d03e7e2 Fix documentation of av_audio_convert. 
Patch by Cyril Russo, stage D nexvision A laposte net


backport r23285 by cehoyos


Originally committed as revision 23372 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 13:11:21 +00:00
Reinhard Tartler
cdfe333493 Document CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction. 
backport r23258 by reimar


Originally committed as revision 23321 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-25 18:34:19 +00:00
Reinhard Tartler
e6ef35bc22 Make aac_decode_frame() consume zero padding at the end of a packet. 
backport r23195 by alexc


Originally committed as revision 23229 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 20:23:22 +00:00
Maxim Poliakovski
34a0dee17e Fix signedness of q_delta field of the IVIMbInfo. 
Patch by Maxim max_pole () gmx * de


backport r23170 by benoit


Originally committed as revision 23227 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 20:20:01 +00:00
Reinhard Tartler
cff1f85c3f Fix compilation of AC3 decoder if E-AC3 decoder was disabled. 
backport r23131 by cehoyos


Originally committed as revision 23220 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:38:39 +00:00
Reinhard Tartler
dd92ff49c9 Make lsf_sf_expand() 4 times faster. 
backport r23096 by michael


Originally committed as revision 23219 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:32:58 +00:00
Reinhard Tartler
b12045c8c7 Set cur_channel in the AAC encoder context where needed. 
Most coder functions read it. Carting this around in the context may be
suboptimal; a refactor should be considered.


backport r23094 by alexc


Originally committed as revision 23218 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:27:16 +00:00
Nick Brereton
6f8fbbf8d7 mlpdec: Comment channel_params field in struct SubStream. 
Patch by Nick Brereton <nick at nbrereton dot net>

backport r23085 by ramiro


Originally committed as revision 23216 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:22:49 +00:00
Nick Brereton
b68d9df427 mlpdec: Allocate channel decoding parameters for each substream. Some file 
was encountered with a channel range that overlapped the previous substreams,
and the code assumed no such overlap was possible.
Patch by Nick Brereton <nick at nbrereton dot net>


backport r23084 by ramiro


Originally committed as revision 23215 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:22:32 +00:00
Reinhard Tartler
26fe0ec7d6 Adding missing () to mathops.h. 
backport r23083 by michael


Originally committed as revision 23214 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:19:49 +00:00
Reinhard Tartler
7590718414 Replace more "m" constraints with MANGLE to fix compilation issues 
with x86_32 gcc 4.4.4 and -fPIC.


backport r23082 by reimar


Originally committed as revision 23213 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:19:13 +00:00
Thomas Devanneaux
b50601e882 Check NAL unit size to avoid reading past the buffer. 
This fixes issue1907

Patch by Thomas Devanneaux gmail(thomdev)


backport r23078 by benoit


Originally committed as revision 23211 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:03:57 +00:00
Reinhard Tartler
8740ed496c Another try for fixing/improving decode_video documentation. 
backport r23057 by reimar


Originally committed as revision 23187 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 13:29:36 +00:00
Reinhard Tartler
8ab1409a59 10l: store the result of clipping added in r23035 
backport r23037 by alexc


Originally committed as revision 23184 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 11:39:02 +00:00
Reinhard Tartler
3589ac6334 Error out when too many bits per frame are requested. 
backport r23036 by alexc


Originally committed as revision 23183 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 11:38:30 +00:00
Reinhard Tartler
dd68bb3cab Make the faac inspired quantizer search make sense for a slightly narrower definition of "make sense." 
backport r23035 by alexc


Originally committed as revision 23182 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 11:38:07 +00:00
Ronald S. Bultje
4fe4bb6150 Revert r22974 int->unsigned parts that don't have any meaningful effect. 
Originally committed as revision 23016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-03 22:08:31 +00:00
Alex Converse
17d5959998 10l: The SBR refactor requires the use of 2 independent output X buffers. 
Originally committed as revision 23014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-03 19:21:35 +00:00
Martin Storsjö
fa36165adf amrnbdec: Apply AMR_SAMPLE_SCALE when finishing the decoder output 
The output scaling was accidentally removed in rev 22937.

Originally committed as revision 23012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-03 05:57:48 +00:00
Ronald S. Bultje
1302ccc1a7 Another buffer overflow, fixes issue1758. 
Originally committed as revision 23011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-02 21:52:25 +00:00
Reimar Döffinger
bf9766995c Clarify how allocation works for the picture argument for 
avcodec_decode_video3.

Originally committed as revision 23009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-02 16:07:29 +00:00
Ronald S. Bultje
593a861470 Fix buffer overrun (or, well, actually a typo, 80 should be 0x80...). 
Partially fixes issue 1758.

Originally committed as revision 23005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 18:45:02 +00:00
Alex Converse
2d23fecd5d Enforce time border monotonicity. 
Thanks to Chromium.

Originally committed as revision 23000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 23:32:42 +00:00
Alex Converse
a91d82b5cc Move the SBR patch count check to prevent overwrites. 
Thanks to Chromium.

Originally committed as revision 22999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 23:08:44 +00:00
Alex Converse
10678e5c72 Increase size of patch_borders[]. 
6 patches means there can be 7 borders. Found by Chromium.

Originally committed as revision 22998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 22:42:52 +00:00
Michael Niedermayer
19a00c5eb2 avi bgr24 padding fix. 
Fixes issue1901

Originally committed as revision 22997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 22:09:42 +00:00
Alex Converse
d0dedce71d Reindent 
Originally committed as revision 22996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:43:29 +00:00
Alex Converse
ca6d3f234c Rewrite ff_sbr_apply in a manner more friendly to PS. 
This includes merging ff_sbr_dequant into ff_sbr_apply.

Originally committed as revision 22995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:43:23 +00:00
Måns Rullgård
5635985c26 ARM: NEON optimised VP6 edge filter 
Originally committed as revision 22993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:30:27 +00:00
Måns Rullgård
5e1ba34bbb VP56: move vp56_edge_filter to new VP56DSPContext 
Using macro templates allows the vp[56]_adjust functions to be
inlined instead of called through function pointers.  The new
function pointers enable optimised implementations of the filters.

4% faster VP6 decoding on Cortex-A8.

Originally committed as revision 22992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:30:22 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues. 
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-28 20:00:23 +00:00
Sebastian Vater
726dc06158 Reidnent after r22795. 
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:39:08 +00:00
Sebastian Vater
fe51b5ce50 Move some branches outside looped code. Should improve the generated asm (and 
thus performance) slightly.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:38:41 +00:00
Sebastian Vater
473147bed0 Switch some ints to unsigned (they can only have positive values, this allows 
compiler to optimize some math from mul/div to shr/shl). Also add a cast to
uint32_t when calling decodeplane32(), this silences a compiler warning.
Lastly, in decodeplane8/32(), flatten a double-loop into a single-loop and
calculate the length once before entering the loop instead of during every
iteration (since it doesn't change).

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:37:13 +00:00
Sebastian Vater
687dc3555d Make two functions out of #define hackery. 
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 22970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:00:57 +00:00
Stefano Sabatini
4cf1ba0445 Make avcodec_check_dimensions() return AVERROR(EINVAL) rather than -1 
in case of invalid picture size.

Originally committed as revision 22962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 15:05:16 +00:00