1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

370 Commits

Author SHA1 Message Date
Baptiste Coudurier
6282c5f45b print stream index in error message
Originally committed as revision 12605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:19:19 +00:00
Baptiste Coudurier
71f3623510 according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov
Originally committed as revision 12604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:16:29 +00:00
Baptiste Coudurier
d3bc61ac75 Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
This will split amr/aac cbr samples correctly in isom files which do not
set audio cid to -2.

Originally committed as revision 12603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 12:35:22 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 01:06:57 +00:00
Baptiste Coudurier
48a5529016 sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing
Originally committed as revision 12547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 14:30:45 +00:00
Baptiste Coudurier
433aeb6240 support fragments when non streamable
Originally committed as revision 12542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:43:19 +00:00
Baptiste Coudurier
61aedb0f56 mp4 fragments support
Originally committed as revision 12541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:40:23 +00:00
Baptiste Coudurier
117a9190cd cosmetics, split or move too long lines
Originally committed as revision 12536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:16:16 +00:00
Baptiste Coudurier
db3ee6cc96 simplify, and only stop parsing when non streamable
Originally committed as revision 12534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:04:54 +00:00
Baptiste Coudurier
bb787a93dd atoms are not mp4 only, and yes probe is sufficient
Originally committed as revision 12532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:52:14 +00:00
Baptiste Coudurier
9c55b7725b update description
Originally committed as revision 12531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:51:12 +00:00
Baptiste Coudurier
3efe8848fc return ENOMEM
Originally committed as revision 12530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:48:22 +00:00
Baptiste Coudurier
2922cbdb14 cannot free AVStream like this, and return ENOMEM
Originally committed as revision 12529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:47:14 +00:00
Baptiste Coudurier
e3c4740fd4 indentation
Originally committed as revision 12528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:39:49 +00:00
Baptiste Coudurier
eb61405a07 remove useless debug print since now mov_build_index will do
Originally committed as revision 12516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:07:55 +00:00
Baptiste Coudurier
f9900374ec free track data asap
Originally committed as revision 12515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:00:45 +00:00
Baptiste Coudurier
1e77810d3b move mov_build_index before mov_read_trak to avoid useless declaration
Originally committed as revision 12514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:57:11 +00:00
Baptiste Coudurier
bd991df2a7 move specific end treatment when trak is detected, will be needed for fragments
Originally committed as revision 12513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:55:50 +00:00
Baptiste Coudurier
23f0861715 simplify, flags is 24bits according to specs
Originally committed as revision 12460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 15:13:40 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 18:42:09 +00:00
Baptiste Coudurier
0de2157fa4 set codec bps to grayscale bits, fix 256grey.mov
Originally committed as revision 12272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:05:19 +00:00
Baptiste Coudurier
da00a1bdf4 add weird first atom to probe, finally fix bartjones.mov
Originally committed as revision 12265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 12:24:27 +00:00
Baptiste Coudurier
dbb3765779 free in case of multiple type == 2
Originally committed as revision 12263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:31:41 +00:00
Baptiste Coudurier
2f4568e525 return error if malloc fails
Originally committed as revision 12262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:56 +00:00
Baptiste Coudurier
dbb7cbf26e fix possible overflow with memmove
Originally committed as revision 12261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:05 +00:00
Baptiste Coudurier
26846ba515 support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:27:21 +00:00
Baptiste Coudurier
221e21b70d support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
Originally committed as revision 12241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:21:58 +00:00
Baptiste Coudurier
60f5c96ee6 remove useless braces
Originally committed as revision 12232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:42:07 +00:00
Baptiste Coudurier
18978a4918 indentation
Originally committed as revision 12231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:41:40 +00:00
Baptiste Coudurier
6d680e1b50 rescale frame size, fix i.3g2
Originally committed as revision 12230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:36:49 +00:00
Baptiste Coudurier
f296563e5f move parameters reset after setting stream parameters, will need those infos
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:31:36 +00:00
Baptiste Coudurier
852859ff7c protect malloc overflow
Originally committed as revision 12208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:45:59 +00:00
Baptiste Coudurier
17871a02ad indentation
Originally committed as revision 12207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:44:15 +00:00
Baptiste Coudurier
b014dd7695 fail if extradata cannot be allocated
Originally committed as revision 12206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:42:32 +00:00
Baptiste Coudurier
501f162fde honor stsd v1 first, fix mace surge-2-8-MAC3.mov, beware of mulaw,alaw
Originally committed as revision 11928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 19:26:45 +00:00
Baptiste Coudurier
6a1f4535f8 10l, forgot alaw/mulaw mono, use bits_per_sample in fact,
it should correctly set by av_get_bits_per_sample if recognized

Originally committed as revision 11925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 13:11:10 +00:00
Baptiste Coudurier
d435e520d8 warn use if edit list is not starting at 0, a/v desync might occur
Originally committed as revision 11923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:58:16 +00:00
Baptiste Coudurier
fffa99ddd0 remove now useless code
Originally committed as revision 11922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:53:48 +00:00
Baptiste Coudurier
531527652f remove messy and not always correct chunk size workaround, use correct values instead
Originally committed as revision 11921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:52:23 +00:00
Baptiste Coudurier
300aa2b039 return error when dv audio extraction fails
Originally committed as revision 11913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:37:44 +00:00
Baptiste Coudurier
e6920f2445 remove obsolete comments
Originally committed as revision 11912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:34:43 +00:00
Baptiste Coudurier
3a3aa49ab7 remove useless braces
Originally committed as revision 11911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:34:03 +00:00
Baptiste Coudurier
311490cccd cosmetics, indentation, braces
Originally committed as revision 11910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:33:35 +00:00
Baptiste Coudurier
8cb66fd8f2 split chunks in the case of big compressed audio frames,
might be tweaked, fix qt_dv_pal_test.mov.

Originally committed as revision 11909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:32:35 +00:00
Baptiste Coudurier
77c7543702 use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2
Originally committed as revision 11908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:23:05 +00:00
Baptiste Coudurier
56ea717b46 indentation
Originally committed as revision 11905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 14:10:52 +00:00
Baptiste Coudurier
4f0e712ecb more correct and simpler
Originally committed as revision 11904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 14:10:29 +00:00
Michael Niedermayer
744a9c75cf Allow the user to select which codec out of several in stsd he wants.
Originally committed as revision 11873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 01:51:32 +00:00
Reimar Döffinger
cc8c2c6ab3 Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.
Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 19:57:04 +00:00
Michael Niedermayer
cc8d87b793 Set subtitle codec id correctly, i hope this does not break anything.
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:57:53 +00:00
Reimar Döffinger
7dfc1fdea2 Extract the pure plaintext from mov text subtitles.
Formatting information etc. is discarded.

Originally committed as revision 11625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 21:21:55 +00:00
Michael Niedermayer
1e3c9307e6 Set correct codec type and id for text subtitles.
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov
closes issue341

Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:30:03 +00:00
Michael Niedermayer
41e19673ef indent
Originally committed as revision 11623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:07:57 +00:00
Michael Niedermayer
ee6e2dbebf Only export packets which belong to the existing AVStream.
To export the others separate AVStreams must be created!

Originally committed as revision 11622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:07:30 +00:00
Michael Niedermayer
0bc4728e3b Select non jpeg if there are multiple substreams.
Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 19:50:04 +00:00
Baptiste Coudurier
29c90869e6 cosmetics, split overly long lines
Originally committed as revision 11434 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06 14:18:13 +00:00
Baptiste Coudurier
bde246014f supports glbl atom containing generic extradata for all codecs
Originally committed as revision 11271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 15:39:10 +00:00
Baptiste Coudurier
bcfe2ba02c useless 0L here
Originally committed as revision 11243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:51:00 +00:00
Baptiste Coudurier
282b65ccff remove now useless fields
Originally committed as revision 11242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:46:57 +00:00
Baptiste Coudurier
7c622eede5 do not retain useless pointers to avstream priv_data, use it directly
Originally committed as revision 11241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:45:48 +00:00
Baptiste Coudurier
11f16b661a remove duplicate field
Originally committed as revision 11240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:30:45 +00:00
Baptiste Coudurier
03dc32f689 cosmetics: func -> parse, remove useless parenthesis
Originally committed as revision 11239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:26:34 +00:00
Baptiste Coudurier
a4813b671a remove useless declaration
Originally committed as revision 11238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:24:32 +00:00
Baptiste Coudurier
73d07c275a save pointer to parse table, it is unlikely to change
Originally committed as revision 11237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:20:27 +00:00
Baptiste Coudurier
23d2cfe9a5 remove useless seek
Originally committed as revision 11236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:10:52 +00:00
Baptiste Coudurier
01eeb422fd cosmetics
Originally committed as revision 11235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:10:18 +00:00
Baptiste Coudurier
687f35f384 support streamed mov/mp4
Originally committed as revision 11234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:08:06 +00:00
Baptiste Coudurier
2aaf95a210 choose next sample by sample position
when streams' next dts difference is below AV_TIME_BASE,
to reduce seeking, needed for slow underlying protocols (http),
a slightly modified patch from elupus, elupus at ecce dot se

Originally committed as revision 11226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-15 19:08:42 +00:00
Mike Melanson
9de2919ce5 adjust indentation on latest patch
Originally committed as revision 11167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-05 04:32:45 +00:00
Mike Melanson
8b35bd806d Check sanity in the palette loading operation. The addresses a potential security risk in
the MOV/MP4 demuxer.

Originally committed as revision 11166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-05 04:30:33 +00:00
Baptiste Coudurier
c1da59fa2d return error if malloc failed, found by takis, fix issue 286
Originally committed as revision 11162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 22:26:07 +00:00
Panagiotis Issaris
9cf0419bb1 check mov_read_default return value where appropriate, patch by takis, fix issue 285
Originally committed as revision 11161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 22:22:50 +00:00
Reimar Döffinger
1fe47470d1 Make ff_qt_default_palette_* arrays "static const"
Originally committed as revision 11139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-02 23:27:01 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Diego Biurrun
94472c1d49 comment typo
Originally committed as revision 10992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-10 12:05:30 +00:00
Baptiste Coudurier
3d2308b0af use FFMIN
Originally committed as revision 10848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-23 22:28:57 +00:00
Baptiste Coudurier
8622613d9f fix issue 225, instead of stoping when wrong atom size is found,
limit atom size to what is left, assuming container atom has correct size..
cricket4.3g2 has incorrect moov atom size which indicates that file size should be
2 bytes bigger than it is and quicktime reads it correctly though.

Originally committed as revision 10836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 14:36:14 +00:00
Baptiste Coudurier
68bc33fa9f append extradata atoms when parsing, fix OLOCOONS_O3.mov
Originally committed as revision 10688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 13:06:48 +00:00
Baptiste Coudurier
aaac6c29d2 stop parsing udta if size is wrong/garbage, fix issue 154, fix RQ004F14.MOV
Originally committed as revision 10481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-12 10:18:01 +00:00
Baptiste Coudurier
74e9b9ae70 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
Originally committed as revision 9895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 12:33:34 +00:00
Michael Niedermayer
bca7db3530 detect MS wav codecs
fixes detection of audio codec though not playback of surge-2-16-L-ms11.mov

Originally committed as revision 9885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 00:22:28 +00:00
Benoit Fouet
d2ace376b0 fill title, author, copyright and comment fields by parsing udta atom
Originally committed as revision 9840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-31 15:20:36 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Baptiste Coudurier
4440b1188e simplify, no need for a function
Originally committed as revision 9008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 22:17:40 +00:00
Baptiste Coudurier
54a5c7193b fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
Originally committed as revision 9007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 22:02:27 +00:00
Baptiste Coudurier
b236a735e5 remove no more true comment
Originally committed as revision 8829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:46:04 +00:00
Baptiste Coudurier
e23848a49c cosmectics, use consistant and homogeneous type names for atoms
Originally committed as revision 8828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:36:05 +00:00
Baptiste Coudurier
f8c18cd711 use dprintf with AVFormatContext and simplify
Originally committed as revision 8827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:24:10 +00:00
Baptiste Coudurier
1c086afc21 remove now obsolete and no more true comments
Originally committed as revision 8824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 08:42:21 +00:00
Baptiste Coudurier
263a93ecff add 'wide' reversed tag in probe, detect broken xdcam files xdcam_hd_1080i60.mov
Originally committed as revision 8811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 15:57:15 +00:00
Baptiste Coudurier
1c02d96f6d long -> int
Originally committed as revision 8774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:37:10 +00:00
Baptiste Coudurier
9e40addd21 cosmetics: mov_mp4 -> mp4
Originally committed as revision 8773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:12:51 +00:00
Baptiste Coudurier
0b07ac425a clean and simplify esds reading function
Originally committed as revision 8772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:09:14 +00:00
Baptiste Coudurier
d614f57978 remove broken ctab code
Originally committed as revision 8771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:03:53 +00:00
Baptiste Coudurier
fa22ca2214 use INT64_MAX
Originally committed as revision 8770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:01:47 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 13:51:57 +00:00
Nicholas Tung
e4141433ea Get rid of unnecessary pointer casts.
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 20:24:16 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:34:15 +00:00
Baptiste Coudurier
11979c460c move atom size check before parsing function search
Originally committed as revision 8546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 10:45:34 +00:00
Baptiste Coudurier
a097e559b2 unset sample count to disable track when is broken
Originally committed as revision 8545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 10:42:22 +00:00