Commit Graph

3988 Commits

Author SHA1 Message Date
Roman Shaposhnik a53621fca8 simplifying code as per Michael's suggestion
Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:14:33 +00:00
Roman Shaposhnik c9b0b38f45 simplifying the code as per Michael's suggestion
Originally committed as revision 15577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 15:49:45 +00:00
Baptiste Coudurier 5b9ce252a9 10l, fix amrwb sample rate
Originally committed as revision 15562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 23:30:35 +00:00
Aurelien Jacobs b7f4e76d3d matroskaenc: correct muxing of ASS packets
- split packets to store one ASS event line per Matroska block
 - reformat ASS events to Matroska modified format
 - extract display duration for ASS events to store as Matroska block duration

Originally committed as revision 15561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:57:56 +00:00
Aurelien Jacobs 291902c274 matroskaenc: use correct EBML ID for block duration
Originally committed as revision 15560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:47:10 +00:00
Aurelien Jacobs 1bfbe8ff9d matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
Originally committed as revision 15559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:44:50 +00:00
Aurelien Jacobs 8401c51407 matroskaenc: remove useless mkv_block_size() function
Originally committed as revision 15558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:41:58 +00:00
Michael Niedermayer 7ccc636f03 Favor even chunk sizes in ambiguous cases.
Fixes transcode_069_produces_uneven_chunk_size.avi.

Originally committed as revision 15557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:26:43 +00:00
Michael Niedermayer f080a7bd90 Factorize stream id parsing.
Originally committed as revision 15556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 21:57:01 +00:00
Reimar Döffinger 6bc03a695b Make size variables in dyn_buf_write unsigned so gcc will not optimize the
check away (due to assuming signed overflows do not happen).

Originally committed as revision 15555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 21:11:58 +00:00
Diego Biurrun 95137bbbb4 Fix 'make checkheaders', based on a patch by Diego Pettenò, flameeyes gmail com.
Originally committed as revision 15552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 11:20:02 +00:00
Ronald S. Bultje 5c918b2775 Reindent after r15544.
Originally committed as revision 15545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:19:46 +00:00
Ronald S. Bultje accc248f28 Implement RDTDemuxContext, which contains RDT-specific data (similar to
RTPDemuxContext for RTP) for these streams where the transport protocol
is RDT (as served by Realmedia servers).

Originally committed as revision 15544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:19:15 +00:00
Ronald S. Bultje 5465b0d474 Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
and making its type a void pointer. See discussion in "RDT/Realmedia patches
#2" thread on ML.

Originally committed as revision 15543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:17:59 +00:00
Ronald S. Bultje 99a1d1915e Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque
(and thus preparing for the introduction of RDTDemuxContext) in a next patch.
See discussion in "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:16:44 +00:00
Ronald S. Bultje 9b932b8ac0 Change function prototype of RTPDynamicPayloadHandler.parse_packet() to
not use RTPDemuxContext, but rather take a pointer to the payload context
directly. This allows using payload handlers regardless over the transport
over which they were sent, and prepares for the introduction of a future
RDTDemuxContext. See discussion in "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:15:06 +00:00
Ronald S. Bultje ed0aacc76e Rename RTP payload contexts to PayloadContext, suggested by Luca in
"RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:11:12 +00:00
Baptiste Coudurier f06188d5ee set sample rate for amr to allow stream copy since no decoder is present,
3gp does not store sample rate in stsd in fact. Fixes #674.

Originally committed as revision 15536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 19:37:41 +00:00
Diego Biurrun bc5c918ea8 Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
Aurelien Jacobs c58e8bd3c3 matroskadec: cosmetics: indentation
Originally committed as revision 15529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 21:15:48 +00:00
Aurelien Jacobs 21a115d17b matroskadec: don't merge packets which have no timestamp
Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 21:14:56 +00:00
Diego Pettenò 72ab9d7f60 Use __typeof__ instead of GCC-specific typeof keyword.
The typeof keyword is disabled by default when building with -std=c99
as it's a GNU extension.
ICC supports the __typeof__ keyword as well as typeof.

Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com%

