1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

64 Commits

Author SHA1 Message Date
Michael Niedermayer
0edf7ebcd6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: clear trailing bits in partially parsed NAL units
  vc1: Handle WVC1 interlaced stream
  xl: Fix overreads
  mpegts: rename payload_index to payload_size
  segment: introduce segmented chain muxer
  lavu: add AVERROR_BUG error value
  avplay: clear pkt_temp when pkt is freed.
  qcelpdec: K&R formatting cosmetics
  qcelpdec: cosmetics: drop some pointless parentheses
  x86: conditionally compile dnxhd encoder optimizations
  Revert "h264: skip start code search if the size of the nal unit is known"
  swscale: fix formatting and indentation of unscaled conversion routines.
  h264: skip start code search if the size of the nal unit is known
  cljr: fix buf_size sanity check
  cljr: Check if width and height are positive integers

Conflicts:
	libavcodec/cljr.c
	libavcodec/vc1dec.c
	libavformat/Makefile
	libavformat/mpegtsenc.c
	libavformat/segment.c
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-20 04:12:09 +01:00
Asen Lekov
25c2d76b68 qcelpdec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-12-19 16:22:30 +01:00
Diego Biurrun
2fd291846b qcelpdec: cosmetics: drop some pointless parentheses 2011-12-19 16:22:11 +01:00
Michael Niedermayer
e4de71677f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aac_latm: reconfigure decoder on audio specific config changes
  latmdec: fix audio specific config parsing
  Add avcodec_decode_audio4().
  avcodec: change number of plane pointers from 4 to 8 at next major bump.
  Update developers documentation with coding conventions.
  svq1dec: avoid undefined get_bits(0) call
  ARM: h264dsp_neon cosmetics
  ARM: make some NEON macros reusable
  Do not memcpy raw video frames when using null muxer
  fate: update asf seektest
  vp8: flush buffers on size changes.
  doc: improve general documentation for MacOSX
  asf: use packet dts as approximation of pts
  asf: do not call av_read_frame
  rtsp: Initialize the media_type_mask in the rtp guessing demuxer
  Cleaned up alacenc.c

Conflicts:
	doc/APIchanges
	doc/developer.texi
	libavcodec/8svx.c
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/nellymoserdec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/asfdec.c
	tests/ref/seek/lavf_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03 03:00:30 +01:00
Justin Ruggles
0eea212943 Add avcodec_decode_audio4().
Deprecate avcodec_decode_audio3().
Implement audio support in avcodec_default_get_buffer().
Implement the new audio decoder API in all audio decoders.
2011-12-02 17:40:40 -05:00
Michael Niedermayer
ec1ffae0cd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements.
  qcelp: check output buffer size before decoding
  qcelpdec: fix the return value of qcelp_decode_frame().
  sipr: fix the output data size check and only calculate it once.
  Synchronize various 4CCs and codec tags from FFmpeg.
  qdm2: check output buffer size before decoding
  Fix out of bound reads in the QDM2 decoder.
  Check for out of bound writes in the QDM2 decoder.
  ogg/celt: do not set sample_fmt in the demuxer

Conflicts:
	libavcodec/avcodec.h
	libavcodec/qdm2.c
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-05 04:07:59 +02:00
Justin Ruggles
dd376b1a12 qcelpdec: cosmetics: do not add line break before opening bracket in 'for',
'while', 'if/else', and 'switch' statements.

also fixes some spacing, but only if already changing a line
2011-10-04 17:10:11 -04:00
Justin Ruggles
e43dd3d2a8 qcelp: check output buffer size before decoding 2011-10-04 17:10:11 -04:00
Chris Rankin
bde2570013 qcelpdec: fix the return value of qcelp_decode_frame().
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2011-10-04 17:09:53 -04:00
Chris Rankin
04c13dca88 qcelpdec: fix the return value of qcelp_decode_frame(). 2011-09-08 21:20:50 +02:00
Michael Niedermayer
686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Diego Biurrun
adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-24 00:37:49 +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 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
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
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
Måns Rullgård
48966b02cb Grammar fixes
Originally committed as revision 23961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 00:03:48 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Ronald S. Bultje
b1078e9fe6 Move clipping of audio samples (for those codecs outputting float) from decoder
to the audio conversion routines.

Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 17:57:48 +00:00
Ronald S. Bultje
805a83d506 Implement QCELP postfilter.
Originally committed as revision 22935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 17:50:08 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Vitor Sessak
0e426b7a6c Reindent after last commit
Originally committed as revision 21019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 19:26:08 +00:00
Vitor Sessak
846b231643 Add missing "static" qualifier
Originally committed as revision 21018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 19:25:44 +00:00
Vitor Sessak
e26d131845 Do not hardcode filter order in ff_acelp_lspd2lpc()
Originally committed as revision 20485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-09 12:06:19 +00:00
Reynaldo H. Verdejo Pinochet
0c50f8e6cc Implement ff_scale_vector_to_given_sum_of_squares()
to aid generic gain control routines. Changes
for qcelp are included. Patch Collin McQuillan.

