Commit Graph

212 Commits

Author SHA1 Message Date
Baptiste Coudurier
989ac5a685 put dv demuxing code around ifdef
Originally committed as revision 6065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:32:52 +00:00
Baptiste Coudurier
b60c04547c support vdva fourcc (dv + dv audio in mov)
Originally committed as revision 6064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:28:11 +00:00
Baptiste Coudurier
b361ba2a45 fourcc cleanup
Originally committed as revision 5969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-09 12:11:32 +00:00
Baptiste Coudurier
61e3dd7865 enable 'NONE' audio fourcc
Originally committed as revision 5968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-09 12:10:25 +00:00
Baptiste Coudurier
2965f17b4f sample size is 1 if bits per sample is 8 and mono channel
Originally committed as revision 5920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-03 16:22:01 +00:00
Baptiste Coudurier
e40ee6a268 move common code from mov.c and movenc.c to isom.c
Originally committed as revision 5882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-01 14:58:15 +00:00
Baptiste Coudurier
986c2ccb19 add some useful debug info
Originally committed as revision 5881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-01 13:43:24 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Baptiste Coudurier
2ec7b29b98 assign exact codec id, needed when stream copy
Originally committed as revision 5705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 12:10:10 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Baptiste Coudurier
4990951be8 simplify, use LE_32, BE_32 macros
Originally committed as revision 5682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 23:23:47 +00:00
Baptiste Coudurier
cfca95f14d clean up useless code
Originally committed as revision 5669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 13:36:31 +00:00
Baptiste Coudurier
1f1890c754 better handling of partial files
Originally committed as revision 5668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 12:58:50 +00:00
Baptiste Coudurier
b72708f8f3 new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
Originally committed as revision 5667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 12:14:41 +00:00
Baptiste Coudurier
e8d2507c1a add MS ADPCM fourcc
Originally committed as revision 5655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 09:43:46 +00:00
Baptiste Coudurier
e7cc4b52f9 skip others fourcc, if present
Originally committed as revision 5654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 08:56:05 +00:00
Baptiste Coudurier
421de2575b clean
Originally committed as revision 5653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 08:45:50 +00:00
Baptiste Coudurier
05edc1a75a export all tracks to libavformat layer
Originally committed as revision 5482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-15 23:22:32 +00:00
Baptiste Coudurier
ef4c8bbfb7 check fseek return value
Originally committed as revision 5474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 23:13:59 +00:00
Baptiste Coudurier
c3daf8d833 fix unused computed value
Originally committed as revision 5473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 22:49:05 +00:00
Baptiste Coudurier
a2fe3b5869 simplify, completely ignore streams not recognized, that fixes seeking for some files
Originally committed as revision 5468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-12 13:09:19 +00:00
Baptiste Coudurier
dae5b496fd fix seeking, typo provoking hard segfault
Originally committed as revision 5402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 15:18:25 +00:00
Baptiste Coudurier
c7e63546dc fix keyframe check, stss might be there but count set to 0
Originally committed as revision 5401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 15:17:09 +00:00
Baptiste Coudurier
ed70a5099e add quicktime uncompressed 8bit 4:2:2 support
Originally committed as revision 5379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-14 14:21:06 +00:00
Baptiste Coudurier
b565ea09c7 fix spliting chunks, simplify
Originally committed as revision 5363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-11 21:29:37 +00:00
Baptiste Coudurier
bfc2a19d7a 10l, undef DEBUG
Originally committed as revision 5354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-09 22:10:17 +00:00
Baptiste Coudurier
750b4aaabb assing correct codec_id for mjpegb
Originally committed as revision 5353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-09 22:07:49 +00:00
Baptiste Coudurier
a20da52cbf skip null fourcc, fix ep2_mystery_m640_dummy.mov
Originally committed as revision 5340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-01 15:52:57 +00:00
Baptiste Coudurier
3cb4ee5124 set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
Originally committed as revision 5303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 14:18:13 +00:00
Baptiste Coudurier
b6c1bfe097 add AVID DV fourcc
Originally committed as revision 5302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 12:56:28 +00:00
Baptiste Coudurier
e0977c8045 indention
Originally committed as revision 5301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 12:53:47 +00:00
Baptiste Coudurier
5c72cad888 always skip garbage at end of atom
Originally committed as revision 5300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 12:51:58 +00:00
Baptiste Coudurier
98d12b09af move declaration to mov.h
Originally committed as revision 5299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 10:02:41 +00:00
Baptiste Coudurier
b0519015f0 ignore wrong negative cts values created by quicktime
Originally committed as revision 5229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-27 16:19:51 +00:00
Baptiste Coudurier
3ed73c46ca let vorbis decoder init too, fix mi2_vorbis51.mp4
Originally committed as revision 5223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 17:05:28 +00:00
Baptiste Coudurier
e31bd3e309 add mp3on4 detection, fix red.mp4
Originally committed as revision 5222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 16:54:53 +00:00
Baptiste Coudurier
ec04d244b5 let faad init parameters properly, fix many SBR samples
Originally committed as revision 5212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 17:03:49 +00:00
Baptiste Coudurier
99487f42b1 fix demuxing of CDR-Dinner_LAN_800k.mp4
Originally committed as revision 5211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 16:52:56 +00:00
Baptiste Coudurier
e1017f2b87 need to dissociate pcm 16bit and 8bit cases
Originally committed as revision 5210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 16:01:00 +00:00
Baptiste Coudurier
0dd39bfe5d Quicktime creates S8 that way too
Originally committed as revision 5208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 15:38:15 +00:00
Baptiste Coudurier
a66abcb1b5 vorbis seems to be 221, decodes borgcube_vorbis20.mp4, demux mi2_vorbis51.mp4 though not decoded properly (5:1), 249608749a89.3g2 is 225 and is Qclp
Originally committed as revision 5207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 15:25:43 +00:00
Baptiste Coudurier
7e815047e5 use 64bit types
Originally committed as revision 5202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-23 12:11:51 +00:00
Baptiste Coudurier
f444b977a5 clean
Originally committed as revision 5194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-22 10:56:51 +00:00
Baptiste Coudurier
1175561e19 support 64bit date/duration
Originally committed as revision 5193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-22 10:45:04 +00:00
Michael Niedermayer
8fcdd831f4 fixing current_sample vs. next_sample mess
Originally committed as revision 5190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-21 18:32:58 +00:00
Baptiste Coudurier
f4c7b001ab fix sample size for uncompressed sound
Originally committed as revision 5165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-14 00:25:46 +00:00
Baptiste Coudurier
576f144529 indention
Originally committed as revision 5156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-12 23:55:34 +00:00
Baptiste Coudurier
6f2741f4a8 use of PRI macros in dprintf
Originally committed as revision 5154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-12 15:43:22 +00:00
Baptiste Coudurier
5148a2aeeb fix conversion types in dprintf
Originally committed as revision 5153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-12 13:38:56 +00:00
Baptiste Coudurier
0ab16fe09d fix a warning when DEBUG is defined
Originally committed as revision 5152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 18:43:10 +00:00
Michael Niedermayer
70a61ed4e4 some mov files have invalid pts so we need to consider these pts too in calculating the timabase
Originally committed as revision 5149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 11:30:07 +00:00
Baptiste Coudurier
6e2695947d set track timescale to mov timescale if 0 patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 22:15:43 +00:00
Baptiste Coudurier
79c343c024 referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 21:29:48 +00:00
Baptiste Coudurier
fc5188f3d1 add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 21:22:02 +00:00
Baptiste Coudurier
6a045bf3bd Support mov stsd atom version 2.
Patch by Baptiste COUDURIER, baptiste <<dot>> coudurier <<at>> smartjog <<dot>> com

