generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,612 Commits 24 Branches 241 Tags 173 MiB
be1fb76fa1
Commit Graph

4930 Commits

Author SHA1 Message Date
Baptiste Coudurier
17ad7b24c8 force sample for qcelp when not stored in mov, fix #968 
Originally committed as revision 18374 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 03:38:59 +00:00
Ronald S. Bultje
4bce3ba480 Reindent after r18372. 
Originally committed as revision 18373 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 03:06:08 +00:00
Ronald S. Bultje
6e9f56c127 Add waveformat-extensible support in the wav muxer. 
Patch (GSoC qualfication task) by Zhentan Feng spyfeng gmail com, see
"[FFmpeg-devel] Add waveformat extensible support in wav muxer (SoC
qualification task)" thread on mailinglist.

Originally committed as revision 18372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 03:04:57 +00:00
Baptiste Coudurier
3c8d144789 move codec tag tables near corresponding code 
Originally committed as revision 18370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:34:05 +00:00
Baptiste Coudurier
08680ab8c2 cosmetics, reindent 
Originally committed as revision 18369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:31:53 +00:00
Baptiste Coudurier
0872acc45c cosmetics, add empty line and remove useless braces 
Originally committed as revision 18368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:31:17 +00:00
Baptiste Coudurier
b6cb99469f fix compilation, add missing parenthesis 
Originally committed as revision 18367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:28:39 +00:00
Baptiste Coudurier
130ba4b17a comment the ipod subtitle check 
Originally committed as revision 18366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:26:47 +00:00
Baptiste Coudurier
6452af7a33 invert condition to simplify code 
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:25:11 +00:00
Baptiste Coudurier
cf9ce6a3d6 remove no more needed code, tag is set by default 
Originally committed as revision 18364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:23:15 +00:00
Baptiste Coudurier
2ab57c0443 cosmetics, reindent, add empty lines 
Originally committed as revision 18363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:21:43 +00:00
Baptiste Coudurier
6b60028595 split mov_find_codec_tag in separate per format functions 
Originally committed as revision 18362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:19:58 +00:00
Reimar Döffinger
b0723c8a12 Always return 0 if read_packet is successful. 
Originally committed as revision 18360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 21:25:02 +00:00
Reimar Döffinger
ac2b2226ac Do not uselessly read version string into a buffer. 
Originally committed as revision 18359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 21:16:11 +00:00
Reimar Döffinger
6883ebe4b9 Describe read_alloc return value and required pkt handling to avoid memleaks 
Originally committed as revision 18358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 21:10:10 +00:00
Reimar Döffinger
4e5735f774 Error out also when reading nuv header returns with partial data and return 
AVERROR(EIO) then.

Originally committed as revision 18357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 20:52:37 +00:00
Baptiste Coudurier
2fa6bc789f set bits_per_coded_sample for rawvideo 
Originally committed as revision 18356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 20:47:56 +00:00
Baptiste Coudurier
50d2d05d34 override mov fourcc for pcm audio, this is safer when stream copying 
Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 20:37:30 +00:00
Thilo Borgmann
cdd8930e6a Move av_packet_*() functions from libavformat/ to libavcodec/, where the 
AVPacket structure now resides also.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see the mailinglist
thread "Google Summer of Code participation" for additional discussion.

Originally committed as revision 18353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 18:31:14 +00:00
Aurelien Jacobs
b02d3aef94 use av_freep() instead of av_free() + =NULL. 
Originally committed as revision 18349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 12:31:28 +00:00
Luca Abeni
0f55f341fe Fix the copyright year 
Originally committed as revision 18348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 12:28:41 +00:00
Martin Storsjö
9edfaf3c6c Add support for H.263 video in the RTP muxer 
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 06:41:55 +00:00
Luca Abeni
215037887d Do not return payload type 34 for H.263 (it is deprecated) 
Originally committed as revision 18346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 06:37:12 +00:00
Martin Storsjö
99f373f3a6 Only insert the SPS and PPS NALs in sprop-parameter-sets 
Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-06 21:04:26 +00:00
Michael Niedermayer
634b927f82 Do not fail on zero packets. 
Originally committed as revision 18328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-03 15:32:31 +00:00
Olivier Guilyardi
80ff8a16f5 Implement JACK input device. 
Patch by Olivier Guilyardi list samalyse com.
See the thread: "[FFmpeg-devel] [PATCH] libavdevice: JACK demuxer".