Originally committed as revision 20450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-04 19:29:29 +00:00
Colin McQuillan
33ae681f5c Expose QCELP's floating-point LSP-to-LPC function
qcelp_lsp exported a single function, ff_acelp_lspd2lpc, which was not
specific to qcelp. It can be kept with its fixed-point version
ff_acelp_lsp2lpc in lpc.c.

Patch by Colin McQuillan ( m.niloc googlemail com )

Originally committed as revision 19571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-03 08:37:02 +00:00
Colin McQuillan
1e1e02eacd Make the LSP naming more consistent
Use the convention from lsp.c: an LSF is a frequency, an LSP is the
cosine of an LSF, and LSP functions should have an ff_acelp prefix.
Use a "d" suffix to specify doubles.

Patch by Colin McQuillan ( m.niloc googlemail com )

Originally committed as revision 19570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-03 08:31:20 +00:00
Ronald S. Bultje
ce863d7f36 Rename ff_log_missing_feature() to av_log_missing_feature().
Originally committed as revision 19294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 19:07:04 +00:00
Diego Biurrun
e19f995263 Fix bandwith vs. bandwiDth typo.
Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 23:40:22 +00:00
Kenan Gillet
5b05059d2d Properly handle SILENCE frame. Patch by Kenan Gillet.
Originally committed as revision 18734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-04 03:25:57 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Kenan Gillet
809e07c618 Move scale factor computation to its own function. Patch by Kenan
Gillet.

Originally committed as revision 18345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 01:39:17 +00:00
Kenan Gillet
3c00556f4b Add missing static qualifier from function declaration. Patch by Kenan
Gillet.

Originally committed as revision 18331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-04 16:27:54 +00:00
Reynaldo H. Verdejo Pinochet
d2af569710 Cosmetics from Kenan Gillet's 'extract and share weighted_vector_sumf'
patchset. Just a reindent.

Originally committed as revision 17917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 22:00:35 +00:00
Reynaldo H. Verdejo Pinochet
95e8325771 Functional part Kenan Gillet's 'extract and share weighted_vector_sumf'
patchset. Idea is to share this common code between the AMR and QCELP
decoders.

Originally committed as revision 17916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 21:55:24 +00:00
Reynaldo H. Verdejo Pinochet
87574416f7 Part 2 of 2 of Kenan Gillet's 'make ff_qcelp_lspf2lpc
more general' changeset. This one relocates the QCELP
especific code to the qcelpdec.* files.

Originally committed as revision 17800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 01:33:56 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Kenan Gillet
0ba39dd1a9 Split ff_log_missing_feature into ff_log_missing_feature
and ff_log_ask_for_sample.
Patch by Kenan Gillet: gmail_adress(author)

Originally committed as revision 16637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 16:20:42 +00:00
Carl Eugen Hoyos
3a095bee2b Silence one warning when compiling with icc:
warning #188: enumerated type mixed with another type
      if((q->bitrate = determine_bitrate(avctx, buf_size, &buf)) == I_F_Q)
                     ^

Originally committed as revision 16374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 19:44:47 +00:00
Reynaldo H. Verdejo Pinochet
a3636fa033 COSMETICS Part 3 and final of Kenan Gillet's QCELP silence handling patch.
Originally committed as revision 16338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:50:21 +00:00
Reynaldo H. Verdejo Pinochet
4f54fb54e3 Part 2 of Kenan Gillet's QCELP silence handling patch.
Originally committed as revision 16337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:49:06 +00:00
Reynaldo H. Verdejo Pinochet
3f16ed15df Cosmetics by Kenan Gillet. Part 1 of 3 of his 'qcelp: silence handling'
changeset.

Originally committed as revision 16244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-20 02:38:34 +00:00
Kenan Gillet
5a3e9f2c80 Avoid the 'Claimed bitrate and buffer size mismatch' warning storm.
- Patch by Kenan Gillet

Originally committed as revision 16046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 00:11:02 +00:00
Stefano Sabatini
dbbec0c2f2 Make av_log_missing_feature an internal function, and change its name
to ff_log_missing_feature.

Originally committed as revision 16037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-08 21:21:38 +00:00
Vitor Sessak
6e74619e5e Silence some ICC warnings. Patch by Vitor Sessak.
Originally committed as revision 16006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 20:24:22 +00:00
Reynaldo H. Verdejo Pinochet
87a9173679 Add expected const qualifier on 'buf' to match AVCodec.decode's declaration.
This change gets rid of another compiler warning.

Originally committed as revision 16005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 15:08:44 +00:00
Reynaldo H. Verdejo Pinochet
9e00c20e00 COSMETICS, add missing remarks crediting Ben and Kenan
Originally committed as revision 16003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 14:54:55 +00:00
Reynaldo H. Verdejo Pinochet
b12c76277b Removes misleading const qualifier, gets rid of two compiler warnings
Originally committed as revision 15997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 01:38:12 +00:00