Originally committed as revision 5106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-04 01:13:13 +00:00
Baptiste Coudurier
b4712e3c8b CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
Originally committed as revision 5051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-22 23:46:20 +00:00
Baptiste Coudurier
de23f234df Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
Originally committed as revision 5038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 20:00:00 +00:00
Julian Scheid
a7f41f91e7 The current_sample field is meant to be the sample number, not an offset into
the sample data.  Don't increment it by multiples of sc->sample_size.
patch by Julian Scheid, julian _-at-_ sektor37 _-dot-_ de

Originally committed as revision 5037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 12:49:17 +00:00
Baptiste Coudurier
73920f079a simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
Originally committed as revision 5033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-18 09:08:34 +00:00
Baptiste Coudurier
bd12d3e9dc add 'in32' fourcc support patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
Originally committed as revision 5032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-18 09:05:07 +00:00
Baptiste Coudurier
4ea28253b6 add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
Originally committed as revision 5031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-18 09:03:22 +00:00
Michael Niedermayer
dcadd216f1 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
Originally committed as revision 5023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-14 23:21:17 +00:00
Michael Niedermayer
3253c51f3d useless code removal by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-13 10:40:41 +00:00
Michael Niedermayer
75b5b63179 fix demuxing of Video006.3gp
Originally committed as revision 5006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 15:06:03 +00:00
Baptiste Coudurier
232d8a1fba mov split chunks removal patch by (Baptiste COUDURIER / baptiste.coudurier smartjog com>
Originally committed as revision 5005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 14:53:47 +00:00
Michael Niedermayer
dbb4f00a2c 10l for myself
Originally committed as revision 5004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 14:50:53 +00:00
Baptiste Coudurier
4e5ef14f0a mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 10:24:43 +00:00
Alex Beregszaszi
6df84c3ad4 10l, fails to compile when debug enabled
Originally committed as revision 4998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 02:24:37 +00:00
Michael Niedermayer
3840147e12 stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
Originally committed as revision 4994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 21:43:21 +00:00
Baptiste Coudurier
e60b4ced1f mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 4982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 18:27:57 +00:00
Michael Niedermayer
cd7352d5aa simplify timebase if possible
ignore edit lists instead of always failing

Originally committed as revision 4930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-02 20:56:35 +00:00
Michael Niedermayer
378251ad08 try avi video name -> codec_id mapping if the mov one has no match
Originally committed as revision 4896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-25 16:04:31 +00:00
Diego Biurrun
4f59b684a6 Remove all stray tabs and trailing whitespace, this time for good.
Originally committed as revision 4891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-24 10:33:14 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
François Revol
ab561df995 finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
Originally committed as revision 4792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-30 20:34:08 +00:00
François Revol
b9a87c4d6c fix parsing version 1 mdhd atom (64 bit) as suggested by b-o-n-d AT gmx DOT net (unstested); added code to map language codes to stream->language[]
Originally committed as revision 4791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-30 18:25:46 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
Roberto Togni
d9b1c197e5 QDM2 compatible decoder
Originally committed as revision 4649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-18 20:16:43 +00:00
Michael Niedermayer
da7272b335 set time_base as soon as time_scale is known instead of in a unrelated chunck which might be missing
Originally committed as revision 4569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-06 22:50:58 +00:00
Michael Niedermayer
302c389e4f sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
Originally committed as revision 4558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-04 21:04:25 +00:00
Michael Niedermayer
a254c5745b kill duplicated get/put_be24()
Originally committed as revision 4460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-19 14:41:08 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
Aurelien Jacobs
a3075830f2 add hdv2 fourcc to MPEG2 codec mapping
Originally committed as revision 4412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-30 11:42:17 +00:00
Michael Niedermayer
edfaf6de29 better dont read the width/height at all, its random anyway
Originally committed as revision 4398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-27 07:09:48 +00:00
Michael Niedermayer
961e0ccdca another chapter in the neverending mov demuxer cleanup
a timebase isnt an average frame rate neither can highlevel (considering edit lists) duration be mixed with lowlevel ones

Originally committed as revision 4391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-24 11:43:08 +00:00
Michael Niedermayer
2692067a45 AVPacket.pos
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +00:00
Michael Niedermayer
e2b9cf4e2e update current_sample number for non split mode
fix chunk split decission

Originally committed as revision 4296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 10:41:52 +00:00
Michael Niedermayer
45139adf30 segfault fix
Originally committed as revision 4295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 10:25:58 +00:00
Michael Niedermayer
86d8602f62 support non interleaved mov files
Originally committed as revision 4294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 09:50:25 +00:00
Michael Niedermayer
d57b7316c5 10l (overwriting w/h with 0)
Originally committed as revision 4289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 02:06:45 +00:00
Aurelien Jacobs
a965c478b2 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
Originally committed as revision 4275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-19 00:06:27 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer
de39cdf542 reverting 1.66 -> 1.67 change
Originally committed as revision 4096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-30 00:36:30 +00:00
François Revol
0d23cb8439 Patch for "uuid" atom followed after atom "ftyp" by "QuickTime <ffmpeg AT gmail DOT com>"
Originally committed as revision 4068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 11:20:47 +00:00
Michael Niedermayer
f3356e9c9e more fine grained discarding of packets
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-17 01:25:01 +00:00
François Revol
fcc872422e Add 3IV2 4CC by "Rob Coenen" <rob AT massive-interactive DOT nl>
Originally committed as revision 4033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-12 13:31:03 +00:00
Måns Rullgård
a0f1f16597 uuid patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 4030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-11 17:13:03 +00:00