Commit Graph

3872 Commits

Author SHA1 Message Date
Baptiste Coudurier bea6c1ec80 fix fourcc comment
Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:42:26 +00:00
Ronald S. Bultje 1599503043 Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is
shared between the RM demuxer and the RTSP/RDT parser; both use the same
timebase. See discussion in "[PATCH] rmdec.c: move av_set_pts_info()" on ML.

Originally committed as revision 15164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:07:34 +00:00
Ronald S. Bultje 79d5045d33 Use chunk-size in function calling mdpr_read_codecdata() rather than in the
function itself. This way, old-style (.ra4) RTSP/RDT OpaqueData chunks can
be parsed using this function as well (they don't have the size bits). See
discussion on ML in "[PATCH] rmdec.c - small read_mdpr_codecdata() API
modification".

Originally committed as revision 15163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:05:55 +00:00
Laurent Aimar d1c2156bc6 Fix an invalid free in the AVI muxer when an unsupported audio track is added.
patch by Laurent Aimar, fenrir via.ecp fr

Originally committed as revision 15159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:53:42 +00:00
Diego Biurrun 8212568a1c Replace generic CONFIG_MUXERS preprocessor conditionals by more specific
CONFIG_FOO_MUXER conditionals where appropriate.

Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:45:13 +00:00
Diego Biurrun c184318852 Remove pointless #ifdef CONFIG_VHOOK from the code.
The file is only ever compiled if CONFIG_VHOOK is set.

Originally committed as revision 15157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:31:41 +00:00
Baptiste Coudurier dfce888f8a correctly mux mpeg2 audio 13818-3 in mp4
Originally committed as revision 15156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 20:48:45 +00:00
Baptiste Coudurier 428626d5d1 allow mp2 to be muxed into mp4
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 19:13:25 +00:00
Michael Niedermayer 74aa41bae4 Fix detection of MPEG4 in MPEG-PS.
Fixes issue568.

Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 15:33:57 +00:00
Justin Ruggles bdf6972c4b change back to using CONFIG_*_DEMUXER for ac3_eac3_probe(), but use it
correctly this time.

Originally committed as revision 15147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 17:20:49 +00:00
Aurelien Jacobs 23cdcb22a3 matroska: add E-AC-3 support
Thanks again Justin !

Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:50:12 +00:00
Aurelien Jacobs 75198e7a6d simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
Originally committed as revision 15145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:31:14 +00:00
Justin Ruggles 4d951ef86d check ENABLE_*_DEMUXER instead of CONFIG_*_DEMUXER
Originally committed as revision 15144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:28:15 +00:00
Justin Ruggles 2988c93d94 create a separate codec_id for E-AC-3
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 14:33:54 +00:00
Ronald S. Bultje 5f86057ffd Remove useless "else" case in if X { A; return }; else { B }. See discussion
in "Realmedia patch" thread on mailinglist.

Originally committed as revision 15142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 13:51:24 +00:00
Ronald S. Bultje d6bb9ebdc6 Some RTSP streams use SDP lines longer than 1024 bytes, so the SDP line
buffer needs to be increased. See discussion in "Realmedia patch" thread
on mailinglist.

Originally committed as revision 15141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 13:47:53 +00:00
Ronald S. Bultje 897ade1ba9 Implement Realmedia-compatible DESCRIBE command.
Originally committed as revision 15140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 13:46:50 +00:00
Baptiste Coudurier e8c4df40e3 check for malloc failure
Originally committed as revision 15132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:21:00 +00:00
Baptiste Coudurier db568c079a copy whole frame in vosData for dnxhd, this code will be used for other codecs too
Originally committed as revision 15131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:20:12 +00:00
Ronald S. Bultje 1cf151e9ae Send RTSP OPTIONS command to detect server type.
Originally committed as revision 15125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:32:58 +00:00
Ronald S. Bultje 30aa6aed4a Read RealChallenge1 field from the server.
Originally committed as revision 15124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:32:02 +00:00
Ronald S. Bultje e077604335 Implement RTSPServerType enum as a way to identify the flavour of RTSP that
the server will send to us (standard-compliant RTP or Realmedia-style RDT).

Originally committed as revision 15123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:30:15 +00:00
Ronald S. Bultje 75128a2273 Revert back to old version (r15103).
Originally committed as revision 15122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:23:01 +00:00
Stefano Sabatini 987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Baptiste Coudurier b18783644c do no write multi descriptor when only one track is present
Originally committed as revision 15115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:35:09 +00:00
Baptiste Coudurier 6ae9d3faae factorize
Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:26:12 +00:00
Baptiste Coudurier f05773ea8f remove mxf_build_structural_metadata, simplify
Originally committed as revision 15113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:25:39 +00:00
Baptiste Coudurier 98f7c5e067 move mxf_write_package to permit function merge
Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:24:00 +00:00
Baptiste Coudurier a4d7a6781a cosmetics, Pair -> Entry
Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:20:47 +00:00
Baptiste Coudurier d4ffc57d39 store index in table in MXFStreamContext, simplify
Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:13:44 +00:00
Baptiste Coudurier f2ebd15952 merge descriptor write table with essence container uls table and simplify
Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:07:41 +00:00
Baptiste Coudurier b6fa8a8af8 fix type in prototype
Originally committed as revision 15108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:45:00 +00:00
Baptiste Coudurier 85b5ee2b40 remove header_byte_count_offset from context
Originally committed as revision 15107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:42:05 +00:00
Baptiste Coudurier cc98406051 simplify and correctly rewrite metadata in header partition, mark it closed complete
Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:36:25 +00:00
Baptiste Coudurier ca276e6ae2 simplify current partition offset
Originally committed as revision 15105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:20:41 +00:00
Ronald S. Bultje 158efd74fe Implement RTSP/Realmedia-compatible OPTIONS command. See "Realmedia patch"
thread on mailinglist for discussion. This patch also implements a
RTSPServerType enum, which allows the RTSP to keep track of what kind of a
stream we're handling: standard-compliant RTP or a proprietary derivative.
This will be used in subsequent patches to implement more Realmedia-specific
extensions required to receive and parse data coming from a Realmedia server.

Originally committed as revision 15104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:12:13 +00:00
Baptiste Coudurier 6685f639af header partition is open incomplete for now
Originally committed as revision 15102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:06:38 +00:00
Baptiste Coudurier 7d5fdf900b always write footer partition according to specs
Originally committed as revision 15100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:01:07 +00:00
Baptiste Coudurier c5a2091295 10l fix mxf_get_essence_container_ul
Originally committed as revision 15098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:55:13 +00:00
Baptiste Coudurier 4e2f346bd1 cosmetics, mux_write -> mxf_write
Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:50:25 +00:00
Baptiste Coudurier 68f4259c12 correctly set track duration
Originally committed as revision 15096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:49:40 +00:00
Baptiste Coudurier cdedd878c5 set duration to distinguished value
Originally committed as revision 15095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:46:50 +00:00
Baptiste Coudurier 4d41888300 correctly write codec ul, mpeg-2 needs profile and level to be set
Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:41:31 +00:00
Baptiste Coudurier 064abb8aea simplify, pass AVStream directly instead of index
Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:48:02 +00:00
Baptiste Coudurier 38573e8fb9 cosmetics, whitespace
Originally committed as revision 15085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:44:45 +00:00
Baptiste Coudurier c872bdb0f8 remove now useless track_number_sign
Originally committed as revision 15084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:41:10 +00:00
Baptiste Coudurier 4ee873e39d put back mxf_essence_container_uls in demuxer as static const
Originally committed as revision 15083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:39:42 +00:00
Baptiste Coudurier ecb71f8fe8 remove now useless mxf_essence_element_key array
Originally committed as revision 15082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:37:14 +00:00
Baptiste Coudurier 316b438f33 fix track number ul in primer pack
Originally committed as revision 15081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:34:26 +00:00
Baptiste Coudurier b8ad3f7852 introduce MXFContainerEssencePair to associate essence element key and
essence container easily and compute essence element key in write_header

Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:33:28 +00:00