Tomas Härdin
ff0618b5c4
avformat/mxf: Establish register of local tags
...
Tags can be marked "not used" upfront, saving some space in the primer.
av_asserts0() is used to enforce that only tags that are in the primer can actually be written.
Sharing of MasteringDisplay ULs is now done via macros.
4 years ago
Andreas Rheinhardt
ac0e75b647
avformat/mxf: Deduplicate random_index_pack_key
...
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
4 years ago
Harry Mallon
90e2a4d61b
avformat/mxfdec: Read Mastering Display Colour Volume from MXF
...
Described in Annex B SMPTE ST 2067-21:2020
Signed-off-by: Harry Mallon <harry.mallon@codex.online>
4 years ago
Harry Mallon
7031a7beae
avformat/mxfdec: Read color metadata from MXF
...
Reads color_primaries, color_trc and color_space from mxf
headers. ULs are from https://registry.smpte-ra.org/ site.
Signed-off-by: Harry Mallon <harry.mallon@codex.online>
4 years ago
Marton Balint
f69154b2c4
avformat/mxfenc: move content package rates and timebase combinations to a separate struct
...
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years ago
Marton Balint
27a8146990
avformat/mxf: get rid of samples per frame array usage
...
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years ago
Baptiste Coudurier
b401a4ab8a
avformat/mxfenc: support XAVC long gop
6 years ago
Baptiste Coudurier
bb89109a0a
avformat/mxfenc: correctly set content package rate in system element
6 years ago
Marton Balint
7ec90b168b
avformat/mxfdec: add support for determining essence wrapping scheme
...
Some code is based on bmxlib-libmxf/mxf/mxf_utils.c.
Signed-off-by: Marton Balint <cus@passwd.hu>
6 years ago
Marton Balint
bfa0b50441
avformat/mxfdec: store next_klv in KLVPacket
...
Signed-off-by: Marton Balint <cus@passwd.hu>
6 years ago
Marton Balint
183db8a80b
avformat/mxfdec: use MXFCodecUL struct to store essence description for data_essence_container_uls
...
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years ago
Mark Reid
901d87aa83
avformat/mxfenc: write reel_name if metadata key is present
...
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years ago
Mark Reid
ad2641c36b
avformat/mxfenc: use track count to generate component instance uuid
...
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years ago
Carl Eugen Hoyos
35b33f1a19
lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.
9 years ago
Michael Niedermayer
3d65570f25
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8b42b22222
avformat/mxf: Simplify PRINT_KEY()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mark Reid
43cafb956e
libavformat/mxfdec: export user comments metadata
...
Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mark Reid
e5d217f048
libavformat/mxfdec.c: initial support for EssenceGroups
...
Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mark Reid
90bf1e3046
libavformat/mxfdec: read source timecode from pulldown component
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Luca Barbato
304089aca7
mxf: Add UID print helpers
...
And use it to print non-parsed ULs.
10 years ago
Luca Barbato
6920fb2b33
mxf: Verbose debug logging
...
Print the UL in code format and in the short format used by the
specification.
11 years ago
Matthieu Bouron
e118bb1a33
mxf: Introduce ff_mxf_get_samples_per_frame
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Anton Khirnov
716d413c13
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
12 years ago
Diego Biurrun
e4cbf7529b
Give all anonymously typedeffed structs in headers a name
...
Anonymous structs cannot be forward declared and have no benefit.
12 years ago
Matthieu Bouron
41f7e0649f
mxf: export ff_mxf_get_samples_per_frame to lavf
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Joseph Artsimovich
634d670538
mxfdec: fix frame height vs field height confusion
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years ago
Philip de Nier
fda891e108
mxfdec: set pixel format for cdci picture formats
...
The properties of the CDCI Descriptor are insufficient to specify
the pixel format for uncompressed picture data. SMPTE 377-1 and
RP224v10 have defined a set of picture coding labels to indicate what
formatting was used.
This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats.
It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files
that were created before the coding labels were introduced ~2008
The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to
-1 (PIX_FMT_NONE)
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Matthieu Bouron
70ca163bc5
mxf: Fix frame layout values
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Joseph Artsimovich
84b9b4aa18
Fix frame height vs field height confusion in MXF decoding.
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Philip de Nier
34210e8df1
mxfdec: set pixel format for cdci picture formats
...
The properties of the CDCI Descriptor are insufficient to specify
the pixel format for uncompressed picture data. SMPTE 377-1 and
RP224v10 have defined a set of picture coding labels to indicate what
formatting was used.
This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats.
It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files
that were created before the coding labels were introduced ~2008
The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to
-1 (PIX_FMT_NONE)
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Luca Barbato
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
)
14 years ago
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
14 years ago
Diego Elio Pettenò
c940ed4254
Make ff_mxf_pixel_layouts static to mxf.c.
...
Also make it an anonymous structure as never it is accessed by name.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a3dffc0627
)
14 years ago
Diego Elio 'Flameeyes' Pettenò
463532310a
Don't check for DEBUG before using dprintf.
...
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 73a0b19ba3
)
14 years ago
Diego Elio Pettenò
a3dffc0627
Make ff_mxf_pixel_layouts static to mxf.c.
...
Also make it an anonymous structure as never it is accessed by name.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
Diego Elio 'Flameeyes' Pettenò
73a0b19ba3
Don't check for DEBUG before using dprintf.
...
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Tomas Härdin
11fdc4d4fc
mxfdec: Improve parsing of the PixelLayout item
...
Originally committed as revision 23898 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
5ac4d7689d
reuse MXFCodecUL for data def and simplify
...
Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Baptiste Coudurier
251bf87560
remove implicit header inclusions from mxf.h
...
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
c60208e7a1
Directly #include some required headers.
...
Originally committed as revision 16780 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Baptiste Coudurier
6e4668b8a9
write essence container data
...
Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Baptiste Coudurier
15cdff8525
100l, add missing enum type, fix compilation
...
Originally committed as revision 16495 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
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
16 years ago
Stefano Sabatini
987903826b
Globally rename the header inclusion guard names.
...
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.' to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Baptiste Coudurier
4ee873e39d
put back mxf_essence_container_uls in demuxer as static const
...
Originally committed as revision 15083 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
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
16 years ago
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
16 years ago
Vitor Sessak
9b9466b0cd
Apply parts of MXF muxer ok'ed by Michael
...
Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago