RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,734 Commits 36 Branches 398 Tags 237 MiB
Commit Graph

131 Commits

Author SHA1 Message Date
Reimar Döffinger 636ee66f1c Fix data_size handling for AC3 and dca decoders. 
They use now code identical to the AAC decoder.
The AC3 decoder previously did not check the data_size and
the dca decoder checked against and set wrong values for float.
 2011-05-01 19:13:01 +02:00
Michael Niedermayer d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Vitor Sessak 9d35fa520e Add AVX FFT implementation. 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-04-26 18:25:24 +02:00
Reimar Döffinger bde9671795 dca: allow selecting float output at runtime. 2011-04-25 16:51:27 +02:00
Diego Biurrun 43fb279f56 Replace more FFmpeg instances by Libav or ffmpeg. 2011-04-23 19:12:23 +02:00
clsid2 0e09997fa4 Libavcodec AC3/E-AC3/DTS decoders now output floating point data. 
git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3769 3b938f2f-1a1a-0410-8054-a526ea5ff92c
 2011-04-03 22:52:58 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anssi Hannula 853daff682 dca: use EXT_AUDIO_ID field to determine core extensions 
This avoids the core substream extensions scan when the EXT_AUDIO_ID
field indicates no extensions or only unsupported extensions. The scan
is done only if the value of EXT_AUDIO_ID is unknown or indicates a
present XCh extension which we can decode.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7e06e0ede3)
 2011-02-26 03:16:04 +01:00
Anssi Hannula 7e06e0ede3 dca: use EXT_AUDIO_ID field to determine core extensions 
This avoids the core substream extensions scan when the EXT_AUDIO_ID
field indicates no extensions or only unsupported extensions. The scan
is done only if the value of EXT_AUDIO_ID is unknown or indicates a
present XCh extension which we can decode.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-24 21:22:37 +00:00
Reinhard Tartler 7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler 737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Anton Khirnov fbdcdaee6e Replace remaining occurrences of deprecated CH_* with AV_CH_* 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c2fcd0a7a4)
 2011-02-06 20:31:47 +01:00
Anton Khirnov c2fcd0a7a4 Replace remaining occurrences of deprecated CH_* with AV_CH_* 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 08:26:12 -05:00
Justin Ruggles fe2ff6d247 Separate format conversion DSP functions from DSPContext. 
This will be beneficial for use with the audio conversion API without
requiring it to depend on all of dsputil.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit c73d99e672)
 2011-02-04 03:08:09 +01:00
Justin Ruggles c73d99e672 Separate format conversion DSP functions from DSPContext. 
This will be beneficial for use with the audio conversion API without
requiring it to depend on all of dsputil.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-02 02:44:53 +00:00
Gianluigi Tiesi 8a92ec71b3 dca: avoid C99 declaration in for() expression 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e86e858111)
 2011-02-02 03:40:50 +01:00
Justin Ruggles a8ae4e0e7b Remove unneeded add bias from 3 functions. 
DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 80ba1ddb58)
 2011-02-02 03:40:48 +01:00
Gianluigi Tiesi e86e858111 dca: avoid C99 declaration in for() expression 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-01 12:38:30 +00:00
Justin Ruggles 80ba1ddb58 Remove unneeded add bias from 3 functions. 
DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-31 20:28:42 +00:00
Justin Ruggles 79ce107847 cosmetics: indentation and spacing 
(cherry picked from commit b5ec638343)
 2011-01-28 03:15:35 +01:00
Justin Ruggles 733dbe7d18 Remove the add bias hack for the C version of DSPContext.float_to_int16_*(). 
(cherry picked from commit 9d06d7bce3)
 2011-01-28 03:15:35 +01:00
Diego Elio Pettenò e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Justin Ruggles b5ec638343 cosmetics: indentation and spacing 2011-01-28 00:21:46 +00:00
Justin Ruggles 9d06d7bce3 Remove the add bias hack for the C version of DSPContext.float_to_int16_*(). 2011-01-28 00:07:35 +00:00
Diego Elio Pettenò d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Anssi Hannula 6345dfcfd0 dca: add profile names 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f4096bf6ee)
 2011-01-23 19:32:07 +01:00
