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

42693 Commits

Author SHA1 Message Date
Nicolas George b0629366a2 lavf: make cmdutils's check_stream_specifier public. 
The new function is called avformat_match_stream_specifier()
and does not include logging the error message.
 2012-07-20 13:16:23 +02:00
Stefano Sabatini 3bd3e46c91 doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section 2012-07-20 12:56:28 +02:00
Nicolas George b34ce5a26b faq: explain dependency problems with static libs. 2012-07-20 11:40:26 +02:00
Nicolas George 30549294ef matroska: add support for Opus. 
Opus in Matroska is still a draft.
 2012-07-20 11:19:01 +02:00
Nicolas George a6cf296bd9 lavc: Opus decoder using libopus. 2012-07-20 11:18:58 +02:00
Nicolas George e62fd6619f oggdec: add support for Opus codec. 
This patch also introduces CODEC_ID_OPUS.
 2012-07-20 11:16:52 +02:00
Nicolas George bf8ce5a5c3 ffmpeg: probe buffersinks once more after EOF. 
Reap buffers stored in the buffer sinks even when
the avfilter_graph_request_oldest() loop only returns EOF.

avfilter_graph_request_oldest() can cause frames to arrive
to the sinks even when it returns EOF.
 2012-07-20 10:18:45 +02:00
Michael Niedermayer 5e99df019a alacdec: several players have problems with planar audio still thus temporary put packed output back by default 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 04:48:25 +02:00
Michael Niedermayer e2c96fbf3e ffplay: fix warning that i just mistakenly introduced 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 03:47:11 +02:00
Michael Niedermayer cdafec69ce ffplay: fix planar audio 
This caused ALAC to fail since the last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 03:41:17 +02:00
Stefano Sabatini 7e17389c1e lavd/sdl: use verb in options help message 
An help message tells what an option does, not what its argument is.
 2012-07-19 23:56:59 +02:00
Nicolas George 885fc05865 lavf: count skipped samples for initial timestamps. 
If skip_samples is set and timestamps are synthesized using durations,
make them start at -skip_samples (rescaled) instead of 0,
so that the timestamp of the first undiscarded sample is 0.
 2012-07-19 23:41:03 +02:00
Nicolas George cd08900393 lavc: update pkt_duration for skipped samples. 
Also: factor the the computation of the timestamp difference.
 2012-07-19 23:41:03 +02:00
Nicolas George d853ed46b1 Revert "ffmpeg: set pkt_timebase" 
This reverts commit 744bd8d08c.

pkt_timebase is now set by av_codec_set_pkt_timebase.
If some demuxer set AVStream.time_base directly,
it need to be fixed. There is a warning to detect it.
 2012-07-19 23:41:03 +02:00
Nicolas George 0e57d79b0c lavf: set pkt_timebase at the same time as stream->time_base. 2012-07-19 23:41:03 +02:00
Nicolas George 0e18ac5611 lavc: warn when impossible to adjust timestamps for skipped samples. 
It is likely to happen if pkt_timebase was not set.
 2012-07-19 23:41:03 +02:00
Nicolas George 11ce1cf9a7 lavc: add debug info about skipped samples. 2012-07-19 23:41:03 +02:00
Michael Niedermayer e4c00aca96 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (38 commits)
  alac: cosmetics: general pretty-printing and comment clean up
  alac: calculate buffer size outside the loop in allocate_buffers()
  alac: change some data types to plain int
  alac: cosmetics: rename some variables and function names
  alac: multi-channel decoding support
  alac: split element parsing into a separate function
  alac: support a read sample size of up to 32
  alac: output in planar sample format
  alac: add 32-bit decoding support
  alac: simplify channel interleaving
  alac: use AVPacket fields directly in alac_decode_frame()
  alac: fix check for valid max_samples_per_frame
  alac: use get_sbits() to read LPC coefficients instead of casting
  alac: move the current samples per frame to the ALACContext
  alac: avoid using a double-negative when checking if the frame is compressed
  alac: factor out output_size check in predictor_decompress_fir_adapt()
  alac: factor out loading of next decoded sample in LPC prediction
  alac: use index into buffer_out instead of incrementing the pointer
  alac: simplify lpc coefficient adaptation
  alac: reduce the number of local variables needed in lpc prediction
  ...

Conflicts:
	libavcodec/alac.c
	libavformat/cafdec.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-19 23:31:04 +02:00
Stefano Sabatini a8d8e868c6 lavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options are not supported 
They are only supported if pthread is available.
 2012-07-19 22:48:09 +02:00
