b3b505c73b
avformat/utils: if the id3 tag is too large for data after it to become available, use the full AVPROBE_SCORE_EXTENSION if extension matches
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-12 20:45:36 +02:00
d05588e21e
avformat/utils: limit probe score in the id3 case only if there is a chance that data after the id3 tag will become available
...
Fixes ticket3327 (sample.mp3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-12 20:45:03 +02:00
134206ca7a
avformat/utils: fix const warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-07 06:15:02 +02:00
dcbfb7805a
probe: Support AAC_LATM in set_codec_from_probe_data
2014-05-03 18:51:37 +02:00
a215b15815
avformat/utils: Set the average frame rate from the r_frame_rate if the stream appears to be cfr
...
This permits the average fps to be set in more cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-28 18:51:15 +02:00
34e7d3c368
avformat/utils: Ensure that average fps is probed if requested by the user even if tb_unreliable() is 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-28 16:30:50 +02:00
1f249d2ca7
avformat/utils: prevent r frame rate from being set larger than 1/tb
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-28 15:49:51 +02:00
4394f82f52
avformat/utils: add gif to tb_unreliable()
...
This improves the used timebases when gif is the source
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-28 15:20:38 +02:00
1eb57e1d9b
lavc: eliminate tb_unreliable()
...
If framerate estimation is enabled, it makes sense to always apply it,
instead of limiting it to a few specific cases.
2014-04-28 11:34:59 +02:00
8064c6ac5f
Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'
...
* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
lavf: do not use the parser duration for video
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-22 13:56:29 +02:00
f9157463db
lavf: do not use the parser duration for video
...
The parser has no way of knowing video duration, and therefore no video
parsers set it.
2014-04-22 07:46:03 +02:00
f3743901d7
avformat: Fix decoder search in find stream info
...
Fixes Ticket3548
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-21 05:27:08 +02:00
5331773cc3
ff_id3v2_read: add option to limit ID3 magic number search
...
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.
[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
Fixes ticket #3530 .
Signed-off-by: Peter Ross <pross@xvid.org >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 04:25:01 +02:00
083b6e739b
avformat/utils: fix typo
...
Found-by: reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-15 13:51:48 +02:00
ef818d8bf0
avformat: add av_format_inject_global_side_data(), and disable it by default
...
After this commit applications needs to call av_format_inject_global_side_data()
or handle AVStream side data by some other means if they want it not to be lost.
This fixes a API incompatibility with libav.
libav API does not allow the data to be passed through AVPackets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-15 02:37:40 +02:00
82796aacab
avformat/utils: reinject global side data on seeks
...
This fixes ffplay replaygain with seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-13 18:27:05 +02:00
c0d62d999d
avformat/utils: factorize if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-13 18:02:42 +02:00
289f02f923
avformat/utils: Inject global side data into first packet.
...
This fixes replaygain handling in ffplay and probably other applications.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-13 18:02:05 +02:00
e1c48e3593
lavf/utils: fix mem leak
...
Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-10 03:24:07 +02:00
9f4ab4e5f9
Show stream number when warning about stream without start time.
2014-04-05 01:15:12 +02:00
74aeb6b584
libavformat/utils.c: av_pkt_dump_log2: use const pointers
...
Use const pointers to AVPacket and AVStream.
Signed-off-by: Roman Fietze <roman.fietze@telemotive.de >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-03 13:31:13 +02:00
595ba3b962
Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'
...
* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
lavf: add an AVStream field for exporting stream-global side data
Conflicts:
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 13:41:49 +01:00
25b3258656
lavf: add an AVStream field for exporting stream-global side data
2014-03-24 06:07:51 +01:00
bb6de15d92
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: Match stream id
Conflicts:
cmdutils.c
doc/fftools-common-opts.texi
See: ea07063fd8michaelni@gmx.at >
2014-03-13 14:21:27 +01:00
85e1368f57
Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'
...
* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
avformat: Report the duration analysis reached
Conflicts:
libavformat/utils.c
See: 8529f9b36bmichaelni@gmx.at >
2014-03-12 02:11:47 +01:00
db9d39b4b5
avformat: Report the duration analysis reached
2014-03-11 21:55:11 +01:00
2dcaa1b9d1
avformat/utils: detect MPEG streams with faulty DTS and discard affected DTS
...
Fixes issue2.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-03 02:27:07 +01:00
3c096751ff
avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too large but the correct one is constant
...
Fixes issue1.m2ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-22 14:31:23 +01:00
d4dfa97ae3
avformat/utils: reset pts_buffer in estimate_timings_from_pts()
...
This fixes the first few dts after find_stream_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-22 14:31:23 +01:00
f288e1b67c
avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-22 14:31:23 +01:00
f5fe6a4f79
Do not warn about missing start time for unknown streams.
2014-02-21 17:27:37 +01:00
1f7e9be0b0
Only complain about missing frame rate for video streams.
2014-02-21 17:27:20 +01:00
2969fb4393
avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate has a comparably unlikely value
...
Fixes Ticket3399
Fixes Ticket2958
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-19 18:40:27 +01:00
480af3a35c
avformat/utils: skip the MPEG-2 style dts/pts code for HEVC
...
This extends the exception from H264 to H264 + HEVC
Fixes Ticket3385
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-14 20:51:10 +01:00
6421111b52
lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams
...
Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.
Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.
Signed-off-by: Marton Balint <cus@passwd.hu >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-10 12:58:59 +01:00
073e771c9c
Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
...
* commit '33c859c142ef3f49b7a6227014ad92a680cf4d74':
lavf: ignore attachment streams for interleaving purposes
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-04 15:37:05 +01:00
33c859c142
lavf: ignore attachment streams for interleaving purposes
...
Those streams should never get any packets by definition.
2014-02-04 11:17:06 +01:00
8658390336
libavformat/utils.c: Cosmetics: Fix incorrect comma placement
2014-02-03 11:35:19 +01:00
1bc2fa447c
avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1
...
This makes the code clearer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-02 23:50:00 +01:00
9f6f4962fb
avformat/utils: dvd still frames read thru libdvdnav ended up in internal lavf buffer
...
This is the solution we've been using in XBMC for over 2 years for dvd still frames.
The problem is that the demuxer asks for probing of the codec in the mpeg stream.
This causes lavf to read the whole menu structure into internal buffers.
After which, it won't read from input stream anymore and no events triggers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-02 23:40:06 +01:00
16097efb8c
Auto-detect hevc in mpeg-ts.
...
Fixes decoding of files without PMT/PAT.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at >
2014-01-31 19:05:08 +01:00
e53ec2fe38
Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'
...
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-31 14:58:28 +01:00
78987a88a8
lavf: include 60 fps in guessed standard frame rates
...
Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().
2014-01-31 11:09:10 +01:00
72afa381b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-29 23:40:51 +01:00
d67cfdeb53
avformat: utils: Refactor duplicated PRINT macro
2014-01-29 17:04:35 +01:00
102bd64168
lavd: add avdevice_dev_to_app_control_message API
...
New API allows to send messages from devices to application.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
2014-01-27 15:18:17 +01:00
896d6a7736
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
...
* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
avformat: utils: K&R formatting cosmetics
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-26 23:35:38 +01:00
50ecf15712
avformat: utils: K&R formatting cosmetics
...
Also adjust some comment wording / spelling and reorder header #includes.
2014-01-26 18:09:00 +01:00
86bee7984e
AVFormatContext: add metadata_header_padding field
...
This field is used to store the number of bytes that should be written
as padding to a metadata header of a file. For example:
- The FLAC format's METADATA_BLOCK_PADDING [1]
- The ID3v2 tag format's padding [2]
[1] http://xiph.org/flac/format.html#metadata_block_padding
[2] http://id3.org/id3v2.3.0#ID3v2_overview
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-24 22:33:21 +01:00
cb36e441de
Never favour an audio stream with 0 channels in av_find_best_stream().
...
Fixes ticket #3311 .
2014-01-16 00:36:27 +01:00
