Commit Graph

20 Commits

Author SHA1 Message Date
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>
2012-04-19 15:08:13 +02:00
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>
2012-03-11 17:39:52 +01:00
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>
2012-02-28 20:24:01 +01:00
Luca Barbato 9ef5a9deaf Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
2011-01-30 03:41:48 +01:00
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)
2011-01-26 03:43:32 +01:00
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)
2011-01-26 03:43:29 +01:00
Tomas Härdin 11fdc4d4fc mxfdec: Improve parsing of the PixelLayout item
Originally committed as revision 23898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 07:55:05 +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
Diego Biurrun c60208e7a1 Directly #include some required headers.
Originally committed as revision 16780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 19:11:10 +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
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
Baptiste Coudurier 15cdff8525 100l, add missing enum type, fix compilation
Originally committed as revision 16495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-08 07:11:43 +00:00
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
2008-10-03 10:16:29 +00:00
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
2008-08-31 07:39:47 +00:00
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
2008-08-31 01:39:42 +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 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
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 c69968b4fe Factorize common code out of the mxf demuxer.
Patch by zhentan feng.

Originally committed as revision 14826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 17:54:18 +00:00