Originally committed as revision 18322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 23:53:47 +00:00
Thilo Borgmann
fabd2469f1 Move AVPacket declaration from avformat.h to avcodec.h. 
Patch by Thilo Borgmann thilo dot borgmann at googlemail _dot_ com.

Originally committed as revision 18317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 19:53:53 +00:00
Jai Menon
3dd2f87e61 Map MOV fourcc YUV2 correctly to PIX_FMT_YUYV422. 
Patch by Jai Menon

Originally committed as revision 18316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 12:15:04 +00:00
Reimar Döffinger
3dd3604197 Reindent 
Originally committed as revision 18315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 11:27:14 +00:00
Reimar Döffinger
fb9ac65411 Support DVD subtitles in mov/mp4 as created by Nero. 
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4

Originally committed as revision 18314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 11:26:46 +00:00
Baptiste Coudurier
fcb4228c86 skip empty data packets in flv, fix input.flv 
Originally committed as revision 18306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 03:52:19 +00:00
Måns Rullgård
33afad5451 Add $(ELIBS) to example/test app link command 
Originally committed as revision 18298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-01 00:53:34 +00:00
Måns Rullgård
bbba084b4f Make examples and test progs depend on libraries 
Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-01 00:53:31 +00:00
Ben Littler
13b47b4012 add another dv fourcc CDVH 
Originally committed as revision 18293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-01 00:45:28 +00:00
Aurelien Jacobs
b89894abb7 matroska: add support for MLP and TRUEHD codec tags 
Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-30 21:37:04 +00:00
Diego Biurrun
bbbb885626 Fix timefilter test program build without previously building libavformat. 
The test program depends on symbols from this library.

Originally committed as revision 18247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-30 13:09:44 +00:00
Diego Biurrun
43a0cb7ca2 Generalize example target rule in common.mak so that it sets a -example$(EXESUF) 
suffix for all example files instead of doing this in individual Makefiles.

Originally committed as revision 18217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-29 14:35:20 +00:00
Ronald S. Bultje
be0395103a Don't strip the first three characters off of any metadata in ASF file. 
See "[FFmpeg-devel] [PATCH] asf fix" thread. Patch contributed by
David DeHaven <dave sagetv com>.

Originally committed as revision 18213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-28 03:54:31 +00:00
Luca Abeni
0766c3ee98 Make rtp_write_header() fail in case of unsupported payload type 
Originally committed as revision 18204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 21:36:44 +00:00
Diego Biurrun
5b00e88bb2 Move output-example dependency declaration after subdir.mak include so that it is 
not the first (and thus default) target and output-example is not always built.

Originally committed as revision 18203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 17:06:39 +00:00
Diego Biurrun
d95a0c67ae Move output_example.c --> libavformat/output-example.c. 
The libavformat directory is a better place for a libavformat API example.

Originally committed as revision 18199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 00:01:06 +00:00
Ramiro Polla
d4efacff64 Use intptr_t when casting pointers to int. 
Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-26 01:34:02 +00:00
Diego Biurrun
7304c2c4ce Move adding the '-test$(EXESUF)' suffix to test programs into common.mak. 
Originally committed as revision 18189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-25 18:19:20 +00:00
Baptiste Coudurier
f03a081df0 set wrong_dts for iMovie created files which has huge ctts delay, fix ffmpeg_sample.m4v 
Originally committed as revision 18181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-25 06:07:13 +00:00
Ronald S. Bultje
da1e126e0d strchr(string, '\0') returns non-NULL, and is thus not suited for use in 
redir_isspace(char) to check if '\0' is a space or not. Therefore, we now
use memchr(), since then we can give the length of the string (i.e. the
length excluding the terminating '\0'). Fixes issue 919, see also the
follow-ups in the "[PATCH] rtsp.c small cleanups" mailinglist thread.

