1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

201 Commits

Author SHA1 Message Date
Baptiste Coudurier
6c53bf63c6 fix rip body sid when muxing cbr
Originally committed as revision 17414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 01:05:06 +00:00
Baptiste Coudurier
42c6850ed2 simplify descriptor size computation logic
Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 00:12:05 +00:00
Baptiste Coudurier
e86a14ded9 fetch display aspect ratio from mpeg-2 essence
Originally committed as revision 17371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 12:48:45 +00:00
Baptiste Coudurier
d1fa518e9c merge mxf_write_d10_packet into mxf_write_packet
Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 10:44:38 +00:00
Baptiste Coudurier
fe5a361c3a fix mxf interleaving packet purge
Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 01:51:52 +00:00
Baptiste Coudurier
73d0869a2f compute body offset and index entry offset correctly
Originally committed as revision 17219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 22:38:05 +00:00
Baptiste Coudurier
ab91e84d2b fix slice offset computation
Originally committed as revision 17212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 19:04:30 +00:00
Baptiste Coudurier
1c6bdfa999 set mime type for mxf
Originally committed as revision 17207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:57:37 +00:00
Baptiste Coudurier
844d9e4115 simplify
Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:46:03 +00:00
Baptiste Coudurier
8d1a5af700 cosmetics, reindent, add/remove some empty lines, redundant comment
Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:34:01 +00:00
Baptiste Coudurier
bd3f81f313 MXF D-10 muxer
Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:28:20 +00:00
Baptiste Coudurier
6249143da8 store display height without vbi
Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:13:36 +00:00
Baptiste Coudurier
db6db7e505 split mpegvideo descriptor into cdci descriptor and wav common in sound common
Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:11:21 +00:00
Baptiste Coudurier
e15421fe2b write essence elements klv packets with ber4 length, more interoperable
Originally committed as revision 17200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 07:06:35 +00:00
Baptiste Coudurier
baaf7b1be1 encode klv fill item length in fixed ber 4 bytes
Originally committed as revision 17199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 05:33:11 +00:00
Baptiste Coudurier
6f0b186699 set last packet next pointer to null
Originally committed as revision 17176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 05:32:40 +00:00
Baptiste Coudurier
cfa3caf81c check body partitions count before writing
Originally committed as revision 17175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 03:38:08 +00:00
Baptiste Coudurier
7a10119057 parse mpeg2 gop header time code and use it
Originally committed as revision 17149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:02:23 +00:00
Baptiste Coudurier
7c9668cf8a write timecode track
Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 07:18:00 +00:00
Baptiste Coudurier
0cfa359660 fix last keyframe index accross body partitions
Originally committed as revision 17145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 01:06:12 +00:00
Baptiste Coudurier
1585b93a2c fix body offset
Originally committed as revision 17144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 00:56:27 +00:00
Baptiste Coudurier
9c91a0b049 fix partition offset when only one stream present
Originally committed as revision 17140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 23:25:23 +00:00
Baptiste Coudurier
0e633e2b01 fix timecode value
Originally committed as revision 17139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 22:59:13 +00:00
Baptiste Coudurier
99b170f896 write body partitions
Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 09:02:29 +00:00
Baptiste Coudurier
7524f46e21 compute index byte count in mxf_write_partition
Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 08:46:04 +00:00
Baptiste Coudurier
c1425a14f1 remove check, mxf muxer does not have track number limitation anymore
Originally committed as revision 17124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 08:35:14 +00:00
Baptiste Coudurier
4a15f3ee99 retrieve flags from mxf_parse_mpeg2_frame using a param
Originally committed as revision 17123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 08:31:48 +00:00
Baptiste Coudurier
a784cc679f 10l, edit unit offset is after klv fill
Originally committed as revision 17122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:28:53 +00:00
Baptiste Coudurier
bf31d93ad2 cosmetics, associate mxf_write_klv_fill to aligned elements
Originally committed as revision 17121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:23:51 +00:00
Baptiste Coudurier
ee1f7f4bf9 write component depth and horizontal subsampling best effort local tags
Originally committed as revision 17120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:14:39 +00:00
Baptiste Coudurier
7be3405291 fix header byte count
Originally committed as revision 17119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:09:50 +00:00
Baptiste Coudurier
b25ee3fb38 move up mxf_write_klv_fill and align index, rip and primer pack
Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 05:35:28 +00:00
Baptiste Coudurier
bd5c94b546 fix primer pack local tags uls
Originally committed as revision 17117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 05:22:38 +00:00
Baptiste Coudurier
216b6631fb correctly set multi track operational pattern
Originally committed as revision 17116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 04:53:41 +00:00
Baptiste Coudurier
16e3b0b3e6 rename ff_audio_interleave to ff_audio_rechunk_interleave
Originally committed as revision 17103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 21:34:20 +00:00
Baptiste Coudurier
59453725f2 remove useless return
Originally committed as revision 17050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:42:37 +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
Baptiste Coudurier
5ac4d7689d reuse MXFCodecUL for data def and simplify
Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:12:30 +00:00
Baptiste Coudurier
251bf87560 remove implicit header inclusions from mxf.h
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:42:38 +00:00
Baptiste Coudurier
84a2d3045b free index entries
Originally committed as revision 17040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:35:36 +00:00
Baptiste Coudurier
f1544e79f2 extract audio interleaving code from mxf muxer, will be used by gxf and dv
Originally committed as revision 17038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:31:44 +00:00
Baptiste Coudurier
d526105f08 only use 2 slices for index, one video(vbr) and one audio(cbr)
Originally committed as revision 17035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:29:49 +00:00
Baptiste Coudurier
5ccc2316ab force first track to be video and simplify
Originally committed as revision 17034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 02:38:07 +00:00
Baptiste Coudurier
67d8ac4a02 write system item
Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 02:34:56 +00:00
Baptiste Coudurier
85d0d114d0 use 512 kag size needed for d10
Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 02:13:23 +00:00
Baptiste Coudurier
f5b288902e format timestamp correctly according to specs and set it
Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 20:15:18 +00:00
Baptiste Coudurier
5ccad11da0 use timestamp as modification date
Originally committed as revision 17010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 19:30:01 +00:00
Baptiste Coudurier
eacc40e84a use timestamp as creation date
Originally committed as revision 17007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 18:32:42 +00:00
Baptiste Coudurier
1c7c6669f6 fix key frame offset with open gop
Originally committed as revision 16999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 07:47:39 +00:00
Baptiste Coudurier
034fcddf3c always write mxf time base in descriptors
Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 09:35:59 +00:00
Baptiste Coudurier
5a897cfa3c use sample rate as audio input time base
Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 04:50:47 +00:00
Baptiste Coudurier
832404cea7 exactly compute index byte count
Originally committed as revision 16981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 23:11:13 +00:00
Baptiste Coudurier
33abc1a73a be more flexible with frame rate check
Originally committed as revision 16965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:37:03 +00:00
Baptiste Coudurier
6fb625c455 cosmetics: whitespaces, empty lines
Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 20:29:31 +00:00
Baptiste Coudurier
f35254d1aa mxf does not have timestamps
Originally committed as revision 16947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 20:26:49 +00:00
Baptiste Coudurier
822617cd50 24bit pcm support
Originally committed as revision 16942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:58:33 +00:00
Baptiste Coudurier
2253d6d773 more flexible mapping selection
Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:54:10 +00:00
Baptiste Coudurier
a4397fa911 fix temporal offet of ipbb sequences, simplification welcome
Originally committed as revision 16940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:41:43 +00:00
Baptiste Coudurier
ed00d0c1b0 fix video line map tag size
Originally committed as revision 16938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:10:41 +00:00
Baptiste Coudurier
bc185fc161 fix flush and interleaving by edit units
Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:04:36 +00:00
Baptiste Coudurier
0e9dbd9685 write index table and rip, muxer works pretty well now
Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:03:38 +00:00
Baptiste Coudurier
0290074c31 factorize common wav local tags
Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:40:57 +00:00
Baptiste Coudurier
f9303ffd62 write req local tags for wav
Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:36:54 +00:00
Baptiste Coudurier
4966b98a57 adjust size when not writing f2
Originally committed as revision 16930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:00:27 +00:00
Baptiste Coudurier
8ed82d8174 do not write f2 if not interlaced
Originally committed as revision 16929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 03:49:23 +00:00
Baptiste Coudurier
cbd70c4100 write bitrate tag
Originally committed as revision 16928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 03:45:03 +00:00
Baptiste Coudurier
724e7d8d8b write display height/width tags
Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 03:35:09 +00:00
Baptiste Coudurier
0646663882 free audio fifo
Originally committed as revision 16905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:17:04 +00:00
Baptiste Coudurier
8f819636b7 change prototype of mxf_interleave_get_packet to make it compatible
with av_interleave_packet_per_dts

