Commit Graph

40961 Commits

Author SHA1 Message Date
Matthieu Bouron
4c73b3b1e0 ffmpeg: affect computed filtered frame pts after filling frame from buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 23:40:46 +02:00
Marton Balint
94a9ac1277 lavf: add av_guess_frame_sample_aspect_ratio function
Guesses the sample aspect ratio of a frame, based on both the stream and the
frame aspect ratio.

Since the frame aspect ratio is set by the codec but the stream aspect ratio
is set by the demuxer, these two may not be equal. This function tries to
return the value that you should use if you would like to display the frame.

Basic logic is to use the stream aspect ratio if it is set to something sane
otherwise use the frame aspect ratio. This way a container setting, which is
usually easy to modify can override the coded value in the frames.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 23:40:46 +02:00
Mans Rullgard
b1c1d7dae7 fate: separate sierra-vmd audio and video tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 21:38:28 +01:00
Mans Rullgard
0b1c868508 fate: separate smacker audio and video tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 21:38:28 +01:00
Anton Khirnov
e6694659fc libmp3lame: set supported channel layouts. 2012-05-14 21:36:11 +02:00
Anton Khirnov
6eeb9a0433 avconv: automatically insert asyncts when -async is used.
Deprecate -async.
2012-05-14 21:36:11 +02:00
Anton Khirnov
369cb092ec avconv: add support for audio filters.
The FATE changes are all off-by-one due to different rounding being used
(lrintf vs av_rescale_q).
2012-05-14 21:36:11 +02:00
Anton Khirnov
9f26421b0b lavfi: add asyncts filter. 2012-05-14 21:36:11 +02:00
Anton Khirnov
fb604ae850 lavfi: add aformat filter
Based on a patch by Mina Nagy Zaki <mnzaki@gmail.com>
2012-05-14 21:36:11 +02:00
Anton Khirnov
a2cd9be212 lavfi: add an audio buffer sink. 2012-05-14 21:36:11 +02:00
Anton Khirnov
4c66c40718 lavfi: add an audio buffer source. 2012-05-14 21:36:11 +02:00
Anton Khirnov
720c6b78d1 buffersrc: add av_buffersrc_write_frame().
It's the same as av_vsrc_buffer_add_frame(), except it doesn't take pts
or pixel_aspect parameters. Those are read from AVFrame.

Deprecate av_vsrc_buffer_add_frame().
2012-05-14 21:36:11 +02:00
Anton Khirnov
8b05e13df3 buffersrc: fix invalid read in uninit if the fifo hasn't been allocated 2012-05-14 21:36:10 +02:00
Anton Khirnov
fad729fa50 lavfi: rename vsrc_buffer.c to buffersrc.c
Most of the code will be shared for both audio and video version.
2012-05-14 21:36:10 +02:00
Anton Khirnov
fd127ede62 avfiltergraph: reindent 2012-05-14 21:36:10 +02:00
Anton Khirnov
ff1f51a8aa lavfi: add channel layout/sample rate negotiation. 2012-05-14 21:36:10 +02:00
Anton Khirnov
5775a1832c lavfi: add types and functions for channel layout/samplerate negotiation 2012-05-14 21:36:10 +02:00
Robert Nagy
394a0267ab yadif: Flush filter on eof.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-05-14 21:36:10 +02:00
Robert Nagy
7dd56d411e yadif: Improve pts accuracy.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-05-14 21:36:10 +02:00
Nicolas George
9cf5bcded0 ffmpeg: accept + prefix to -pix_fmt option to disable automatic conversions. 2012-05-14 21:29:58 +02:00
Nicolas George
440af105f2 lavfi: add avfilter_graph_set_auto_convert(). 2012-05-14 21:29:58 +02:00
Mans Rullgard
7c6d240665 mtv: do not byteswap raw video in demuxer
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 20:26:39 +01:00
Michael Niedermayer
7e944159c6 Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
  vcr1: Add vcr1_ prefixes to all static functions with generic names.
  vcr1: Fix return type of common_init to match the function pointer signature.
  vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
  motion-test: remove disabled code
  gxfenc: remove disabled half-implemented MJPEG tag
  x86: use more standard construct for setting ASM functions in FFT code
  fate: westwood-aud: disable decoding
  fate: caf: disable decoding
  fate: film-cvid: drop pcm audio and rename test
  fate: d-cinema-demux: drop unnecessary flags
  fate: split off dpcm-interplay from interplay-mve tests
  fate: rename funcom-iss to adpcm-ima-iss
  fate: rename cryo-apc to adpcm-ima-apc
  fate: rename adpcm-psx-str-v3 to adpcm-xa
  fate: split off adpcm-ms-mono test from dxa-feeble
  fate: split off adpcm-ima-ws test from vqa-cc
  fate: add adpcm-ima-smjpeg test
  fate: split off adpcm-ima-amv from amv test
  fate: separate bmv audio and video tests
  fate: separate delphine-cin audio and video tests
  ...

