Commit Graph

246 Commits

Author SHA1 Message Date
Wolfram Gloger
df7625ed62 av_estimate_timings_from_pts() flushes the packet queue but doesn't
reset the streams' cur_dts values.  This can lead to a fatal "error,
non monotone timestamps ..." message later, because the out-of-date
cur_dts values are used to compute some packet's dts.

Fix this by calling av_read_frame_flush() and eliminate code
duplication in the process.

The additional hunk gives more detailed error messages.

patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de

Originally committed as revision 8465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:48:10 +00:00
Michael Niedermayer
028d6f3e71 revert r8428, the check was not that useless
should fix constant pts=0 with broken demuxers

Originally committed as revision 8454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-20 13:59:59 +00:00
Michael Niedermayer
a843d1ff32 i think this is more correct
Originally committed as revision 8452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-20 13:01:39 +00:00
Michael Niedermayer
bc4efe42dd remove incorrect special case for audio
Originally committed as revision 8433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 14:44:22 +00:00
Michael Niedermayer
7e4baa66e0 fix indention
Originally committed as revision 8432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 14:29:00 +00:00
Michael Niedermayer
d9e1efb7f8 reorder pts into dts support
Originally committed as revision 8431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 14:27:01 +00:00
Michael Niedermayer
a7f7965a27 remove useless if()
Originally committed as revision 8428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 02:23:53 +00:00
Michael Niedermayer
14eb3345ba simplify
Originally committed as revision 8427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 02:03:59 +00:00
Michael Niedermayer
41c8a56a14 simplify
Originally committed as revision 8426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 01:21:40 +00:00
Michael Niedermayer
e25f97313f remove silly video check, theres nothing video specific in there
Originally committed as revision 8425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-16 23:02:33 +00:00
Michael Niedermayer
befe3b05d3 add a delay variable to hold the timestamp buffer size
set cur_dts correctly for delay>1

Originally committed as revision 8424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-16 22:59:45 +00:00
Michael Niedermayer
741887cf3e remove special case for h.264 whatever this was supposed to do its not correct
Originally committed as revision 8423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-16 22:31:57 +00:00
Panagiotis Issaris
750f0e1f8b Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 14:17:26 +00:00
Baptiste Coudurier
ea486ab3be remove codec_info_duration/nb_frames from AVStream
Originally committed as revision 8337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 10:59:47 +00:00
Panagiotis Issaris
3217cb424c Move the libavformat public API comments to avformat.h. The comments are
unmodified.

Originally committed as revision 8202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 12:23:20 +00:00
Kristian Amlie
0cbff0275b replace the auto array "duration_error" with a malloced array.
prevents stack overflow on some plateforms
patch by Kristian Amlie %kristian A gridmedia P com %
Original thread:
Date: Mar 1, 2007 11:29 PM
Subject: [Ffmpeg-devel] Stack overflow patch

Originally committed as revision 8194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 13:23:06 +00:00
Baptiste Coudurier
497244a897 check for any seeking failure during probe
Originally committed as revision 8173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-01 16:40:48 +00:00
Baptiste Coudurier
3fdb6af943 use avcodec_decode_audio2
Originally committed as revision 8146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 13:07:38 +00:00
Michael Niedermayer
a185f52a86 try to fill in missing bits_per_sample
Originally committed as revision 8043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-20 16:18:59 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 18:26:14 +00:00
Michael Niedermayer
e9b78eeba2 better generic index building and seeking code
Originally committed as revision 7841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-05 23:04:48 +00:00
Wolfram Gloger
9ecf7fada3 Fix audio corruption when cutting.
Patch by Wolfram Gloger, wmglo dent dot med dot uni-muenchen dot de.

Originally committed as revision 7818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-05 02:08:57 +00:00
Michael Niedermayer
5a461d8e11 packets must be correctly interleaved
Originally committed as revision 7805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-02 11:19:58 +00:00
Michael Niedermayer
a44b3c4da8 make av_find_stream_info() duration user selectable
Originally committed as revision 7669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 17:34:26 +00:00
Michel Bardiaux
373c32c711 Fix wrong comment, patch by Michel Bardiaux mbardiaux mediaxim be.
Originally committed as revision 7659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 09:24:41 +00:00
Michael Niedermayer
5ecfa9f5fc set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
Originally committed as revision 7600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:31:58 +00:00
Reimar Döffinger
40d9c544ac Attempt to better document AVFMT_NOFILE.
Originally committed as revision 7590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:54:50 +00:00
Reimar Döffinger
b8e705ec45 Demuxers with AVFMT_NOFILE will open a (possibly different) file themselves,
so do not probe them if is_opened is set.

Originally committed as revision 7589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:52:59 +00:00
Baptiste Coudurier
dfc58c5d64 removed unused av_frac_set
Originally committed as revision 7430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 14:44:13 +00:00
Baptiste Coudurier
702dfe0194 remove #if obsoleted after last major version bump
Originally committed as revision 7429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 14:42:01 +00:00
Baptiste Coudurier
8fae2df5e8 10l, only allocate priv_data if not already done
Originally committed as revision 7428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 14:22:00 +00:00
Baptiste Coudurier
c6efa4b5b0 humm, actually do what's in the doxy
Originally committed as revision 7427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 12:57:08 +00:00
Michael Niedermayer
69c262d156 indention
Originally committed as revision 7403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-02 20:35:46 +00:00
Michael Niedermayer
1694118b9b nth try of getting the frame rate detecton working
Originally committed as revision 7402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-02 20:32:01 +00:00
Michael Niedermayer
ecec87afc6 revert regression test breaking change
Originally committed as revision 7394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 21:17:14 +00:00
Michael Niedermayer
4b96d28abc ignore duration of the first 2 frames in the max-time break check
fixes framerate detection for framerate_misdetected.wmv

Originally committed as revision 7384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-29 21:41:06 +00:00
Michael Niedermayer
6268538afa do not base frame rate guess on just one duration
Originally committed as revision 7383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-29 21:16:21 +00:00
Michael Niedermayer
e07d8929eb indent
Originally committed as revision 7290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 14:08:19 +00:00
Michael Niedermayer
fd97f6a2ea the next r_frame_rate try ...
discard first duration
	accumulate remaining durations
	add 15000/1001 and 12000/1001

Originally committed as revision 7289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 14:07:46 +00:00
Michael Niedermayer
06d1e5c2b6 gcc 2.95 fix
Originally committed as revision 7285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 12:24:30 +00:00
Michael Niedermayer
4d43cbcc74 rewrite r_frame_rate selectioon code again
Originally committed as revision 7283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 16:59:10 +00:00
Måns Rullgård
f27a726809 use standard INT64_MAX instead of MAXINT64 (and MIN)
Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 00:47:37 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Baptiste Coudurier
68a432cf14 cosmetics, remove braces, remove spaces just inside parens
Originally committed as revision 7236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 17:17:33 +00:00
Andy Parkins
8533284dae do not truncate pts/dts if value is AV_NOPTS_VALUE, patch by Andy Parkins, andrew parkins at 360visiontechnology com
Originally committed as revision 7234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 15:46:12 +00:00
Michael Niedermayer
89ddd2a9a5 split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
Originally committed as revision 7035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:34:36 +00:00
Michael Niedermayer
faf7cbf110 nut simple seeking first try
Originally committed as revision 6968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-11 19:37:21 +00:00
Baptiste Coudurier
f932cdf209 kill AVImageFormat
Originally committed as revision 6875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-02 23:22:23 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Diego Biurrun
1345f4ed6c Rename SWAP macro to FFSWAP.
Originally committed as revision 6865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 21:28:36 +00:00