1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

198 Commits

Author SHA1 Message Date
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
Baptiste Coudurier
b6fa8a8af8 fix type in prototype
Originally committed as revision 15108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:45:00 +00:00
Baptiste Coudurier
85b5ee2b40 remove header_byte_count_offset from context
Originally committed as revision 15107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:42:05 +00:00
Baptiste Coudurier
cc98406051 simplify and correctly rewrite metadata in header partition, mark it closed complete
Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:36:25 +00:00
Baptiste Coudurier
ca276e6ae2 simplify current partition offset
Originally committed as revision 15105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:20:41 +00:00
Baptiste Coudurier
6685f639af header partition is open incomplete for now
Originally committed as revision 15102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:06:38 +00:00
Baptiste Coudurier
7d5fdf900b always write footer partition according to specs
Originally committed as revision 15100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:01:07 +00:00
Baptiste Coudurier
c5a2091295 10l fix mxf_get_essence_container_ul
Originally committed as revision 15098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:55:13 +00:00
Baptiste Coudurier
4e2f346bd1 cosmetics, mux_write -> mxf_write
Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:50:25 +00:00
Baptiste Coudurier
68f4259c12 correctly set track duration
Originally committed as revision 15096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:49:40 +00:00
Baptiste Coudurier
cdedd878c5 set duration to distinguished value
Originally committed as revision 15095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:46:50 +00:00
Baptiste Coudurier
4d41888300 correctly write codec ul, mpeg-2 needs profile and level to be set
Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:41:31 +00:00
Baptiste Coudurier
064abb8aea simplify, pass AVStream directly instead of index
Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:48:02 +00:00
Baptiste Coudurier
38573e8fb9 cosmetics, whitespace
Originally committed as revision 15085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:44:45 +00:00
Baptiste Coudurier
c872bdb0f8 remove now useless track_number_sign
Originally committed as revision 15084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:41:10 +00:00
Baptiste Coudurier
ecb71f8fe8 remove now useless mxf_essence_element_key array
Originally committed as revision 15082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:37:14 +00:00
Baptiste Coudurier
316b438f33 fix track number ul in primer pack
Originally committed as revision 15081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:34:26 +00:00
Baptiste Coudurier
b8ad3f7852 introduce MXFContainerEssencePair to associate essence element key and
essence container easily and compute essence element key in write_header

Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:33:28 +00:00
Baptiste Coudurier
e51a81e0ff cosmetics
Originally committed as revision 15079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:40:11 +00:00
Baptiste Coudurier
e14d374e10 replace sizeof(type) by sizeof *ptr
Originally committed as revision 15078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:39:34 +00:00
Baptiste Coudurier
ac0ab12fe9 merge declaration and init
Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:36:30 +00:00
Baptiste Coudurier
e7daab1e9c reindent
Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:51 +00:00
Baptiste Coudurier
3eaa53b35e simplify mxf_write_essence_container_refs
Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:36 +00:00
Baptiste Coudurier
021fa42cb1 factorize
Originally committed as revision 15074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:26:54 +00:00
Baptiste Coudurier
2cd71ce52f change [0] to *
Originally committed as revision 15073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:25:19 +00:00
Baptiste Coudurier
c18d208ae2 compute essence containers in mxf_write_header, this simplifies the code
Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:38 +00:00
Baptiste Coudurier
a2f55f22b3 get essence container ul in header and set it per track, check for unsupported codec
Originally committed as revision 15071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:54:24 +00:00
Baptiste Coudurier
179308768a move per track code in mxf_write_header to be able to check for unsupported configuration
Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:47:58 +00:00
Baptiste Coudurier
851a8297e8 rename variable
Originally committed as revision 15069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:43:14 +00:00
Baptiste Coudurier
86e456f63e fix typos
Originally committed as revision 15066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:05:42 +00:00
Baptiste Coudurier
60366dd04b cosmetics: header -> generic
Originally committed as revision 15065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:02:59 +00:00
Baptiste Coudurier
a8f6e362d6 cosmetics, remove useless braces, move comments where appropriate, remove whitespaces
Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:58:49 +00:00
Baptiste Coudurier
0b62964f54 cosmetics
Originally committed as revision 15063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:45:49 +00:00
Baptiste Coudurier
6fdb4fb0f5 simplify, and factorize
Originally committed as revision 15062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:45:32 +00:00
Baptiste Coudurier
0c0c4d6450 only put version in tag
Originally committed as revision 15061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:41:01 +00:00
Baptiste Coudurier
b43952539b simplify
Originally committed as revision 15060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:38:59 +00:00
Baptiste Coudurier
283a02c51a always write required version string local tag
Originally committed as revision 15059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:37:19 +00:00
Baptiste Coudurier
9fedbc8910 introduce mxf_write_local_tag_utf16 and factorize
Originally committed as revision 15058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:32:23 +00:00
Baptiste Coudurier
6b05863aa9 use strlen and do not write useless trailing 0 according to specs
Originally committed as revision 15057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:24:19 +00:00
Baptiste Coudurier
5f94b92077 write strings as utf16be
Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:23:11 +00:00
Baptiste Coudurier
5b9bb66df2 cosmetics, typos, case
Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:04:18 +00:00
Baptiste Coudurier
118d4e1069 cosmetics
Originally committed as revision 15026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 16:56:57 +00:00
Baptiste Coudurier
faac3f0f9f fix version string ul
Originally committed as revision 15025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 16:56:36 +00:00
Carl Eugen Hoyos
cedebde15a Remaining parts of GSoC MXF muxer by Zhentan Feng.
Originally committed as revision 14975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 15:58:25 +00:00
Vitor Sessak
9b0d3e0e03 Import more MXF muxer code from the SoC tree
Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 20:28:12 +00:00
Vitor Sessak
6986662b5f Import more ok'ed chunks of the mxf muxer from the soc tree
Originally committed as revision 14938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 05:55:46 +00:00
Aurelien Jacobs
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
Vitor Sessak
9b9466b0cd Apply parts of MXF muxer ok'ed by Michael
Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 04:12:52 +00:00
Zhentan Feng
fda0d4afa7 Ok-ed parts from patch by zhentan feng.
Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 22:01:57 +00:00
Zhentan Feng
2c8d438893 Ok-ed parts from patch by zhentan feng.
Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 12:36:17 +00:00
Zhentan Feng
e48891bd9b Ok-ed parts from patch by zhentan feng.
Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 18:11:00 +00:00
Baptiste Coudurier
b5f46e9340 import ok'd hunks for mxf muxer
Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 21:48:02 +00:00