Originally committed as revision 18177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-24 03:24:59 +00:00
Diego Biurrun
661ce28996 Rename 'tests' target to 'testprogs'. It is too easily confused with the 
'test' target and a directory named tests exists.

Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 23:13:21 +00:00
Aurelien Jacobs
bd51c0138a handle id3v2 'genre' tag formated as '%d' 
Originally committed as revision 18145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 16:10:37 +00:00
Ronald S. Bultje
2121b160d5 Remove alpha channel from default colorspace tables, since it is unused. See 
"qtpalette.h" thread on mailinglist.

Originally committed as revision 18144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 13:05:13 +00:00
Ronald S. Bultje
e6b09f4361 Add a @todo with a comment from Kostya so we don't forget to optimize that at 
some point in the future.

Originally committed as revision 18142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 12:47:16 +00:00
Kostya Shishkov
c21fbefb9d Add AURA 1 and 2 codec IDs and register their FOURCCs 
Originally committed as revision 18141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 07:40:22 +00:00
Baptiste Coudurier
5c5776e10d allocate tracks instead of using MAX_STREAMS 
Originally committed as revision 18140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 03:52:55 +00:00
Baptiste Coudurier
08a5b4e9b5 since code now use get_bits_long, allocate padding buffer 
Originally committed as revision 18138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 02:47:35 +00:00
Baptiste Coudurier
5f01c1258f avoid creating a new stream not referenced in pmt since it cannot be associated to a program, fix issue 835 
Originally committed as revision 18137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 02:04:28 +00:00
Baptiste Coudurier
a0dd3c0039 reset codec width/height for h264 forcing decoder to parse extradata 
Originally committed as revision 18134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 23:29:34 +00:00
Ronald S. Bultje
cc9aced32f Remove slash-skipping code because the function called right after that 
statement (get_word_sep()) already does that all by itself. See summary in
"[PATCH] rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 21:02:08 +00:00
Ronald S. Bultje
78f731de92 Reindent something where a if () --> { <-- is on a newline rather than on the 
same line as the if. See summary in "[PATCH] rtsp.c small cleanups" thread on
mailinglist.

Originally committed as revision 18127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 21:00:51 +00:00
Ronald S. Bultje
7d09a993d1 Free metadata if already allocated; fixes a memleak if the header occurs twice 
in a stream (e.g. malicious input, broken file, etc.). See summary in "[PATCH]
rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:59:59 +00:00
Ronald S. Bultje
6a8c8b36b9 Fix silly bug in hex_to_data() where it compares a string pointer for whether 
it is '\0' rather than its content (char *p; if (p == '\0') instead of if
(*p == '\0')). See summary in "[PATCH] rtsp.c small cleanups" thread on
mailinglist.

Originally committed as revision 18125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:58:41 +00:00
Ronald S. Bultje
64917dd3df Remove useless comment about something that is deprecated. See summary in 
"[PATCH] rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:56:57 +00:00
Ronald S. Bultje
36aa7bc27f Use skip_spaces() in the "redir" demuxer instead of "while (isspace(&p)) p++". 
See summary in "[PATCH] rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:55:52 +00:00
Ronald S. Bultje
1ef36a7035 Merge functional code from get_word() and get_word_sep() into a single 
function, since they both do approximately the same thing. At the same time,
remove redir_isspace() altogether since code elsewhere (including
get_word_sep()) uses strchr() for the same purpose. See summary in "[PATCH]
rtsp.c small cleanups" thread.

Originally committed as revision 18122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:54:47 +00:00
Ronald S. Bultje
7e726132c2 Allow (and parse) incoming server messages (notices) interleaved with TCP 
data packets or in addition to UDP data packets, over the RTSP/TCP connection.
See discussion in [PATCH] rtsp.c: read TCP server notifications/messages"
thread on mailinglist.

Originally committed as revision 18121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:46:36 +00:00
Ronald S. Bultje
9c610b7667 Add a @todo item to use ByteIOContext instead of URLContext at some point in 
the future, requested by Luca in "[PATCH] rtsp.c: read TCP server
notifications/messages" thread.

Originally committed as revision 18120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:44:46 +00:00
Ronald S. Bultje
8b9794e542 Remove index writing in RM muxer, since it is broken (multiple streams per 
single index chunk) and is always empty anyway. See "[PATCH] rmenc.c: remove
index writing" thread.

Originally committed as revision 18119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 20:34:24 +00:00
Ronald S. Bultje
83c0ba3dad Don't allow to sync on packets of zero-size length, since these are never 
valid. See "[PATCH] rmdec.c: prevent zero-length packets" thread.

Originally committed as revision 18118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 19:19:09 +00:00
Ronald S. Bultje
e75e603c1a Move "- 12" statement up a bit. See "[PATCH] rmdec.c: prevent zero-length 
packets" thread.

Originally committed as revision 18117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 19:18:07 +00:00
Daniel Verkamp
e1dc16ae56 Make Smacker audio decoder output audio in original bit depth 
Patch by Daniel Verkamp
($firstname) at (three-letter file extension for drivers in Win 3.1) dot (nu)

Thread: [PATCH] Smacker: Output audio in original bit depth

Originally committed as revision 18111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 15:52:14 +00:00
David Conrad
1a4ab332c6 Reindent 
Originally committed as revision 18102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 08:22:36 +00:00
David Conrad
6e6abd0237 Fix Speex header parsing in ogg demuxer 
Originally committed as revision 18101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 08:22:09 +00:00
David Conrad
1fa9726cf6 Document ogg_codec's header function 
Originally committed as revision 18100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 08:03:30 +00:00
Baptiste Coudurier
be2a6e2f82 fix compilation when DEBUG_SEEK is defined 
Originally committed as revision 18099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 07:36:25 +00:00
Baptiste Coudurier
92a0f33878 fix valid seeking range 
Originally committed as revision 18098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 07:35:52 +00:00
Baptiste Coudurier
b4800b8b7d protect realloc overflow 
Originally committed as revision 18088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 00:50:51 +00:00
Justin Ruggles
29b0d168e6 seek backwards 4 bytes if 'fLaC' marker is not found 
Originally committed as revision 18086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 00:49:14 +00:00
Daniel Verkamp
effcedf738 PCX encoder that handles 1-, 8-, and 24-bpp pixfmts. 
Patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 17:23:45 +00:00
Baptiste Coudurier
7c45723a98 resync ffm if error in stream 
Originally committed as revision 18065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:44:45 +00:00
Baptiste Coudurier
21c6438f2c typo, fix eof check 
Originally committed as revision 18064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:39:55 +00:00
Baptiste Coudurier
b9edbe9953 do not write ffm write index by default, detect if file is being written and return EOF 
Originally committed as revision 18063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:23:33 +00:00
Ronald S. Bultje
cf16c17a69 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec 
try #2" thread. Patch originally by Vladimir Voroshilov.

Originally committed as revision 18062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:22:51 +00:00
Ronald S. Bultje
e9fce261a6 Assign the x-pf-asf payload string to be decoded by rtp_asf.c, and add a 
SDP line handler that parses the streamID in the SDP so that ASF stream
data can be matched to their respective streams in the RTSP demuxer. See
"[PATCH] RTSP-MS 12/15: ASF payload support" thread on mailinglist.

Originally committed as revision 18061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:11:08 +00:00
Baptiste Coudurier
876578914b set avi fsize to INT64_MAX if riff tag end is not set and file size is not available 
Originally committed as revision 18052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:57:14 +00:00
Baptiste Coudurier
3a5601885b move max analyze duration check before considering new packet 
Originally committed as revision 18051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:54:34 +00:00
Ramiro Polla
23d9cc4563 Support raw TrueHD files 
Originally committed as revision 18049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:46:56 +00:00
Ramiro Polla
9ba4821d93 Split TrueHD decoder from MLP 
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:23:39 +00:00
Alex Converse
5c3d507f1a MOV: Use the AOT enum for the mp4_audio_types mapping. 
Originally committed as revision 18044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 18:13:42 +00:00
Reimar Döffinger
b8b00d9429 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure 
(GUID is also defined, but differently, in Windows headers).

Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 14:03:40 +00:00
Reimar Döffinger
4d0c3dc0d5 Add a special guidcmp function to compare ASF guids, to avoid the many 
duplicated sizeof(GUID).

Originally committed as revision 18030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 13:17:23 +00:00
Ronald S. Bultje
79ff11d78f Fix wrong @file tag. 
Originally committed as revision 18026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-17 18:35:58 +00:00
Ronald S. Bultje
c4a3d03299 Reindent after r18023. 
Originally committed as revision 18024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-17 12:35:55 +00:00
Ronald S. Bultje
1a30d5415f Add RTP/ASF header parsing, which is part of the SDP of these streams. See 
patch discussion in "[PATCH] RTSP-MS 10/15: ASF header parsing" thread.

Originally committed as revision 18023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-17 12:34:57 +00:00
avcoder
6d050dd673 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com 
Originally committed as revision 18022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-17 12:27:32 +00:00
Reimar Döffinger
2ac736a6da Extend mov edit list support to work for a first padding entry with 
time == -1 and duration. Complicated since time is relative to stream,
duration relative to container time base.

Originally committed as revision 18019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 20:49:52 +00:00
Måns Rullgård
c3df4a3bfe rmdec: fix crash at end of file 
Originally committed as revision 18018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 20:22:39 +00:00
Alex Converse
d0dab0ecd4 Cosmetics: Re-indent after last commit 
Originally committed as revision 18017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 16:24:38 +00:00
Alex Converse
bd27eed6d0 MOV: Support stz2 "Compact Sample Size Box" 
Originally committed as revision 18016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 16:14:36 +00:00
Ronald S. Bultje
508fe07ab3 More reindent, forgotten in previous commit. 
Originally committed as revision 18014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 13:23:29 +00:00
Ronald S. Bultje
2d6f301470 Parse index chunk so that seeking in modern .rm files becomes a lot faster. 
Has been tested against streamed / non-seekable input and passes make
seektest. See "[PATCH] rmdec.c: parse INDX chunk" thread on mailinglist.

Originally committed as revision 18013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 13:03:23 +00:00
Ronald S. Bultje
c882927957 Reindent after r18010. 
Originally committed as revision 18011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 13:01:02 +00:00
Ronald S. Bultje
55d330f913 Mark the first output audio frame as keyframe (separate patch from previous, 
as requested by Kostya). See "[PATCH] rmdec.c: remove cache access
duplication".

Originally committed as revision 18010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 12:59:18 +00:00
Ronald S. Bultje
c5efef7be9 Remove packet returning in ff_rm_parse_packet() if we're using the packet 
cache, since this can already be accessed through ff_rm_retrieve_cache().
See "[PATCH] rmdec.c: remove cache access duplication" thread.

Originally committed as revision 18009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 12:57:49 +00:00
Ronald S. Bultje
7268f0bd8e Reindent after r18005. 
Originally committed as revision 18007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 12:50:12 +00:00
Ronald S. Bultje
6a2d3fc30b Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and 
the newer (.rm, audio/video) files. See "[PATCH] rmdec.c: merge old/new
packet reading code" thread on mailinglist.

Originally committed as revision 18005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 12:47:34 +00:00
Baptiste Coudurier
f05783c2db cosmetics, remove useless braces 
Originally committed as revision 18004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:46:57 +00:00
Baptiste Coudurier
9bf1b2683c simplify printing 
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:46:28 +00:00
Baptiste Coudurier
f584386d54 reindent 
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:44:16 +00:00
Baptiste Coudurier
c6026e4360 fix trkn metadata parsing 
Originally committed as revision 18001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:43:38 +00:00
Baptiste Coudurier
0fb44a4e47 move read_udta_string up to avoid forward declaration 
Originally committed as revision 18000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:06:05 +00:00
Baptiste Coudurier
873358e5d4 more generic metadata handling 
Originally committed as revision 17999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 06:03:29 +00:00
Baptiste Coudurier
2229a5c60e do not set isom if ctype is not set, happens in mov 
Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-16 05:13:55 +00:00
Baptiste Coudurier
df8843c65f search for hdlr atom in meta, some files do not store version+flags 
Originally committed as revision 17996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 23:54:53 +00:00
Ronald S. Bultje
7a160bca83 Fix index generation in the way that it was supposed to be used. See the 
discussion in the ML thread "[PATCH] rmdec.c: merge old/new packet reading
code".

Over time, this code broke somewhat, e.g. seq was never actually written
into (and was thus always 1, therefore the seq condition was always true),
whereas it was supposed to be set to the sequence number of the video slice
in case the video frame is divided over multiple RM packets (slices). The
problem of this is that packets other than those containing the beginning
of a video frame would be indexed as well.
Secondly, flags&2 is supposed to be true for video keyframes and for these
audio packets containing the start of a block. For some codecs (e.g. AAC),
that is every single packet, whereas for others (e.g. cook), that is the
packet containing the first of a series of scrambled packets that are to be
descrambled together. Indexing any of the following would lead to incomplete
and thus useless frames. Problem here is that flags would be reset to 2 to
indicate that the first packet is ready to be returned, and in addition if
no data was left to be returned (which is always true for the first packet),
then we wouldn't actually write the index entry anyway.
All in all, the idea was good and it probably worked at some point, but that
is long ago. This patch should at the very least make it likely for this code
to be executed again at the right times, i.e. the way it was originally
intended to be used.

Originally committed as revision 17993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 20:14:25 +00:00
Baptiste Coudurier
7c4502c8c4 typo in the mail, the 4am commit is always the worst 
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 10:53:12 +00:00
Baptiste Coudurier
4909e517fd cosmetics 
Originally committed as revision 17980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 10:49:52 +00:00
Baptiste Coudurier
983bdd3788 add my copyright in mov de/muxer 
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 10:49:28 +00:00
Baptiste Coudurier
e49da8273b allocate palette in codec directly 
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 09:44:57 +00:00
Baptiste Coudurier
6c00a9dec2 cosmetics, add some whitespaces and empty lines 
Originally committed as revision 17975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 09:06:36 +00:00
Baptiste Coudurier
f0f2218dce do not modify sample_count, check against index entries 
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 07:21:22 +00:00
Baptiste Coudurier
ed6ae6a58b use utc time for timestamp and do not set it if not specified 
Originally committed as revision 17971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 23:39:52 +00:00
Baptiste Coudurier
36a12218db swf timestamps are 16 bits 
Originally committed as revision 17969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 22:51:38 +00:00
Baptiste Coudurier
40a1d41fd2 remove unused fields in swf context 
Originally committed as revision 17968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 22:49:01 +00:00
Baptiste Coudurier
2261a952f9 do not parse timestamp if bitexact is set, should fix regression tests 
Originally committed as revision 17967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 22:43:28 +00:00
Reimar Döffinger
881dad9e76 Enable generic index creation and seeking for NUV demuxer. 
Originally committed as revision 17966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 22:07:15 +00:00
Reimar Döffinger
74f5ae847d Add AVFMT_GENERIC_INDEX support also for formats that do not use a parser. 
Originally committed as revision 17965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 21:46:00 +00:00
Reimar Döffinger
bd36f175ab Make pcm_read_seek treat negative time stamps as 0, this avoids incorrectly 
seeking before data_offset and is more consistent with how the generic index
seeking code handles it.

Originally committed as revision 17964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 20:50:54 +00:00
Michael Niedermayer
85b4230f68 Do not lose user flags when passing calls from the new to the old seeking API. 
Originally committed as revision 17959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 16:30:51 +00:00
Michael Niedermayer
32d885926d add avformat_seek_file() 
Originally committed as revision 17956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 15:51:46 +00:00
Reimar Döffinger
7e04cfba27 Set pkt->pos correctly (to the start of header of the packet) in swfdec. 
Originally committed as revision 17953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-13 22:26:45 +00:00
Baptiste Coudurier
4e35ffa978 fix swf seeking by fixing new stream detection 
Originally committed as revision 17952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-13 19:37:05 +00:00
Reimar Döffinger
abb785f19e Simplify RoQ demuxer pts calculation by using a appropriate time bases. 
Originally committed as revision 17946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-13 13:37:35 +00:00
Reimar Döffinger
15969b55d1 Set video width/height and create audio stream in read_packet instead of 
pre-parsing the file in read_header.
This avoids some code duplication and seeking, and also avoids an IO error
for small video-only files (as created during e.g. the FATE encoder test).

Originally committed as revision 17945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-12 11:47:50 +00:00
Baptiste Coudurier
d168b3fd2d reindent 
Originally committed as revision 17940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:05:18 +00:00
Baptiste Coudurier
7943a90a0d keep original tag when stream copying subs with ipod format 
Originally committed as revision 17939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:04:44 +00:00
Baptiste Coudurier
c569bd0632 ipod supports both subs tags 
Originally committed as revision 17938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:03:42 +00:00
Baptiste Coudurier
80357cfcfb reindent 
Originally committed as revision 17937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:02:59 +00:00
Baptiste Coudurier
9f52055463 write correct atoms based on tag and not format, fixes subs stream copy 
Originally committed as revision 17936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:01:39 +00:00
Baptiste Coudurier
d1df4da00b use correct codec tag list for ipod format 
Originally committed as revision 17935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 07:59:38 +00:00
Baptiste Coudurier
f344ae8096 again 10l, typo, put_byte instead of put_buffer 
Originally committed as revision 17933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:48:02 +00:00
Baptiste Coudurier
cafdc1876a attempt to try to generate an random umid 
Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:15:00 +00:00
Baptiste Coudurier
a2523ce2e2 fix subs track height, set track->height to codec height if not set 
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:04:56 +00:00
Ben Littler
3596f4e076 sn40 avi fourcc decodes with ffodivx 
Originally committed as revision 17928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 01:36:25 +00:00
Ronald S. Bultje
b5b9ff2a1f Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly 
and if the size is broken (20 bytes, header-only), calculate the expected
size and skip the index entries anyway. See "[PATCH] rmdec.c: correctly
skip indexes" thread.

Originally committed as revision 17924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-10 12:55:29 +00:00
Ronald S. Bultje
b8cc5a9fdf Prevent (negative) overflow of rm->remaining_len. This evaluation really only 
has two possible outcomes: either len and rm->remaining_len are the same, in
which case we care about the outcome and it is zero, or rm->remaining_len is
currently not in use and we don't care about the outcome. In that case, len
is positive and rm->remaining_len is zero, which leads to a negative result.
This is confusing and could eventually lead to a sign-flip if we skip a lot
of packets (unlikely, but still). Therefore, just always set it to zero.

Originally committed as revision 17919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 22:03:47 +00:00
Ronald S. Bultje
7ccefd08f6 Revert to r17908. 
Originally committed as revision 17918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 22:02:06 +00:00
Ronald S. Bultje
88c4339bda Move MOVContext and related structures from mov.c to isom.h. See "[PATCH] 
move MOVContext from mov.c to isom.h" thread on ML.

Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 21:53:00 +00:00
Reimar Döffinger
3898eed890 Reorder arguments for av_fifo_generic_read to be more logical and 
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 17:47:47 +00:00
Ronald S. Bultje
0ecf9cc900 Prevent (negative) overflow of rm->remaining_len. This evaluation really only 
has two possible outcomes: either len and rm->remaining_len are the same, in
which case we care about the outcome and it is zero, or rm->remaining_len is
currently not in use and we don't care about the outcome. In that case, len
is positive and rm->remaining_len is zero, which leads to a negative result.
This is confusing and could eventually lead to a sign-flip if we skip a lot
of packets (unlikely, but still). Therefore, just always set it to zero.

Originally committed as revision 17910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 13:08:19 +00:00
Ronald S. Bultje
21b3752932 Replace separate packet parsing for "old_format" .ra files by a call to 
ff_rm_parse_packet(). See "[PATCH] Make RM demuxer behave better with -an
option" thread, which sort-of turned into an aggregate of unrelated rmdec.c
cleanups.

Originally committed as revision 17909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 12:46:32 +00:00
Ronald S. Bultje
dc3685e129 Move frame discarding out of the ff_rm_parse_packet() loop, and respect 
rm->audio_pkt_cnt in case multiple packets should be read before the next
syncpoint in the file, so that ffplay -an on a file containing AAC audio
works. See "[PATCH] Make RM demuxer behave better with -an option" thread
on mailinglist.

Originally committed as revision 17908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 12:42:53 +00:00
Reimar Döffinger
d71d64dcc1 Mark all packets from nuv demuxer as keyframes in order to make seeking work. 
For proper seeking, they should be set correctly though.

Originally committed as revision 17907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 12:25:13 +00:00
Reimar Döffinger
3a4f91f5ed 100l, to start reading from the first frame we must seek to data_offset, 
not 0 in av_seek_frame_generic.

Originally committed as revision 17905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 12:06:31 +00:00