Originally committed as revision 15527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 20:01:13 +00:00
Ramiro Polla 3defa81fc4 MinGW runtime 3.15 has a wrapper for usleep().
Originally committed as revision 15522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 17:43:27 +00:00
Diego Biurrun 910f02a054 spelling cosmetics
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:28:58 +00:00
Diego Pettenò fb65d2ca84 Use enum typers instead of int.
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail

Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +00:00
Reimar Döffinger 9b5ede5b64 Add (additional) const to many global tables.
Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 15:52:04 +00:00
David Conrad a0ce2d1bbc Cosmetics: indentation
Originally committed as revision 15501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 14:44:30 +00:00
David Conrad 277e3e534b Visible width/height fields were added in Theora 3.2
Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 14:43:08 +00:00
Ronald S. Bultje 3ff2a06228 Use parse_packet vfunc in RTPDynamicProtocolHandler instead of hardcoding
the use of rdt_parse_packet(). See "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 12:38:41 +00:00
Ronald S. Bultje 985b05d3c9 This patch refactors RDT packet header parsing so that it can be used in
rtsp.c to detect the ID of the packet source also in case of TCP streams.
This allows proper playback of RDT streams with multiple stream types, e.g.
audio + video. Accepted by LucaB in "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 12:37:07 +00:00
Ronald S. Bultje f5f1e97f33 Reindent after previous patches.
Originally committed as revision 15485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:27:19 +00:00
Ronald S. Bultje 119b466811 Implement a RTSPTransport field, which allows proper separation of server
types and their non-standard extensions, and the data they serve. Practically,
this patch allows Real servers to serve normal non-RDT (standard RTP) data.
See discussion on ML in "Realmedia patch" thread.

Originally committed as revision 15484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:26:20 +00:00
Ronald S. Bultje ab63fb0360 Remove access to rdt_data struct in functions called outside of the
DynamicProtocol* context. Doing so could lead to problems if we're accessing
Real servers serving non-RDT data (or the other way around). Temporarily,
this patch adds a _subscribe2() function which will soon be removed in one
of the subsequent commits. OK'ed by Luca in "Realmedia patch" thread on ML.

Originally committed as revision 15483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:23:33 +00:00
Ronald S. Bultje eee2cbff77 Send improper UDP SETUP request, which is what Realmedia servers expect.
See discussion on ML in "Realmedia patch" thread.

Originally committed as revision 15482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:20:23 +00:00
Ronald S. Bultje 90abbdba1e Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
that it only describes the lower-level transport (TCP vs. UDP) and not the
actual data layout (e.g. RDT vs. RTP). See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:18:41 +00:00
Baptiste Coudurier 0c5f76f708 support negative ctts in some way, unset wrong dts
Originally committed as revision 15468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 02:44:57 +00:00
Diego Biurrun d0feff2a5b Uniformly define _XOPEN_SOURCE to 600.
The feature_tests.h header from Sun systems (Solaris/OpenSolaris) will abort
the build if _XOPEN_SOURCE is defined to 500, and C99 is requested (as well
as POSIX.1-2001), and will only accept it to be defined to 600.
inspired by a patch from Diego Pettenò, flameeyes gmail com

Originally committed as revision 15460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-29 06:22:12 +00:00
Aurelien Jacobs d5e34dcb72 matroskadec: merge ASS events which share the same pts in the same AVPavket
Originally committed as revision 15455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 23:06:25 +00:00
Aurelien Jacobs 3df2be9fa7 matroskadec: ass events lines must end with a DOS style EOL
Originally committed as revision 15454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 23:01:07 +00:00
Aurelien Jacobs 1bb4a1a1c4 matroskadec: set duration only for CODEC_ID_TEXT subtitles
Originally committed as revision 15453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 22:58:53 +00:00
Aurelien Jacobs e7d4b7431d matroskadec: pass duration as parameter of matroska_fix_ass_packet()
Originally committed as revision 15452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 22:55:28 +00:00
Aurelien Jacobs 7a8b7634c5 assdec: don't remove CR, they are part of the spec
Originally committed as revision 15442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 23:12:24 +00:00
Diego Biurrun 78cb727302 cosmetics: Break overly long lines, one grammar fix.
Originally committed as revision 15441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 20:05:12 +00:00
Diego Biurrun 4f57fa8c03 spelling/wording/grammar
Originally committed as revision 15440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 19:51:53 +00:00
Diego Biurrun fff5e687a1 Move doxygen comments for av_gettime from utils.c to avformat.h.
Originally committed as revision 15439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 17:37:22 +00:00
Michael Niedermayer 88caf34510 ASS/SSA muxer.
Originally committed as revision 15430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 19:42:21 +00:00
Benjamin Larsson 2426bb960a add ok parts to the rm demuxer for SIPRO support
Originally committed as revision 15426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 12:12:25 +00:00
Benjamin Larsson faeedbbb06 Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 10:59:42 +00:00
Michael Niedermayer 5c8a1d1927 Do not lose the '\n'.
Originally committed as revision 15424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 03:24:05 +00:00
Michael Niedermayer de3ae185a4 2 in 1, an ASS and SSA demuxer.
Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2).

Originally committed as revision 15422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:19:21 +00:00