1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

21 Commits

Author SHA1 Message Date
Michael Niedermayer
e60779b18c Merge remote-tracking branch 'mans/dnxhd'
* mans/dnxhd:
  dnxhddec: cache luma/chroma_weight*qscale tables for last qscale
  dnxhddec: merge ac_{index,run}_flags
  dnxhddec: store 2*level+1 in ac_level tables
  dnxhddec: rearrange decode_dct_block loop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-22 22:18:12 +02:00
Mans Rullgard
9dfd89b831 dnxhddec: merge ac_{index,run}_flags
These tables contain only a 1-bit flag each.  Combining them reduces
the data size and saves some instructions in the block decode loop.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-24 22:29:22 +01:00
Mans Rullgard
185a2c08c5 dnxhddec: store 2*level+1 in ac_level tables
This is the value actually used by the decoder in speed-critical code.
The encoder uses these tables only in init code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-24 22:28:57 +01:00
Michael Niedermayer
4095fa9038 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-22 12:08:52 +02:00
Joseph Artsimovich
5ab21439fd dnxhd: 10-bit support
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 18:44:40 +01:00
Joseph Artsimovich
42c27f2eca dnxhd: rename some data tables
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 03:30:29 +01:00
Michael Niedermayer
58257ea29e Merge remote-tracking branch 'qatar/master'
* qatar/master: (28 commits)
  mp3enc: write a xing frame containing number of frames in the file
  lavf: update AVStream.nb_frames when muxing.
  ffmpeg: remove unused variables from InputStream.
  doc: update ffmpeg -ar and -ac documentation to reflect reality.
  ffmpeg: remove pointless if (nb_input_files)
  ffmpeg: merge input_files_ts_offset into input_files.
  ffmpeg: merge input_codecs into input_streams.
  ffmpeg: drop AV prefixes from struct names.
  ffmpeg: deprecate loop_input and loop_output options
  gif: add loop private option.
  img2: add loop private option.
  AVOptions: in av_opt_find() don't return named constants unless unit is specified.
  x11grab: replace undocumented nomouse hackery with a private option.
  dict: extend documentation.
  lls: whitespace cosmetics
  docs: Use proper markup for a literal command line option
  docs: Remove a remark that isn't relevant any longer
  docs: Explain how to regenerate import libraries with MSVC tools
  docs: Mention that libraries for MSVC can be built with a cross compiler
  docs: Remove old docs that mention setting up a build environment with lib.exe
  ...

Conflicts:
	doc/ffmpeg.texi
	doc/general.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/dnxhddata.c
	libavformat/mp3enc.c
	libavformat/utils.c
	libavutil/Makefile
	tests/copycooker.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-09 02:06:40 +02:00
Mans Rullgard
ecf86e1a97 dnxhd: prettify tables
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-08 14:16:28 +01:00
Joseph Artsimovich
36204ed88e dnxhd: Renama tables 2011-06-10 22:13:26 +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
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Stefan Gehrer
439c650301 remove duplicate tables
Originally committed as revision 16647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 20:46:38 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Baptiste Coudurier
892d226857 return if bitrate is not specified or too low
Originally committed as revision 13611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 21:29:45 +00:00
Baptiste Coudurier
0c39c38b14 add bitrate helper to choose all dnxhd variants
Originally committed as revision 11260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-18 13:52:07 +00:00
Baptiste Coudurier
cc3a970857 dnxhd 720p encoding and decoding support
Originally committed as revision 11133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-02 19:27:19 +00:00
Baptiste Coudurier
2e85b344f7 dnxhd 36mbit support
Originally committed as revision 10689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 15:36:57 +00:00
Baptiste Coudurier
6cb1d36169 typo weigth->weight
Originally committed as revision 10687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:28:36 +00:00
Baptiste Coudurier
cd52a9ca9f preliminary 10 bit depth decoding support, still miss generic api to export picture, working on it
Originally committed as revision 10686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 12:23:00 +00:00
Baptiste Coudurier
6aacfd22ab dnxhd 120 interlaced support
Originally committed as revision 10063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-10 19:23:14 +00:00
Baptiste Coudurier
d3dc629c62 move dnxhd data tables to separate file
Originally committed as revision 9906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 13:41:33 +00:00