Stefano Sabatini e1422940f2 doc/protocols: add a note regarding the circular RX UDP buffer 2012-07-19 22:31:41 +02:00
Stefano Sabatini 6b80f75848 doc/protocols: apply misc fixes to the UDP protocol section 2012-07-19 22:31:41 +02:00
Stefano Sabatini dd13da67b2 doc/protocols: extend/clarify documentation for the buffer_size UDP option 2012-07-19 22:31:41 +02:00
Stefano Sabatini 469b9ce83f doc/protocols: document "fifo_size" and "overrun_nonfatal" UDP options 
Address trac ticket #1511.
 2012-07-19 22:31:41 +02:00
Michael Niedermayer 85044358f6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Print full compiler identification, not only version number
  flacdec: reverse lpc coeff order, simplify filter
  x86: dsputil: drop some unused CPU flag debug code

Conflicts:
	cmdutils.c
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-19 22:01:31 +02:00
Justin Ruggles eeb55f5f2f alac: cosmetics: general pretty-printing and comment clean up 2012-07-19 13:26:48 -04:00
Justin Ruggles f3e5a7844b alac: calculate buffer size outside the loop in allocate_buffers() 2012-07-19 13:26:48 -04:00
Justin Ruggles bae83f2c74 alac: change some data types to plain int 2012-07-19 13:26:48 -04:00
Justin Ruggles 2aebac6918 alac: cosmetics: rename some variables and function names 2012-07-19 13:26:48 -04:00
Andrew D'Addesio 1b3ef155d7 alac: multi-channel decoding support 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-07-19 13:26:48 -04:00
Justin Ruggles 81c9e2e6d0 alac: split element parsing into a separate function 
This will make multi-channel implementation simpler.
Based partially on a patch by Andrew D'Addesio <modchipv12@gmail.com>.
 2012-07-19 13:26:48 -04:00
Justin Ruggles cd632619d9 alac: support a read sample size of up to 32 
Use get_bits_long() in decode_scalar().
Use unsigned int for decoded value.
 2012-07-19 13:26:48 -04:00
Justin Ruggles 73dc0db486 alac: output in planar sample format 
Avoids unneeded interleaving and allows for reusing the AVFrame output buffer
as the internal buffer for 24-bit and 32-bit sample size.
 2012-07-19 13:26:48 -04:00
Justin Ruggles 6482bd8831 alac: add 32-bit decoding support 2012-07-19 13:26:48 -04:00
Andrew D'Addesio 6cda74c155 alac: simplify channel interleaving 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-07-19 13:26:48 -04:00
Justin Ruggles 5138ff143f alac: use AVPacket fields directly in alac_decode_frame() 2012-07-19 13:26:47 -04:00
Justin Ruggles 7a206eb32f alac: fix check for valid max_samples_per_frame 2012-07-19 13:26:47 -04:00
Justin Ruggles 1193d3fedd alac: use get_sbits() to read LPC coefficients instead of casting 2012-07-19 13:26:47 -04:00
Justin Ruggles 7a50ec6799 alac: move the current samples per frame to the ALACContext 
This will simplify the multi-channel implementation.
 2012-07-19 13:26:47 -04:00
Justin Ruggles 46043962ea alac: avoid using a double-negative when checking if the frame is compressed 2012-07-19 13:26:47 -04:00
Justin Ruggles 9a6c528e08 alac: factor out output_size check in predictor_decompress_fir_adapt() 2012-07-19 13:26:47 -04:00
Justin Ruggles ebd4c3add1 alac: factor out loading of next decoded sample in LPC prediction 2012-07-19 13:26:47 -04:00
Justin Ruggles a4ecd41442 alac: use index into buffer_out instead of incrementing the pointer 2012-07-19 13:26:47 -04:00
Justin Ruggles f2515cd629 alac: simplify lpc coefficient adaptation 2012-07-19 13:26:47 -04:00
Justin Ruggles abc4376b31 alac: reduce the number of local variables needed in lpc prediction 2012-07-19 13:26:47 -04:00
Justin Ruggles 01880d287b alac: simplify 1st order prediction and reading of warm-up samples 2012-07-19 13:26:46 -04:00
Justin Ruggles d0c0bf0d3e alac: cosmetics: reindent after last commit 2012-07-19 13:26:46 -04:00
Justin Ruggles 79def4c523 alac: remove unneeded conditionals in predictor_decompress_fir_adapt() 2012-07-19 13:26:46 -04:00
Justin Ruggles 4bcd637dcb alac: use sizeof() instead of hardcoded data sizes 2012-07-19 13:26:46 -04:00
Justin Ruggles 91620a04f1 alac: make block_size signed 
It does not need to be unsigned.
 2012-07-19 13:26:46 -04:00
Justin Ruggles 2fc24b3273 alac: remove a duplicate local variable 2012-07-19 13:26:46 -04:00