Anssi Hannula cf9cb1f99a dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRA 
DTS-HD HRA streams do not always have an XBR extension in the extension
substream. Instead they can have only XXCh and X96 extensions in
there and still be considered DTS-HD HRA.

This is also confirmed with Onkyo TX-SR607 receiver which recognizes
such a stream as HiRes Audio.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8f4a5d225c)
 2011-01-23 19:32:07 +01:00
Anssi Hannula f4096bf6ee dca: add profile names 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 23:11:24 +00:00
Anssi Hannula 8f4a5d225c dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRA 
DTS-HD HRA streams do not always have an XBR extension in the extension
substream. Instead they can have only XXCh and X96 extensions in
there and still be considered DTS-HD HRA.

This is also confirmed with Onkyo TX-SR607 receiver which recognizes
such a stream as HiRes Audio.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 22:20:20 +00:00
Justin Ruggles d425a03b59 cosmetics: reindent 2011-01-18 11:40:13 -05:00
Daniel Kang 1360f07e22 Add check for changing number of channels in DCA. 
Fixes issue 2505.
 2011-01-18 11:30:33 -05:00
Anssi Hannula 39f4d32908 Fix reading over the end of the allocated buffer. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 23:01:01 +00:00
Anssi Hannula f5a2d285f9 Export dca profile information. 
Patch by Anssi Hannula anssi d hannula a iki d fi

Originally committed as revision 26250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 22:34:12 +00:00
Anssi Hannula df1c694c58 Verify FSIZE96 when encountering X96 sync code. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26249 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 22:24:39 +00:00
Stefano Sabatini 63e8d9760f Use the new libavcore audio channel API. 
This also allows to remove a linking dependency of libavfilter on
libavcodec.

Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 20:06:22 +00:00
Stefano Sabatini 5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Benjamin Larsson 62784e3733 Add the CODEC_CAP_CHANNEL_CONF capability code and add 
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 22:18:02 +00:00
Nick Brereton ace7f813cd dca: fix dynrange coefficient in xch 
Patch by Nick Brereton

Originally committed as revision 24637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-31 22:15:59 +00:00
Nick Brereton df9844937f DCA: fix multichannel -> 2 channel downmix. 
Patch by Nick Brereton

Originally committed as revision 24555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 21:45:43 +00:00
Nick Brereton 08634e7bda Setup correct channel value when downmixing is required. 
Patch by Nick Brereton

Originally committed as revision 24554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 21:44:09 +00:00
Christophe Gisquet f2401c214d Use math constant instead of hardcoded rounded value for sqrt(0.5). 
Patch by Christophe.Gisquet (gmail)

Originally committed as revision 24213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-12 12:32:24 +00:00
Nick Brereton b12b16c5d3 Fix side channels when XCh extension is present. 
Patch by Nick Brereton $name AT n$surname DOT net

Originally committed as revision 24210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-12 09:10:53 +00:00
Nick Brereton d0a1885018 Move XCH parameters into context structure. 
Patch by Nick Brereton $name AT n$surname DOT net

Originally committed as revision 24209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-12 09:00:17 +00:00
Måns Rullgård 8fc0162ac4 Add av_ prefix to bswap macros 
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:12:30 +00:00
Nick Brereton 0712c230ae DCA: Occasionally a false XCH sync word can turn up after the core DTS data, 
to verify the sync word the extension fsize field should be compared to
the core data length field.

Patch by nick.nbrereton@net

Originally committed as revision 24054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-05 08:16:43 +00:00
Benjamin Larsson 324a94b022 DCA: *_bits() -> *_bits_long() where needed, half fix for broken bitstream parsing 
Originally committed as revision 24051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-05 01:43:47 +00:00
Nick Brereton d1177cb589 Support DTS-ES extension (XCh) in dca: Cosmetic cleanup 
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 08:35:44 +00:00
Nick Brereton 774e9acfa7 Support DTS-ES extension (XCh) in dca: add code to handle DTS-ES extension 
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 08:34:51 +00:00
Nick Brereton 3d5a9ba1af Support DTS-ES extension (XCh) in dca: update and add channel mapping tables for DTS-ES mappings 
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 08:34:02 +00:00
Nick Brereton 6baef06e8f Support DTS-ES extension (XCh) in dca: move original code around to allow reused by DTS-ES code 
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 08:33:00 +00:00