Nicolas George
25e87fc5f6
ffmpeg: move keyboard interaction in a function.
...
It makes the transcode loop easier to read (30% less code)
and the differences with avconv easier to spot.
13 years ago
Philip Langdale
92c065f93f
ffmpeg: Set duration on encoded subtitle packets.
...
Currently, we don't set the duration on the packet of a newly
encoded subtitle. This information may be required by the
muxer.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Reimar Döffinger
93147daf59
ffmpeg: avoid a confusing and easy to break if().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
c8a11014b6
ffmpeg: use isatty() before messing with the terminal state
...
This fixes terminal messup in case of crashes (like in make fate)
Reviewed-by: François Revol <revol@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
df03ae8dd8
ffmpeg: remove two unused variables.
13 years ago
Michael Niedermayer
02ff89a1cd
ffmpeg: disable audio volume insertion on the output side.
...
This fixes -vol leading to 2 inserted volume filters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
c790ae0265
ffmpeg: add missing return carriage in error message.
13 years ago
Clément Bœsch
6b35f1a2a6
timecode: move timecode muxer options to metadata.
...
Some demuxers set a timecode in the format or streams metadata. The
muxers now make use of this metadata instead of a duplicated private
option.
This makes possible transparent copy of the timecode when transmuxing
and transcoding.
-timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The
global ffmpeg -timecode option will set it anyway so no option change
visible for the user.
13 years ago
Stefano Sabatini
f1add01d98
ffmpeg: be more verbose when printing an error in transcode()
...
Helps debuggability.
13 years ago
Stefano Sabatini
6a9854e8f4
ffmpeg: specify more meaningful names for the lavfi buffer sources
13 years ago
Nicolas George
8b0e173529
ffmpeg: use filter time base as codec time base.
13 years ago
Nicolas George
48b5bcb3dd
ffmpeg: avoid NULL dereference with filters.
...
icodec can be NULL if there is no input stream
clearly associated with the output stream.
13 years ago
Michael Niedermayer
d43812e235
ffmpeg: move pan filter insertion up.
...
This fixes one (disabled) fate test.
Thanks-to: ubitux to pointing at the odd filter order and stereo/mono messup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
23b365f1c4
ffmpeg: fix memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
60de761657
ffmpeg: allow overriding input top field first
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
96fe99cb11
ffmpeg: disable autoinsertion for -async on the output side of the filtergraph.
...
This fixes the issue that since the last merge -async caused 2 aresample
filters to be inserted
users that generate funny timestamps in a filtergraph should probably
manually insert a aresample filter where they need it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
d187e7616e
ffmpeg: use %f instead of %lf in volume args format printf.
...
%f refers to a double argument already.
13 years ago
Clément Bœsch
d8e075b1a0
ffmpeg: use AUTO_INSERT_FILTER() for -async option.
13 years ago
Matthieu Bouron
432fe9a38a
ffmpeg: fix a crash with complex filters when pix_fmt is not specified
...
ffmpeg -i in.mxf -filter_complex "[0:0]fieldorder=tff" out.wav will
fail with an error message instead of crashing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
318e395764
ffmpeg: drop get_sync_ipts() and drop related special case for video
...
Idea found in a commit from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
cf9812d22b
ffmpeg: move setting big_picture.pts up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
bf3dce6b59
ffmpeg: change AVFMT_RAWPICTURE pts to reduce diff to qatar
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
13c254a216
ffmpeg: random cosmectics to reduce diff to qatar
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
9ce3d03fc2
ffmpeg: cosmetics to reduce difference to qatar by 101 lines
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
3ba90d9e97
ffmpeg: cosmetics to reduce difference to qatar by about 90 lines
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
c53326afad
ffmpeg: move ost->frame_rate setting code before the filtergraph stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
953df5d962
ffmpeg: drop pkt_pts
...
Reduces diff to qatar by 9 lines
Should not change anything
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
ef7ac8e8ec
ffmpeg: set the video filters timebase to the demuxers.
...
Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
3cf5591344
ffmpeg: reintroducing check_recording_time()
...
This reduces the difference to qatar by 27 lines
No functional change, the code should be unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
8364cb9719
ffmpeg: fix uninitialized variable warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
9d30a96aa1
ffmpeg: inject a aresample filter for -async
...
Based on similar code from anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
eb945ab484
ffmpeg: misc cosmetics.
...
Reduce diff against avconv, and change some doxycomments into normal
comments (no point in doxifying ffmpeg internal fields).
13 years ago
Nicolas George
00be2f5726
ffmpeg: adapt to the buffersrc API changes.
13 years ago
Michael Niedermayer
48a40e09c4
ffmpeg: fix warning & bug for keep_pix_fmt
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
7f8bd16103
ffmpeg: remove unused variable i.
13 years ago
Clément Bœsch
9e2cee5770
ffmpeg: do not deprecate -vol and -map_channel.
...
These helpers are handy, just notice the user it is done using lavfi.
13 years ago
Clément Bœsch
fa29ca5f55
ffmpeg: resurrect -map_channel.
13 years ago
Clément Bœsch
a99a3b1bb3
ffmpeg: automatically insert volume filter when -vol is used.
...
Deprecate -vol.
Inspired by asyncts auto-insert patch from Anton Khirnov.
13 years ago
Michael Niedermayer
22a3a5ee0c
ffmpeg: use av_buffersrc_add_frame() for audio too
...
fixes a memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
1bca73cf18
ffmpeg: do not warn when expecting EOF from lavfi.
13 years ago
Michael Niedermayer
7d12109542
ffmpeg: fix ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
3c0013213e
ffmpeg: move audio timestamp roundup code.
...
This fixes a regression which lead to non monotone timestamps
at the end of a file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
fc49f22c3b
ffmpeg: add support for audio filters.
...
Some of the FATE changes are due to off-by-one different rounding being used
(lrintf vs av_rescale_q).
Some fate changes are due to 1 audio frame less being encoded (the new variant seems
matching what qatar does and according to ffprobe its closer to the requested duration)
the mapchan feature sadly is lost in this commit because it depends on resampling
being done in ffmpeg.c which is now moved completely into the av filter layer
-async is broken after this commit, this will be fixed in subsequent commits
the new filter reconfiguration system is flawed and will drop a frame on each
parameter change which is why the nelly moser checksums need updating.
Conflicts:
ffmpeg.c
tests/ref/fate/smjpeg
13 years ago
Michael Niedermayer
6579bc439b
ffmpeg: allow switching to qatars buffersrc API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Matthieu Bouron
4c73b3b1e0
ffmpeg: affect computed filtered frame pts after filling frame from buffer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Nicolas George
9cf5bcded0
ffmpeg: accept + prefix to -pix_fmt option to disable automatic conversions.
13 years ago
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>
13 years ago
Michael Niedermayer
70e9308dec
ffmpeg: preserve bits_per_coded sample on stream copy.
...
Fixes Ticket1124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
8616c44606
ffmpeg: fix deinterlace
...
Fixes ticket1295
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
b7fe9c7a08
ffmpeg: fix pointer type (const) warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago