69fc436cbc
In mov_read_packet remember the AVStream we want to demux next instead of the
...
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.
Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:23:40 +00:00
6a63ff19b6
check stream existence before assignment, fix #1222
...
Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 03:38:47 +00:00
1a40491ef2
Add ff_ prefixes to exported symbols in libavformat/riff.h.
...
patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
53e099de8b
check atom size against edit_count to avoid very long loop
...
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 02:07:41 +00:00
86b61d4241
Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
...
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.
Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:50:57 +00:00
bbe46bc4c2
Remove time_rate, we cannot compute exactly when fragments are
...
used and we cannot determine if fragments are present or not in
streamed mode.
Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 05:13:23 +00:00
281551131d
broken stsd length might be < 16, fix elst-assert.mp4
...
Originally committed as revision 19084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 23:13:53 +00:00
7e69621f56
split audio chunks in mov demuxer
...
Originally committed as revision 19018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:36:26 +00:00
350f2c2cef
return AVERROR_EOF
...
Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:15:27 +00:00
2d5fabc87a
move increment after debug print
...
Originally committed as revision 18851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 04:08:34 +00:00
171a353159
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
...
Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 08:31:22 +00:00
41e6499996
remove comment
...
Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:57:08 +00:00
4b29ed399f
Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
...
We have now dts <= pts, note that for some B frames dts+1 == pts can happen
if a crappy timebase is used instead of correct /1001.
Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:55:03 +00:00
b24bbbb4da
Introduce codec id for MPEG-4 ALS and associate it with corresponding
...
AudioObjectType. Also bump libavcodec minor version.
Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 19:17:14 +00:00
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
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
3dd3604197
Reindent
...
Originally committed as revision 18315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:27:14 +00:00
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
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
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
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
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
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
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
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
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
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
9bf1b2683c
simplify printing
...
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:28 +00:00
f584386d54
reindent
...
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:44:16 +00:00
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
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
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
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
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
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
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
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
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
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
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
63581eb183
MOV: fix demuxing fragmented files
...
Originally committed as revision 17803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 07:57:09 +00:00
fefe43ff2c
MOV: fix crash when 'meta' occurs before first 'trak'
...
Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 18:19:44 +00:00
bc718b4720
fix missed usage of old metadata API in mov demuxer
...
Originally committed as revision 17689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:06:26 +00:00
f3592353ce
Add a context to av_log() call.
...
Originally committed as revision 17638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:31:20 +00:00
bc64cb9680
check av_get_packet return value
...
Originally committed as revision 17514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 01:07:46 +00:00
0d8f0abfb9
return AVERROR(ENOMEM) if alloc failed, set count after alloc, use variable when reallocing, based on patch by Netgem
...
Originally committed as revision 17509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 00:20:07 +00:00
54b4ea57fd
demux some more metadata tags in mov
...
Originally committed as revision 17321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 14:13:28 +00:00
49674dd052
use new metadata API in mov demuxer
...
Originally committed as revision 17309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 02:28:54 +00:00
5b4f5e5dff
fix frame size, time rate is not stts duration anymore with time offset
...
Originally committed as revision 17162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 21:11:19 +00:00
fcdd622cfc
do not set start time to 0, it is not the case with elst time offset
...
Originally committed as revision 17161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 20:19:35 +00:00
a5929abe7a
adjust time rate according to elst time offset
...
Originally committed as revision 17146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 02:32:39 +00:00
4c125b8f6e
fix compilation with DEBUG defined, field does not exist anymore
...
Originally committed as revision 17115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 02:27:26 +00:00
04e06cfa20
cosmetics: sample_to_chunk -> stsc
...
Originally committed as revision 17054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:59:31 +00:00
a234e38d6e
cosmetics: sample_to_ctime -> ctts
...
Originally committed as revision 17053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:57:28 +00:00
1975c52c2a
remove useless field
...
Originally committed as revision 17052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:55:23 +00:00
425c9962b2
fix doxygen
...
Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:39:19 +00:00
8e2fd8e1d4
Replace the calls to the deprecated av_alloc_format_context() with
...
corresponding calls to avformat_alloc_context().
Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 08:27:26 +00:00
baf2ffd329
offset dts according to edit list, hackish but works, based on patch by Reimar
...
Originally committed as revision 17037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:27:07 +00:00
bf252f7f6f
prevent reading more than container atom size, fix broken file broken_by_rev15830.MOV, fix #818
...
Originally committed as revision 16979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 23:03:41 +00:00
8dc81a4524
seek at 0 when timestamp requested is negative
...
Originally committed as revision 16815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 04:29:33 +00:00
dce25564cc
'code' is used to index a table so make it unsigned
...
this prevents using negative index and possibly crashing with broken files
Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 22:32:17 +00:00
f53ee31275
change sample aspect ratio test to be more clear, print old one
...
Originally committed as revision 16703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 21:06:57 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
9ce6c13879
export gcd function as av_gcd()
...
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 11:13:33 +00:00
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
6cdbff63cd
Use the dimensions in tkhd for timed text tracks
...
Originally committed as revision 16561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 23:24:28 +00:00
6a5d31ac25
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
...
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
64d50fa551
move ffindex set before mov_read_default so it can be used in functions
...
Originally committed as revision 16548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 21:04:25 +00:00
58e9f2edb6
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
...
Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 08:24:44 +00:00
fa50a0276f
only set le if value is 1, fix boom5.mov, issue #770
...
Originally committed as revision 16507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-09 22:13:37 +00:00
364df7b7b9
cosmetics, remove useless parenthesis and whitespaces
...
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 09:18:43 +00:00
a15328249d
set alac channels from extradata, fix alac mono in m4a
...
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 09:17:19 +00:00
271344377a
check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure
...
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 08:47:28 +00:00
6da5407401
parse pasp atom and set sample aspect ratio,
...
warn if transformation matrix differs from pasp,
based on a patch by Skal.
Originally committed as revision 16066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 22:24:56 +00:00
c3e92a6cb4
remove _t in typedef for POSIX compatibility
...
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 20:06:56 +00:00
73b458e354
Commit last ok'ed parts of QCELP decoder and enable it.
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-02 16:48:05 +00:00
061f407e53
More OKed parts of the QCELP decoder
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 22:07:00 +00:00
12e416c848
decrease atom size, fix broken files missing version/flags
...
Originally committed as revision 15872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 09:09:57 +00:00
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
86b0affd08
simplify metadata reading
...
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:17:19 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
021b8ae39b
fix if/else case
...
Originally committed as revision 14526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 21:24:30 +00:00
2288834f87
full lpcm support in mov audio stsd v2
...
Originally committed as revision 14524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 18:37:35 +00:00
aaef2bb345
support big endian lpcm with audio stsd v2
...
Originally committed as revision 14507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:45:23 +00:00
6b477e1b71
keep original codec/fourcc endianness, fix XDCAMHD.mov
...
Originally committed as revision 14506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:43:36 +00:00
9184d53a03
more complete audio stsd v2
...
Originally committed as revision 14505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:40:13 +00:00
5ef3ad59f2
move version specific parsing code before codec specific code, will be needed
...
Originally committed as revision 14504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:35:43 +00:00
138568e9da
downgrade mov negative ctts log message to warning, patch by Art Clarke, aclarke at vlideshow dot com
...
Originally committed as revision 14492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 19:44:42 +00:00
Reimar Döffinger
Baptiste Coudurier
Daniel Verkamp
David Conrad
Jai Menon
Stefano Sabatini
Ronald S. Bultje
Alex Converse
Aurelien Jacobs
Benoit Fouet
Diego Biurrun
Kenan Gillet
Diego Pettenò
Luca Abeni
Peter Ross
Art Clarke