Ronald S. Bultje
43af8b2b42
Read optional components of the RDT packet header, such as extended setID
...
and streamID and the length. of the packet in case of packet concatenation.
Discussed in ML thread "[PATCH] RDT/Realmedia patches #2 ".
Originally committed as revision 15853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:32:01 +00:00
Ronald S. Bultje
6bafd6f53e
Change header reading implementation to using get_bits() instead of directly
...
accessing the data array. This allows to easily read optionally available
header bits without causing pains. See discussion in "[PATCH] RDT/Realmedia
patches #2 " thread on ML.
Originally committed as revision 15852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:30:31 +00:00
Ronald S. Bultje
e269ab791d
Prefix all ff_rdt_parse_header() arguments with a p, preparing for local
...
variables to temporary hold the values. Discussed in ML thread "[PATCH]
RDT/Realmedia patches #2 ".
Originally committed as revision 15851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:28:12 +00:00
Ronald S. Bultje
a4b8cb3c55
Fix memleak caused by the fact that url_open_buf() allocates a context
...
when calling, but url_close_buf() doesn't free it. The better solution
is to not allocate it at all, init it with init_put_byte() and then
not have to close it at all. In the case where we do need to hold it
around for longer than within the function context, we allocate it with
av_alloc_put_byte() and free it with av_free() instead. Discussed in ML
thread "[PATCH] fix small memleak in rdt.c".
Originally committed as revision 15850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:23:20 +00:00
Ronald S. Bultje
fcc995a533
Add ByteIOContext argument to public ff_rm_* functions so that we can
...
specify the data source as function argument instead of in s->pb before
calling the function. Discussed in ML thread "[PATCH] fix small memleak
in rdt.c".
Originally committed as revision 15849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:20:00 +00:00
Jindřich Makovička
ce09d560b7
Get rid of MSG_DONTWAIT using a more standard way to use a socket
...
in a non blocked mode.
Patch by Jindrich Makovicka: makovick gmail
Originally committed as revision 15846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 07:50:25 +00:00
Baptiste Coudurier
ebd610557e
set pts in flv demuxer
...
Originally committed as revision 15841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 02:56:34 +00:00
Baptiste Coudurier
51c1520114
read itunes metadata, code based on Reimar's patch
...
Originally committed as revision 15840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 01:59:35 +00:00
Ronald S. Bultje
e3b7216b9b
Change status packet skipping to be more spec-compliant. See discussion in
...
"[PATCH] RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:45:26 +00:00
Ronald S. Bultje
108cd24793
Make function comment a bit more linguistically correct.
...
Originally committed as revision 15835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:43:57 +00:00
Ronald S. Bultje
3d883ad5f3
Reindent after r15833.
...
Originally committed as revision 15834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:42:41 +00:00
Ronald S. Bultje
114732f4c7
Add is_keyframe param to ff_rdt_parse_header(). See ML discussion in
...
"[PATCH] RDT/Realmedia patches #2 " thread.
Originally committed as revision 15833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:41:59 +00:00
Baptiste Coudurier
86b0affd08
simplify metadata reading
...
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:17:19 +00:00
Aurelien Jacobs
8f569ed08f
matroskadec: fix index timestamps for some broken files
...
fix issue697
Originally committed as revision 15829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 15:34:51 +00:00
Ronald S. Bultje
6ff1f61530
Call check_back_and_send_rr() function only in case of RTP as a transport.
...
Don't call it for RDT, since it is unneeded and it doesn't provide a
RTPDemuxContext, leading to some memory errors. See "[PATCH] fix small
memory error in rtsp.c" thread on ML.
Originally committed as revision 15828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 14:44:48 +00:00
Ronald S. Bultje
239dec21ab
Rename variables in ff_rdt_parse_header() and callers to match the
...
comment documentation in that function. See discussion on ML in the
"[PATCH] RDT/Realmedia patches #2 " thread.
Originally committed as revision 15825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 02:22:47 +00:00
Jindřich Makovička
7d0842992a
check for interrupt when receiving from socket
...
Originally committed as revision 15824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 19:33:22 +00:00
Ronald S. Bultje
9e16439287
Add comment describing the RDT packet header. See discussion in "[PATCH]
...
RDT/Realmedia patches #2 " thread on the mailinglist.
Originally committed as revision 15823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 18:37:58 +00:00
Baptiste Coudurier
eb63b051c0
timestamp is dts in wmv/asf
...
Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 03:45:31 +00:00
Jindřich Makovička
236bb1ab01
Allow the UDP socket buffer size to be adjusted using a
...
'buffer_size' URL option.
Patch by Jindrich Makovicka, makovick at gmail dot com
Originally committed as revision 15807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-12 21:40:53 +00:00
Jindřich Makovička
f5edd874fa
always use the whole buffer for reading w/ packetized sources to avoid packet truncation
...
Originally committed as revision 15799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-10 21:41:35 +00:00
Stefano Sabatini
15545a095a
Fix argument constness for the av_codec_get_id() and
...
av_codec_get_tag() functions, making them take in input a constant
array, since they're not supposed to change it. Fix some warnings.
Originally committed as revision 15795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 18:37:03 +00:00
Peter Ross
d2299316ce
Electronic Arts demuxer: support TGQ video tags
...
Originally committed as revision 15791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 00:39:31 +00:00
Måns Rullgård
e3b07e1a74
OGG: correct PTS with old theora streams
...
Originally committed as revision 15785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-06 01:57:17 +00:00
Måns Rullgård
77be08eeb1
OGG: untypedef demuxer structs
...
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-06 01:50:56 +00:00
Peter Ross
4fd71a0ee8
Decode audio channel layout from RIFF/WAV file format.
...
Originally committed as revision 15774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-05 09:22:13 +00:00
Michael Niedermayer
f23938f5b7
Check sub_packet_size against 0 to avoid div by zero later.
...
Fixes issue473
Originally committed as revision 15739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-29 00:16:50 +00:00
Andrew Wason
8ff8de73a4
Fix endless loop when opening corrupt FLV files (issue 699).
...
Patch by Andrew Wason, rectalogic A rectalogic D com
Originally committed as revision 15738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 23:49:04 +00:00
Baptiste Coudurier
785b0f3c54
fix umid base value, use revision 5 and generic material type
...
Originally committed as revision 15723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-27 00:21:42 +00:00
Baptiste Coudurier
0df4903a07
fix sound essence compression UL
...
Originally committed as revision 15721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:59:28 +00:00
Baptiste Coudurier
1d30d1ad4d
fix start position UL
...
Originally committed as revision 15720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:57:41 +00:00
Baptiste Coudurier
7f8cd075e0
simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
...
Originally committed as revision 15687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 23:06:03 +00:00
Diego Biurrun
f94036f159
prettyprinting cosmetics
...
Originally committed as revision 15682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:41:27 +00:00
Diego Biurrun
75f2c20983
spelling cosmetics
...
Originally committed as revision 15681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:37:06 +00:00
Baptiste Coudurier
f96d0eef53
force sample rate to 16khz for speex in flv, fix speexaudio.flv
...
Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 18:36:26 +00:00
Pascal Massimino
4fe8a45240
fix for >2GB flv files
...
Originally committed as revision 15677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 16:46:43 +00:00
Baptiste Coudurier
bd09e8a7df
raw dnxhd de/muxer
...
Originally committed as revision 15674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 01:42:57 +00:00
Baptiste Coudurier
b774fdd7a4
dnxhd codec is intra only
...
Originally committed as revision 15672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-23 17:30:36 +00:00
Aurelien Jacobs
abce34d979
matroskaenc: require global header
...
fixes issue696
Originally committed as revision 15667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22 21:14:42 +00:00
Aurelien Jacobs
37d3e0667a
uses FF_ARRAY_ELEMS() where appropriate
...
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Michael Niedermayer
9806f846c0
Check for pts==dts on I/P frames in the presence of non low delay decoding and
...
discard these invalid timestamps.
fixes issue171.
Originally committed as revision 15641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-19 01:02:48 +00:00
Michael Niedermayer
f781f748b9
Move code setting delay and presentation_delayed a little up so
...
that the variables are available sooner.
Originally committed as revision 15640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 22:41:21 +00:00
Michael Niedermayer
4589dc5c4d
Append read data onto the buffer instead of overwriting, this ensures
...
that the whole buffer is available for seeking back.
Fixes issue480
Originally committed as revision 15634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 17:30:37 +00:00
Alexander Wichers
8ddd280d2d
Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
...
Originally committed as revision 15633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:10:08 +00:00
Alexander Wichers
88cb61bb0c
8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu
...
Originally committed as revision 15632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:08:55 +00:00
Michael Niedermayer
bf9067cf3e
Assume mono if no other information for raw.
...
Should fix issue687
Originally committed as revision 15631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 10:40:31 +00:00
Ramiro Polla
bc574408dc
Only special-case absolute DOS paths on systems that support them.
...
Originally committed as revision 15594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-10 16:59:37 +00:00
Michael Niedermayer
51f4155fef
Make gcc 2.95 happy.
...
Originally committed as revision 15589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-08 20:55:22 +00:00
Roman Shaposhnik
4e92dabf60
replacing frame_rate and frame_rate_base with an AVRational time_base
...
Originally committed as revision 15584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:59:18 +00:00
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
Baptiste Coudurier
6ad1c9c992
only include sys/select.h if present, fix mingw compilation
...
Originally committed as revision 15420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:12:37 +00:00
Michael Niedermayer
644b0c4c92
Prevent image2 from complaining about non monotone timestamps as
...
there are no timestamps in "raw" image2.
Originally committed as revision 15419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:07:56 +00:00
Baptiste Coudurier
fe28178303
cosmetics, remove GXF: in log messages since it is present in context
...
Originally committed as revision 15409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 23:40:55 +00:00
Baptiste Coudurier
99f296b304
skip invalid audio samples in gxf packets
...
Originally committed as revision 15408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 23:31:04 +00:00
Baptiste Coudurier
c75a0cce5b
include sys/select.h to get select, according to posix 2001,
...
fix compilation on freebsd 5.5
Originally committed as revision 15406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 22:11:53 +00:00
Baptiste Coudurier
933bd8e291
include sys/select.h instead of unistd.h to get select,
...
according to posix 2001, fix compilation on freebsd 5.5
Originally committed as revision 15405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 22:08:50 +00:00
Baptiste Coudurier
4e240985d8
stop parsing if tag size is wrongly < 8 to avoid infinite loop
...
Originally committed as revision 15401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 18:55:00 +00:00
Michael Niedermayer
f2d65a6c8a
Avoid segfault due to not set AVCodec.
...
Originally committed as revision 15400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:46:23 +00:00
Baptiste Coudurier
aeb627888d
merge amr wb case with amr nb and qcelp
...
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:17:11 +00:00
Baptiste Coudurier
26f5e1469f
do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz
...
Originally committed as revision 15397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:09:59 +00:00
Michael Niedermayer
f26be47740
ASF stands for "advanced stream format" not "adaptive ...", changing it to "ASF".
...
Originally committed as revision 15395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 12:03:25 +00:00
Vitor Sessak
b93dd8383a
Add support for RVTR fourCC
...
Originally committed as revision 15386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-23 06:24:00 +00:00
Michael Niedermayer
0354ddb71c
Ensure that muxer and encoder aspect ratios match. So no
...
invalid files are generated.
Originally committed as revision 15367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-19 12:37:38 +00:00
Kostya Shishkov
b30cb420cf
Add fourcc for MS RLE4
...
Originally committed as revision 15357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-18 05:25:29 +00:00
Baptiste Coudurier
5813a29eb1
revert r14983, value is not sample aspect ratio, it is display aspect ratio
...
Originally committed as revision 15352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-17 23:14:48 +00:00
Justin Ruggles
e1a12934c5
write number of samples in FLAC extradata.
...
based on a patch by Mathieu Velten (matmaul gmail com).
Originally committed as revision 15324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 20:00:36 +00:00
Justin Ruggles
5165651cf9
add error message for unsupported codecs in WAVE.
...
Resolves issue 623.
Originally committed as revision 15322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 17:29:34 +00:00
Ronald S. Bultje
2834c365d2
Reindent after r15317.
...
Originally committed as revision 15318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 13:56:12 +00:00
Ronald S. Bultje
2e889ae4b9
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
...
protocol) is not strictly related to the server type (Real servers can
stream both RDT and RTP).
Originally committed as revision 15317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 13:55:21 +00:00
Aurelien Jacobs
a8fd7e764a
matroskadec: simplify, first_timecode is already in the index
...
no need to duplicate it
Originally committed as revision 15302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-12 00:06:06 +00:00
Aurelien Jacobs
5358a81f9c
matroskadec: prevent seeking before the first keyframe of the reference stream
...
Originally committed as revision 15301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 22:42:17 +00:00
Ronald S. Bultje
a6789dca1b
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
...
remove duplicate code" thread on ML.
Originally committed as revision 15298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 17:43:44 +00:00
Ronald S. Bultje
ee0cb67fa3
Factorize out common code for opening of the RTP parsing context between
...
SDP and RTSP into a new function. See discussion on ML in "[PATCH] rtsp
cleanup part 1: remove duplicate code" thread.
Originally committed as revision 15297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 17:43:04 +00:00
Michael Niedermayer
e7f656d5fa
Clarify convergence_duration.
...
Originally committed as revision 15291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-10 12:51:49 +00:00
Baptiste Coudurier
00adc1e5dc
set bits_per_coded_sample according to new lavc api
...
Originally committed as revision 15289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 18:32:50 +00:00
Aurelien Jacobs
c16582579b
matroskadec: demux relevant subtitle packets after a seek
...
only works for subtitle tracks which were properly indexed up to the seek point
Originally committed as revision 15284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 12:10:25 +00:00
Aurelien Jacobs
82360e670d
matroskadec: ensure that overlapping subtitles are not added to the index
...
Originally committed as revision 15283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 12:07:10 +00:00
Aurelien Jacobs
20f7466550
matroskadec: after seeking, skip up to the desired timestamp instead of
...
the desired stream
Originally committed as revision 15282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 12:01:51 +00:00
Aurelien Jacobs
f14a201b32
matroskadec: move timecode calculation a little earlier
...
so as to be able to use it in other part of the code
Originally committed as revision 15281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 11:54:35 +00:00
Aurelien Jacobs
3fc9d7cec4
matroskadec: sanitize track time_scale before using it
...
fix issue628
Originally committed as revision 15280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 11:23:48 +00:00
Baptiste Coudurier
66ec3d56a2
print stream index in decimal not in hex, easier for debugging
...
Originally committed as revision 15279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 02:56:13 +00:00
Baptiste Coudurier
bf912a482b
set block align in av_write_header if not set, fix issue #489
...
Originally committed as revision 15277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 19:37:22 +00:00
Baptiste Coudurier
bed4fc54c9
write copyright metadata tag
...
Originally committed as revision 15276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 19:11:53 +00:00
Luca Abeni
dd1c8f3e6e
Bump Major version, this commit is almost just renaming bits_per_sample to
...
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Baptiste Coudurier
1993f8d640
terminate tag tables by CODEC_ID_NONE
...
Originally committed as revision 15259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 00:58:24 +00:00
Baptiste Coudurier
24b8aa84d0
set default bps to 16 in wav header
...
Originally committed as revision 15239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:17:15 +00:00
Ronald S. Bultje
4fce284c08
Implement RDT-specific data parsing routines. After these changes, simple
...
playback of RTSP/RDT streams should work. See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:25:47 +00:00
Ronald S. Bultje
99b2ac0797
Reindent after previous patch.
...
Originally committed as revision 15236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:24:01 +00:00
Ronald S. Bultje
1256d16b6c
Implement a RDT-specific SET_PARAMETER command that subscribes to the
...
first stream in a RTSP/RDT session. See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:22:18 +00:00
Ronald S. Bultje
ff13ba92fd
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
...
in rtpdec.c, so that they can be shared and used in the same way in rtsp.c.
The handlers, since they are specific for RDT, are registered in rdt.c and
a new registration function is thus called from allformats.c.
The dynamic payload handler also implements RDT-specific SDP-line parsing for
OpaqueData and StartTime, which are specific for RDT and needed for proper
playback. OpaqueData contains one or a list ("MLTI") of "MDPR" chunks that
can be parsed by the rmdec.c function ff_rm_read_mdpr_codecdata(). To use
this function, we create a new rdt_demuxer, which has the same private data
as the rm_demuxer. The resulting AVFormatContext created with _open_stream()
can thus be used to call functions in the RM demuxer.
See discussion in "Realmedia patch" thread on ML.
Originally committed as revision 15234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:21:24 +00:00
Ronald S. Bultje
0369d2b045
Give register_dynamic_payload_handler() in rtpdec.c a ff_ prefix and export
...
it so that I can use it in rdt.c as well. See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:19:26 +00:00
Aurelien Jacobs
74cf481970
bump lavf micro version to allow checking for the matroska/ASS bugfix in r15211
...
Originally committed as revision 15232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 00:05:30 +00:00
Aurelien Jacobs
a3467f8608
matroskadec: remove now useless vstream and is_video_key_frame
...
Originally committed as revision 15231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:44:29 +00:00
Aurelien Jacobs
dbfb0e5f36
matroskadec: remove useless braces
...
Originally committed as revision 15230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:43:24 +00:00
Aurelien Jacobs
24c3da1637
matroskadec: ensure that the timecode added to the index are is the one
...
of the actual keyframe block, and not the one of the start of the cluster
containing this block.
Originally committed as revision 15229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:39:59 +00:00
Baptiste Coudurier
cf74dd4a5c
do not fail if audio is uncompressed and frame size is not set, just set it
...
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:30:27 +00:00
Baptiste Coudurier
235a51ad31
simplify bps code by using av_get_bits_per_sample
...
Originally committed as revision 15215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:20:33 +00:00
Aurelien Jacobs
3eb9bfbb84
matroskadec: fix ASS subtitle track packets before emitting them
...
Matroska does some butchering when storing the ASS lines. The start and end
time are removed (because they are duplicated in the container).
The matroska_fix_ass_packet() function simply restore those start and end
time in ASS lines to ensure our ASS packets comply with the ASS spec.
Originally committed as revision 15211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:26:12 +00:00
Baptiste Coudurier
52cf395407
Fix msgsm in wav, do not set blkalign to frame size, this is wrong,
...
all samples have correct blkalign set to 65
Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:19:53 +00:00
Aurelien Jacobs
62c24705c8
matroska: subtitle display duration must be stored in pkt->convergence_duration
...
Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:08:19 +00:00
Baptiste Coudurier
5d79f30d70
set block align and frame size for gsm in aiff
...
Originally committed as revision 15203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 22:35:05 +00:00
Baptiste Coudurier
efa1fb39d2
cosmetics, remove whitespace
...
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:26:31 +00:00
Kurtnoise
4ed1942008
actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
...
Originally committed as revision 15197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:25:55 +00:00
Damiano Galassi
544a0f47af
skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits,
...
patch by Damiano Galassi, damiog at gmail dot com
Originally committed as revision 15196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:17:21 +00:00
Baptiste Coudurier
c4e02d702c
change the logic to mux 13818-3 and 11172-3 in mp4, less code
...
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:42:09 +00:00
Baptiste Coudurier
e00c3de821
forbid mp3 < 16000hz in anything except mov
...
Originally committed as revision 15189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:31:03 +00:00
Baptiste Coudurier
c3b1325158
dirac muxing support in mp4/mov
...
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:23:24 +00:00
Baptiste Coudurier
5180b027cc
cosmetics, move up mpeg1video mp4 objecttype
...
Originally committed as revision 15187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:18:49 +00:00
Baptiste Coudurier
2f980d2a83
cosmetics, change values to hex since mp4ra use hex
...
Originally committed as revision 15186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:17:28 +00:00
Baptiste Coudurier
baa0be4cf0
cosmetics, vertical align
...
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:08:56 +00:00
Baptiste Coudurier
d4a240cbc9
ac3 muxing support in mov/mp4/m4v
...
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:05:22 +00:00
Reimar Döffinger
dc76fe1348
Change doxygen comment: Clarify when av_write_trailer should be called.
...
Originally committed as revision 15181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 17:57:56 +00:00
Michael Niedermayer
a2636c0fd5
Add AVPacket.convergence_duration.
...
Originally committed as revision 15179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 14:44:54 +00:00
Michael Niedermayer
a82630deb2
Try to clarify the semantics of AVPacket.duration.
...
Originally committed as revision 15178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 14:02:17 +00:00
Ronald S. Bultje
0ad306bc81
Remove unused code that used to handle protocol concatenation, i.e. trying
...
multiple protocols at the same time. We now cycle protocols individually
to autodetect, making this code no longer needed, and thus the support code
for it in make_setup_request() can be removed. See "[PATCH] remove transport
concatenation dead code" on mailinglist.
Originally committed as revision 15172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 04:47:44 +00:00
Ronald S. Bultje
e9dea59f16
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
...
of the "RealChallenge2" response, which is some sort of authentication. See
discussion in "Realmedia patch" thread on ffmpeg-devel.
Originally committed as revision 15170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 04:44:58 +00:00
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
Baptiste Coudurier
e51a81e0ff
cosmetics
...
Originally committed as revision 15079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:40:11 +00:00
Baptiste Coudurier
e14d374e10
replace sizeof(type) by sizeof *ptr
...
Originally committed as revision 15078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:39:34 +00:00
Baptiste Coudurier
ac0ab12fe9
merge declaration and init
...
Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:36:30 +00:00
Baptiste Coudurier
e7daab1e9c
reindent
...
Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:51 +00:00
Baptiste Coudurier
3eaa53b35e
simplify mxf_write_essence_container_refs
...
Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:36 +00:00
Baptiste Coudurier
021fa42cb1
factorize
...
Originally committed as revision 15074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:26:54 +00:00
Baptiste Coudurier
2cd71ce52f
change [0] to *
...
Originally committed as revision 15073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:25:19 +00:00
Baptiste Coudurier
c18d208ae2
compute essence containers in mxf_write_header, this simplifies the code
...
Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:38 +00:00
Baptiste Coudurier
a2f55f22b3
get essence container ul in header and set it per track, check for unsupported codec
...
Originally committed as revision 15071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:54:24 +00:00
Baptiste Coudurier
179308768a
move per track code in mxf_write_header to be able to check for unsupported configuration
...
Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:47:58 +00:00
Baptiste Coudurier
851a8297e8
rename variable
...
Originally committed as revision 15069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:43:14 +00:00
Baptiste Coudurier
86e456f63e
fix typos
...
Originally committed as revision 15066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:05:42 +00:00
Baptiste Coudurier
60366dd04b
cosmetics: header -> generic
...
Originally committed as revision 15065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:02:59 +00:00
Baptiste Coudurier
a8f6e362d6
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces
...
Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:58:49 +00:00
Baptiste Coudurier
0b62964f54
cosmetics
...
Originally committed as revision 15063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:45:49 +00:00
Baptiste Coudurier
6fdb4fb0f5
simplify, and factorize
...
Originally committed as revision 15062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:45:32 +00:00
Baptiste Coudurier
0c0c4d6450
only put version in tag
...
Originally committed as revision 15061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:41:01 +00:00
Baptiste Coudurier
b43952539b
simplify
...
Originally committed as revision 15060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:38:59 +00:00
Baptiste Coudurier
283a02c51a
always write required version string local tag
...
Originally committed as revision 15059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:37:19 +00:00
Baptiste Coudurier
9fedbc8910
introduce mxf_write_local_tag_utf16 and factorize
...
Originally committed as revision 15058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:32:23 +00:00
Baptiste Coudurier
6b05863aa9
use strlen and do not write useless trailing 0 according to specs
...
Originally committed as revision 15057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:24:19 +00:00
Baptiste Coudurier
5f94b92077
write strings as utf16be
...
Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:23:11 +00:00
Diego Biurrun
9d2526d1b9
Add missing FFMPEG_ prefix to multiple inclusion guard.
...
Originally committed as revision 15047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 07:17:36 +00:00
Baptiste Coudurier
b83a00b8b6
timestamps in flv are 32bits _signed_ according to flash player, specs are wrong
...
Originally committed as revision 15045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:07:31 +00:00
Baptiste Coudurier
6f4eb12d31
remove now useless casts
...
Originally committed as revision 15044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:01:59 +00:00
Baptiste Coudurier
ca9c5a4d37
make has_codec_parameters not returning true when sample_fmt is not set
...
Originally committed as revision 15043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:13:22 +00:00
Baptiste Coudurier
ae58b54b3f
skip empty flv data packets, fix issue #602
...
Originally committed as revision 15042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:10:34 +00:00
Baptiste Coudurier
3d9aecb0d7
factorize packet skip code
...
Originally committed as revision 15041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:07:01 +00:00
Baptiste Coudurier
6298eb810d
simplify size handling code
...
Originally committed as revision 15040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:03:18 +00:00
Baptiste Coudurier
3a25c707fa
remove vorbis dec hack, decoding will be done anyway to get frame size
...
Originally committed as revision 15035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:04:28 +00:00
Baptiste Coudurier
77b0443544
speex in flv demuxing
...
Originally committed as revision 15028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:06:35 +00:00
Baptiste Coudurier
5b9bb66df2
cosmetics, typos, case
...
Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:04:18 +00:00
Baptiste Coudurier
118d4e1069
cosmetics
...
Originally committed as revision 15026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 16:56:57 +00:00
Baptiste Coudurier
faac3f0f9f
fix version string ul
...
Originally committed as revision 15025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 16:56:36 +00:00
Michael Niedermayer
f0aaa16fdf
Do not truncate timestamps before the muxer as it makes simple
...
things like last_pts - pts rather tricky and is not good for anything.
Timestamps should be truncated just before storing when needed.
Originally committed as revision 15015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 01:43:27 +00:00
Roman Shaposhnik
f8007a1473
Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer as
...
specified in SMPTE 370M
Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 22:41:00 +00:00
Ronald S. Bultje
452d3edb37
Change implementation for ff_data_to_hex(), this is faster. See discussion on
...
mailinglist in "Realmedia patch" thread.
Originally committed as revision 15006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 12:00:58 +00:00
Ronald S. Bultje
f1c80e3578
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
...
move it from sdp.c into utils.c. Also add new header internal.h specifically
for lavf-specific internal API. See discussion in "Realmedia patch" thread
on mailinglist.
Originally committed as revision 15002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:43:28 +00:00
Roman Shaposhnik
34fab90f18
Two cosmetic changes for improved readability and ease of HDVCPRO HD integration
...
Originally committed as revision 14999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 20:28:11 +00:00
Aurelien Jacobs
0dbddda397
matroskadec: cosmetics: indentation
...
Originally committed as revision 14995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 19:58:55 +00:00
Aurelien Jacobs
6bef5f9b96
matroskadec: seek to the last position known in the index before resorting to
...
full cluster parsing when seeking after the end of index
Originally committed as revision 14994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 19:57:42 +00:00
Ronald S. Bultje
8646b9070b
Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
...
lines. This allows "private" SDP tags to be forwarded to the specific handler,
allowing protocol-specific handling of SDP data. See mailinglist discussion
in the "Realmedia patch" thread.
Originally committed as revision 14987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 00:33:22 +00:00
Aurelien Jacobs
d63f529df7
remove useless assignment (st is never read after this line)
...
Originally committed as revision 14985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:38:04 +00:00
Aurelien Jacobs
8e44312d3f
matroskadec: index timestamps are supposed to be in the timebase of the stream
...
Originally committed as revision 14984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:32:27 +00:00
Aurelien Jacobs
2a242f4514
mxfdec: set sample_aspect_ratio
...
Originally committed as revision 14983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:21:39 +00:00
Carl Eugen Hoyos
cedebde15a
Remaining parts of GSoC MXF muxer by Zhentan Feng.
...
Originally committed as revision 14975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 15:58:25 +00:00
Michael Niedermayer
274335e76c
vertical align
...
Originally committed as revision 14972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 01:29:43 +00:00
Vitor Sessak
9b0d3e0e03
Import more MXF muxer code from the SoC tree
...
Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 20:28:12 +00:00
Andreas Öman
f1588ed525
When setting codec_id during codec probe we must also set codec_type.
...
Originally committed as revision 14966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 15:39:43 +00:00
Luca Abeni
a9e02947f6
Fix udp.c compilation with recent glibc (>= 2.8)
...
Originally committed as revision 14963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 06:20:00 +00:00
Aurelien Jacobs
244ee48a82
matroskadec: unset matroska->done when seeking
...
just in case someone try to seek back after reaching the end of file
Originally committed as revision 14960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:17:31 +00:00
Aurelien Jacobs
0f646a2233
matroskadec: full seeking support in index-less files
...
when trying to seek past the last index entry, just parse more clusters to add them to the index, until an index entry match the desired position
Originally committed as revision 14959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:15:49 +00:00
Aurelien Jacobs
8bc98ba92b
matroskadec: on the fly index construction for index-less files
...
each cluster that is read and that contains a video key frame is added
to the index
Originally committed as revision 14957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:09:08 +00:00
Aurelien Jacobs
dfbbbdc0bf
matroskadec: don't try to seek to negative timestamp
...
matroska timestamps are unsigned
Originally committed as revision 14956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 23:57:29 +00:00
Aurelien Jacobs
653fb2f80c
matroskadec: move setting of matroska->done inside matroska_parse_cluster()
...
Originally committed as revision 14955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 23:54:14 +00:00
Reimar Döffinger
547ea47d4f
Add ff_ prefix to ogg_codec_t structs
...
Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:37:43 +00:00
Reimar Döffinger
aecf157ed0
Mark several libavformat arrays const
...
Originally committed as revision 14950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:24:34 +00:00
Reimar Döffinger
7b571fd7a4
Mark "matroska" probe data string constant.
...
Originally committed as revision 14949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:19:46 +00:00
Reimar Döffinger
cd34bc7617
Make ogg_codec_t descriptions const
...
Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:09:15 +00:00
Reimar Döffinger
c18545929e
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
...
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:51:50 +00:00
Ronald S. Bultje
f23a9759ce
Remove check for @ in tcp.c which removes the authorization data from the
...
actual hostname. This functionality already exists (and always existed) in
url_split() and is therefore useless. See discussion in "[PATCH] tcp.c/udp.c
memleak?" thread on ffmpeg-devel.
Originally committed as revision 14946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:22:40 +00:00
Aurelien Jacobs
090a41790e
voc: add ff_ prefix to some global const data
...
Originally committed as revision 14945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 14:12:03 +00:00
Reimar Döffinger
e7fd7b9aec
Remove useless empty close functions in mmf and mm demuxers.
...
Originally committed as revision 14944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 14:02:55 +00:00
Aurelien Jacobs
ba18b99ffa
matroskadec: make aac_profiles array const
...
Originally committed as revision 14943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 13:12:41 +00:00
Reimar Döffinger
1bef65f4fe
Make the id3v1_genre_str array const, not just the strings it points to.
...
Originally committed as revision 14942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 12:45:15 +00:00
Vitor Sessak
6986662b5f
Import more ok'ed chunks of the mxf muxer from the soc tree
...
Originally committed as revision 14938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 05:55:46 +00:00
Aurelien Jacobs
5972945197
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
...
the corresponding AVStream instead of AVCodecContext
Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
Aurelien Jacobs
c30a4489b4
export sample_aspect_ratio read by the demuxer in a separate field
...
that the one read by the decoder.
Originally committed as revision 14932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:13:58 +00:00
Peter Ross
ee7948cb8d
Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
...
Originally committed as revision 14930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 22:36:35 +00:00
Ronald S. Bultje
a3303add3c
Cosmetics after previous patches.
...
Originally committed as revision 14926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:52:26 +00:00
Ronald S. Bultje
8b9af28da4
On failure, return directly because the fail: case does nothing. This also
...
allows easier control of the actual return value.
Originally committed as revision 14925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:49:16 +00:00
Ronald S. Bultje
47f944a2ef
Move malloc() down until after all initializations, so that the resource is
...
only allocated if initialization worked. This means that on failure, we
don't have to deallocate it.
Originally committed as revision 14924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:46:30 +00:00
Ronald S. Bultje
e6c1381982
Fix memleak on some OSes in case network initialization fails. See
...
"[PATCH] tcp.c/udp.c memleak?" for discussion.
Originally committed as revision 14923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 17:39:56 +00:00
Ronald S. Bultje
ad33bfefc7
Remove useless comments. See "[PATCH] tcp.c/udp.c memleak?" for discussion.
...
Originally committed as revision 14922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 17:39:10 +00:00
Baptiste Coudurier
7e4b3fb878
enable fl32/64 le/be in mov with stsd audio v2
...
Originally committed as revision 14919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 15:25:38 +00:00
Luca Abeni
26efefc52c
Do not set timestamp information for a non existing AVStream
...
(fix a bug in the RTP demuxer)
Originally committed as revision 14909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 19:03:05 +00:00
Vitor Sessak
9b9466b0cd
Apply parts of MXF muxer ok'ed by Michael
...
Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 04:12:52 +00:00
Aurelien Jacobs
28f27e0c0c
matroskadec: fail cleanly when the required compression lib is not compiled in
...
Originally committed as revision 14870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 23:08:07 +00:00
Aurelien Jacobs
dc3e0211ed
matroskadec: stop parsing when skipping en element crossing over the end of file
...
Originally committed as revision 14869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 22:30:15 +00:00
Aurelien Jacobs
eb9cf50a74
matroska: add support for most variants of PCM
...
Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:49:45 +00:00
Aurelien Jacobs
b49d17b77a
matroskadec: handle EBML_ID_VOID and EBML_ID_CRC32 in a generic way
...
Originally committed as revision 14861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:44:25 +00:00
Ronald S. Bultje
ba99cfc213
Implement url_open_protocol(), which is basiclly the former url_open()
...
but which opens a URLProtocol instead of a filename. url_open() is
reimplemented to call url_open_protocol(). See discussion on
"url_open_protocol" on ffmpeg-devel.
Originally committed as revision 14857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 23:44:23 +00:00
Zhentan Feng
fda0d4afa7
Ok-ed parts from patch by zhentan feng.
...
Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 22:01:57 +00:00
Zhentan Feng
1b0732ea64
Remove useless #ifdef DEBUG (patch by Zhentan Feng).
...
Originally committed as revision 14853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 21:58:47 +00:00
Stefano Sabatini
745b39d5f9
Replace invocations of av_fifo_realloc(), which is going to be
...
deprecated, with corresponding invocations of av_fifo_realloc2().
Originally committed as revision 14848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 18:49:57 +00:00
Zhentan Feng
2c8d438893
Ok-ed parts from patch by zhentan feng.
...
Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 12:36:17 +00:00
Peter Ross
b1c00341a5
Make AIFF demuxer handle F32BE and F64BE PCM audio.
...
Originally committed as revision 14837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 11:05:29 +00:00
Peter Ross
a1ef2c4bb3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
...
Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 11:00:40 +00:00
Peter Ross
57406d8eb8
Make RIFF-based demuxers handle F32LE and F64LE PCM audio.
...
Originally committed as revision 14835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:54:30 +00:00
Peter Ross
7b21690a91
Make AU demuxer handle S24BE, S32BE and F64BE PCM audio.
...
Originally committed as revision 14834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:49:38 +00:00
Zhentan Feng
e48891bd9b
Ok-ed parts from patch by zhentan feng.
...
Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 18:11:00 +00:00
Zhentan Feng
c69968b4fe
Factorize common code out of the mxf demuxer.
...
Patch by zhentan feng.
Originally committed as revision 14826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 17:54:18 +00:00
Peter Ross
fc7ed9a6f6
Support Electronic Arts files containing MP3 audio.
...
Originally committed as revision 14824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 12:39:57 +00:00
Dave Yeo
e748e34dd6
struct timeval requires #include <sys/time.h>
...
patch by Dave Yeo daveryeo _at_ telus _dot_ net
Originally committed as revision 14793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 18:39:30 +00:00
Michael Niedermayer
3cffbe090a
Fix rc_eq mem leak.
...
Originally committed as revision 14788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 14:46:31 +00:00
Diego Biurrun
4c00864f31
Surround format-specific functions with matching preprocessor conditionals.
...
Originally committed as revision 14783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 19:24:55 +00:00
Diego Biurrun
7402ee234a
Surround AVInputFormat declarations with format-specific #ifdefs.
...
Originally committed as revision 14782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 17:28:20 +00:00
Diego Biurrun
964454263c
Replace generic CONFIG_MUXERS preprocessor condition around format-specific
...
functions by more appropriate format-specific preprocessor conditions.
Originally committed as revision 14781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:54:27 +00:00
Diego Biurrun
bcb5430abe
Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
...
declarations by more specific CONFIG_FOOBAR_MUXER conditions.
Originally committed as revision 14780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:48:05 +00:00
Diego Biurrun
082f7acfc4
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
...
condition. This will make upcoming diffs smaller.
Originally committed as revision 14779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:37:59 +00:00
Diego Biurrun
fb9f111710
cosmetics: misc spelling fixes
...
Originally committed as revision 14778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:33:12 +00:00
Michael Niedermayer
ff9c8d7c6f
Add flag to mark demuxers that can output discontinuous timestamps.
...
(could also be added to muxers if someone wants)
Originally committed as revision 14777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:13:05 +00:00
Aurelien Jacobs
a964e813a1
use h_addr_list[0] instead of h_addr as this is the posix hostent field name
...
Originally committed as revision 14768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:36:05 +00:00
Aurelien Jacobs
7246177d80
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
...
Originally committed as revision 14766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:01:59 +00:00
Baptiste Coudurier
b5f46e9340
import ok'd hunks for mxf muxer
...
Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 21:48:02 +00:00
Kurtnoise
7139bfa8fe
Surround '#include <sys/select>' by HAVE_SYS_SELECT_H.
...
patch by Kurtnoise, kurtnoise free fr
Originally committed as revision 14756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 14:29:18 +00:00
Anuradha Suraparaju
67a38cee37
Change Dirac in MPEG-TS encapsulation to conform with spec changes.
...
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
Originally committed as revision 14753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 11:17:23 +00:00
Michael Niedermayer
3c9769a008
Do not fill the pts reordering buffer with guessed dts.
...
These values should not matter at all in principle because they
do not correspond to the time of display of any frame but it seems
ffmpeg becomes confused by them if they are far off and its not
strictly correct to set them to guessed values.
Fixes video_stalls_at_start.wmv
Originally committed as revision 14746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 03:24:58 +00:00
Aurelien Jacobs
5df3cc6f80
matroskadec: list some more ebml IDs found in the wild and that we ignore
...
This avoid printing some warnings about unknow IDs while we in fact know
the IDs but just want to knowingly ignore them.
Originally committed as revision 14738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 21:15:15 +00:00
Anuradha Suraparaju
f4bba2015a
Dirac encapsulation in MPEG-TS
...
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
Originally committed as revision 14734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 19:29:35 +00:00
Diego Biurrun
2485abe281
Remove unused variable.
...
Originally committed as revision 14731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:32:16 +00:00
Aurelien Jacobs
ea452b54f0
strcasecmp() requires #include <strings.h>
...
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 17:22:53 +00:00
Aurelien Jacobs
131f1cb2a9
matroskadec: parse available blocks even when cluster parsing failed
...
This way, we still read the few complete blocks out of a truncated
cluster at the end of a truncated file.
Originally committed as revision 14723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 09:36:45 +00:00
Michael Niedermayer
0e55ba723b
Add needed include, make it compile without -D_BSD_SOURCE.
...
Originally committed as revision 14718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 21:02:37 +00:00
Baptiste Coudurier
0d84a8f6ae
increase MAX_REORDER_DELAY and pts_buffer size to 16, max for h264 atm
...
Originally committed as revision 14715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 17:28:00 +00:00
Baptiste Coudurier
cb5b96cde0
Prevent dts generation code to be executed when delay is > MAX_REORDER_DELAY,
...
this fixes overflow in AVStream->pts_buffer.
Originally committed as revision 14714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 17:26:36 +00:00
Peter Ross
ebc22cc29f
Electronic Arts demuxer: support SxEN audio tags found in 'Need for Speed: Pro Street' computer game.
...
Originally committed as revision 14713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 12:36:00 +00:00
Peter Ross
6819af8245
Electronic Arts demuxer: perform identification of ADPCM EA R2 codec using revision2 flag.
...
Originally committed as revision 14710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:35:09 +00:00
Peter Ross
a07f117804
Electronic Arts demuxer: ignore PTxx platform ID values.
...
Originally committed as revision 14709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:33:32 +00:00
Peter Ross
d3302b7011
Support Electronic Arts files containing MPEG2VIDEO.
...
Originally committed as revision 14708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:32:59 +00:00
Benjamin Larsson
1b46683c80
FOURCC addition: added 3IV2, another mpeg4 id. incoming/video_3iv2/video_3iv2.avi
...
Originally committed as revision 14681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 15:34:29 +00:00
Peter Ross
d9d9a8c028
Add MDEC tags to Electronic Arts demuxer.
...
Originally committed as revision 14679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 01:58:46 +00:00
Stefano Sabatini
8163c870b0
Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
...
the forward declarations.
Originally committed as revision 14677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 00:28:56 +00:00
Aurelien Jacobs
44015c56a6
matroskadec: add basic tags support (metadata)
...
Originally committed as revision 14672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 23:50:38 +00:00
Stefano Sabatini
c97429e22b
Implement avformat_version().
...
Originally committed as revision 14667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 18:40:50 +00:00
Baptiste Coudurier
b80b569242
remove mxf.c, previously copied to mxfdec.c
...
Originally committed as revision 14661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 17:33:53 +00:00
Baptiste Coudurier
d09ea6baaf
rename mxf.c to mxfdec.c
...
Originally committed as revision 14655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 02:12:14 +00:00
Måns Rullgård
5c5b1731b7
Maintain pointer to end of AVFormatContext.packet_buffer list
...
This changes add_to_pktbuf() to maintain a pointer to the last entry
in the list, avoiding a linear walk-through on each call. Before this
change, add_to_pktbuf() could take a significant amount of time (10%
of total decoding time), even with input files of several minutes.
After the change, the time spent in this function is barely measurable
with oprofile.
Originally committed as revision 14654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 22:17:38 +00:00
Peter Ross
bbf020e977
Add Electronic Arts TGV chunk tags to EA demuxer.
...
Originally committed as revision 14643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 08:34:35 +00:00
Aurelien Jacobs
00a3431cbb
matroskadec: use av_freep(&x) instead of av_free(x);x=NULL
...
Originally committed as revision 14633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 00:21:10 +00:00
Anton Khirnov
b87025399c
matroskadec: replace matroska_queue_packet with a single call to dynarray_add
...
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Originally committed as revision 14632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 00:17:47 +00:00
Diego Biurrun
95aad5d1f1
Fix small typo.
...
Originally committed as revision 14628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 21:46:10 +00:00
Peter Ross
4e0e6888a4
Support muxing of Zork PCM audio into RIFF formats.
...
Originally committed as revision 14617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 10:38:25 +00:00
Diego Biurrun
5968d2dd1e
misc spelling/grammar fixes
...
Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 08:28:57 +00:00
Aurelien Jacobs
cc70d14b3d
matroskadec: remove useless num_streams
...
Originally committed as revision 14611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:43:01 +00:00