Originally committed as revision 16903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:51:35 +00:00
Baptiste Coudurier
59bcc93bb1 do not use PAL_samples_per_frame in init, to make init independant
Originally committed as revision 16902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:49:26 +00:00
Baptiste Coudurier
a9025f2ae4 cosmetics, remove empty lines
Originally committed as revision 16901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:47:55 +00:00
Baptiste Coudurier
a1a37f136d add my copyright as well
Originally committed as revision 16900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:54:59 +00:00
Baptiste Coudurier
aecee3b214 fix doxygen tag
Originally committed as revision 16899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:53:59 +00:00
Baptiste Coudurier
8090b222ac cosmetics, align vertically
Originally committed as revision 16898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:53:23 +00:00
Baptiste Coudurier
74334ae11e write best effort video line map
Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:23:50 +00:00
Baptiste Coudurier
4118d68f72 add frame layout local tag, best effort
Originally committed as revision 16896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:08:01 +00:00
Baptiste Coudurier
baed2ec4c2 add aes3 pcm wrapping and use it by default
Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:02:20 +00:00
Baptiste Coudurier
c6b579df52 split wav_desc in generic_sound_desc
Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:59:55 +00:00
Baptiste Coudurier
3f2795ed54 thanks to interleaving, audio is now locked
Originally committed as revision 16893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:54:30 +00:00
Baptiste Coudurier
221ef8ca38 local tag 3201 is picture essence coding, so do not write it for wav
Originally committed as revision 16892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:49:42 +00:00
Baptiste Coudurier
383dde71f7 stored height is stupidly /2 if interlaced
Originally committed as revision 16891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:46:42 +00:00
Baptiste Coudurier
959005883a add size param to write_generic_desc
Originally committed as revision 16890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:44:25 +00:00
Baptiste Coudurier
52e5cd2b10 parse mpeg2 progressive frame flag
Originally committed as revision 16889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:42:47 +00:00
Baptiste Coudurier
7c7c1a76db delay header writing and parse mpeg2 frame
Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:32:12 +00:00
Baptiste Coudurier
cc812c8c7e correctly pack and interleave pcm samples in mxf
Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:18:25 +00:00
Baptiste Coudurier
6e4668b8a9 write essence container data
Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:57:12 +00:00
Baptiste Coudurier
5e4aa542de reduce display aspect ratio
Originally committed as revision 16732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:20:36 +00:00
Baptiste Coudurier
24d6a613e0 stored height is a multiple of 16 for mpeg2
Originally committed as revision 16731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:15:46 +00:00
Baptiste Coudurier
785b0f3c54 fix umid base value, use revision 5 and generic material type
Originally committed as revision 15723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-27 00:21:42 +00:00
Baptiste Coudurier
0df4903a07 fix sound essence compression UL
Originally committed as revision 15721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:59:28 +00:00
Baptiste Coudurier
1d30d1ad4d fix start position UL
Originally committed as revision 15720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:57:41 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Luca Abeni
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
Baptiste Coudurier
b18783644c do no write multi descriptor when only one track is present
Originally committed as revision 15115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:35:09 +00:00
Baptiste Coudurier
6ae9d3faae factorize
Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:26:12 +00:00
Baptiste Coudurier
f05773ea8f remove mxf_build_structural_metadata, simplify
Originally committed as revision 15113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:25:39 +00:00
Baptiste Coudurier
98f7c5e067 move mxf_write_package to permit function merge
Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:24:00 +00:00
Baptiste Coudurier
a4d7a6781a cosmetics, Pair -> Entry
Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:20:47 +00:00
Baptiste Coudurier
d4ffc57d39 store index in table in MXFStreamContext, simplify
Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:13:44 +00:00
Baptiste Coudurier
f2ebd15952 merge descriptor write table with essence container uls table and simplify
Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:07:41 +00:00