Conflicts:
	doc/platform.texi
	libavcodec/vcr1.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/ref/fate/ea-mad-pcm-planar
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mtv
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/qtrle-2bit
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/vqa-cc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 20:17:24 +02:00
Nicolas George
281bde2789 udp: check for HAVE_PTHREAD_CANCEL instead of HAVE_PTHREADS.
Some environments, for example Android, pretend to have pthreads
but actually have only a partial implementation.
2012-05-14 19:32:43 +02:00
Nicolas George
83f954e859 configure: check for pthread_cancel. 2012-05-14 19:32:43 +02:00
Clément Bœsch
b545b947dd ffprobe: replace fast_asprintf() with bprint utils.
Also remove the unused print_fmt_opt() in the process.
2012-05-14 19:11:39 +02:00
Clément Bœsch
9548deeea9 lavu/bprint: add av_bprint_reset(). 2012-05-14 19:11:39 +02:00
Nicolas George
7a44223319 lavfi: document filter design subtleties.
The details on reference ownership and permissions are missing.
2012-05-14 18:56:52 +02:00
Janne Grunau
31f2c0231f avprobe: free options at the end of main() 2012-05-14 18:37:20 +02:00
Janne Grunau
093c50a4f6 avprobe: close opened codecs after use
Fixes "memleak" on closing avprobe to make valgrind happy.
2012-05-14 18:37:20 +02:00
Michael Niedermayer
381cc4b1e6 update_initial_durations: use av_ts2str()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 17:51:05 +02:00
Michael Niedermayer
c69b6649cf update_initial_durations: add some checks to ensure things match up.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 17:14:44 +02:00
Diego Biurrun
100c70b048 vcr1: Add vcr1_ prefixes to all static functions with generic names. 2012-05-14 16:19:16 +02:00
Diego Biurrun
a761e5951c vcr1: Fix return type of common_init to match the function pointer signature.
libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type
2012-05-14 16:19:16 +02:00
Diego Biurrun
55da88c5ab vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits. 2012-05-14 16:19:14 +02:00
Diego Biurrun
5aad8e80a7 motion-test: remove disabled code 2012-05-14 15:38:43 +02:00
Diego Biurrun
70be4dddc8 gxfenc: remove disabled half-implemented MJPEG tag 2012-05-14 15:38:42 +02:00
Vitor Sessak
fcc456b829 x86: use more standard construct for setting ASM functions in FFT code
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-05-14 15:38:42 +02:00
Michael Niedermayer
6d49e819be ffmpeg: revert 492cc1
This restores correct block_align values in case of stream copy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 15:15:11 +02:00
Michael Niedermayer
8443082db6 ogg: rewrite first timestamp reading code.
this is simpler and closer to how timestamps are found for seeking.

Fixes Ticket1186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 14:15:34 +02:00
Michael Niedermayer
5931c754b8 ogg: in ogg_get_length() start from data_offset not 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14 14:15:34 +02:00
Mans Rullgard
09a35f251a fate: westwood-aud: disable decoding
The codec (adpcm-ima-ws) is tested elsewhere.  Using framecrc output
provides more information than a single md5 if something goes wrong.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:06:05 +01:00
Mans Rullgard
f70d91e268 fate: caf: disable decoding
This is intended as a demuxer test and the file contains pcm_s16be
audio which is tested elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:05:30 +01:00
Mans Rullgard
b809991a31 fate: film-cvid: drop pcm audio and rename test
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:05:07 +01:00
Mans Rullgard
0bbb330ee3 fate: d-cinema-demux: drop unnecessary flags
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:04:20 +01:00
Mans Rullgard
cd7b82c5d1 fate: split off dpcm-interplay from interplay-mve tests
These two files use the same audio codec so only one test for
this is needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:02:02 +01:00
Mans Rullgard
838521e110 fate: rename funcom-iss to adpcm-ima-iss
This matches the name of the codec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:01:01 +01:00
Mans Rullgard
9656b7f2ae fate: rename cryo-apc to adpcm-ima-apc
This matches the name of the tested codec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 13:00:26 +01:00
Mans Rullgard
773459e757 fate: rename adpcm-psx-str-v3 to adpcm-xa
This matches the name of the codec tested.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 12:56:06 +01:00
Mans Rullgard
6a64ff74fe fate: split off adpcm-ms-mono test from dxa-feeble
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-14 12:55:47 +01:00