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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
efa1fb39d2
cosmetics, remove whitespace
...
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:26:31 +00:00
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
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
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
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
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
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
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
baa0be4cf0
cosmetics, vertical align
...
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:08:56 +00:00
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
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
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
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
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
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
bea6c1ec80
fix fourcc comment
...
Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:42:26 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
6ae9d3faae
factorize
...
Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:26:12 +00:00
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
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
a4d7a6781a
cosmetics, Pair -> Entry
...
Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:20:47 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
38573e8fb9
cosmetics, whitespace
...
Originally committed as revision 15085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:44:45 +00:00
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
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
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
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
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
e51a81e0ff
cosmetics
...
Originally committed as revision 15079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:40:11 +00:00
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
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
e7daab1e9c
reindent
...
Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:51 +00:00
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
021fa42cb1
factorize
...
Originally committed as revision 15074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:26:54 +00:00
2cd71ce52f
change [0] to *
...
Originally committed as revision 15073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:25:19 +00:00
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
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
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
851a8297e8
rename variable
...
Originally committed as revision 15069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:43:14 +00:00
86e456f63e
fix typos
...
Originally committed as revision 15066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:05:42 +00:00
60366dd04b
cosmetics: header -> generic
...
Originally committed as revision 15065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:02:59 +00:00
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