1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

539 Commits

Author SHA1 Message Date
Baptiste Coudurier
7b1312fa55 cosmetics, remove useless parentheses, add space
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:59:43 +00:00
Baptiste Coudurier
a510991cff simplify error handling in mov_read_default
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:58:19 +00:00
Baptiste Coudurier
cb41b2b6e0 remove no more needed MOVAtom.offset field
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:51:38 +00:00
Baptiste Coudurier
7ead7e2181 remove useless code skipping data at end of hdlr atom, already done in mov_read_default
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:48:27 +00:00
Jai Menon
6866dd1237 Fix typo.
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-27 13:10:56 +00:00
David Conrad
b9c78bca26 MOV: cprt is another tag used for copyright
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:47 +00:00
David Conrad
7382902b86 MOV: Add several iTunes metadata tags
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:44 +00:00
Baptiste Coudurier
e26df9ebf1 use AVFormatContext in dprintf
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 21:03:25 +00:00
Baptiste Coudurier
adeb907137 Search relative path according to alias record when opening mov reference files.
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv

Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-15 03:26:47 +00:00
Alex Converse
ba278391ba Debug print MP4 objectTypeIndication in hex not decimal as values are listed in
hex in all official documents.

Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 02:22:19 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig.
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 20:24:23 +00:00
Baptiste Coudurier
a4cb56aaf4 change \0xa9enc tag metadata name to encoder to match id3v2
Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-06 18:59:25 +00:00
Baptiste Coudurier
bddc2df52e 10l, typo
Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 08:53:05 +00:00
Baptiste Coudurier
c2564699bf do not redundantly set stream nb_frames, it's already set in read_stts
Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:32:50 +00:00
Baptiste Coudurier
e745272196 compute dts shift with ctts value, cslg atom might be missing, fix #419
Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:30:53 +00:00
Baptiste Coudurier
fedb1eca07 check that duration is set to avoid fpe
Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:17:10 +00:00
Baptiste Coudurier
507330b9d3 warn if stream timescale is not set and set it to 1 to avoid FPE
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:11:54 +00:00
Baptiste Coudurier
55d2e32a40 fix \0xa9wrt metadata, to composer, fix issue #1501
Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 01:40:13 +00:00
haim alon
c5898e8623 compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com
Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 20:40:00 +00:00
Reimar Döffinger
f2ad907060 10l in code reading codec_name, the first byte is the length and should not
become part of the string.

Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 18:27:39 +00:00
Reimar Döffinger
19635234b1 Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg
must be valid UTF-8.

Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 09:43:56 +00:00
Baptiste Coudurier
a42bf19134 100l, typo
Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 21:06:18 +00:00
haim alon
7b5252ce3e Export mov/mp4 major and compatible brands as metadata.
Patch by haim alon, haim dot alter at gmail dot com

Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 20:51:38 +00:00
Peter Ross
2d423666c0 Make mov LPCM and AAC parsing functions public
Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 11:35:01 +00:00
Baptiste Coudurier
e4bc8af1e6 check entries against field_size, potential malloc overflow in read_stsz, fix #1357
Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:42:51 +00:00
Baptiste Coudurier
1c4bf2ec37 add one missing check for stream existence in read_elst, fix #1364
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:36:33 +00:00
Baptiste Coudurier
d862fce758 only set par if it does not indicates a rotation, ex iphone 3GS
Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 00:17:47 +00:00
Reimar Döffinger
e1c1b0ff09 Reindent after last patch.
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:40:00 +00:00
Reimar Döffinger
3fe4d5d4e6 mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.

Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:38:42 +00:00
Reimar Döffinger
5dc5c43bda mov_read_packet: extract code that searches for the stream/sample to demux next
into a separate function.

Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:57:53 +00:00
Reimar Döffinger
a2f3851166 mov_read_packet: if dv_get_packet fails, return exactly its error value
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).

Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:50:46 +00:00
Reimar Döffinger
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
Baptiste Coudurier
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
Daniel Verkamp
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
Baptiste Coudurier
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
David Conrad
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
350f2c2cef return AVERROR_EOF
Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:15:27 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
41e6499996 remove comment
Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:57:08 +00:00
Baptiste Coudurier
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
Jai Menon
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
Stefano Sabatini
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Alex Converse
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
Alex Converse
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
Aurelien Jacobs
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
Benoit Fouet
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
1975c52c2a remove useless field
Originally committed as revision 17052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:55:23 +00:00
Baptiste Coudurier
425c9962b2 fix doxygen
Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:39:19 +00:00
Stefano Sabatini
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Aurelien Jacobs
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
Baptiste Coudurier
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
Diego Biurrun
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
Aurelien Jacobs
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
Aurelien Jacobs
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
David Conrad
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
Diego Biurrun
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
Baptiste Coudurier
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
David Conrad
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