Commit Graph

130 Commits

Author SHA1 Message Date
Tomas Härdin 2ff540a0fe mxf: Add DNxHD UL
Note that the old DNxHD UL is actually JPEG 2000 according to RP224. Leaving it
as-is for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-10 18:01:03 +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
Philip de Nier 51d632cc8f mxf: add uncompressed 422 8-bit rawvideo label
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-28 20:21:48 +01:00
Philip de Nier 627cd3841b mxf: fix v210 label matching len
Must check all 16 bytes because there is a planar 10-bit format
label that has equal first 15 bytes

Review-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-28 20:20:05 +01:00
Tomas Härdin a1cb09d351 mxf: Add PictureEssenceCoding UL for V210
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 22:27:52 +02:00
Michael Niedermayer 78d7d8fe91 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Employ FF_ARRAY_ELEMS instead of manually calculating array length.
  Fixed invalid access in wavpack decoder on corrupted bitstream.
  Fixed invalid writes in wavpack decoder on corrupted bitstreams.
  Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
  rtpdec_asf: Fix integer underflow that could allow remote code execution

Conflicts:
	libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-08 22:37:31 +02:00
Diego Biurrun 6376362d15 Employ FF_ARRAY_ELEMS instead of manually calculating array length. 2011-09-08 15:57:14 +02:00
Baptiste Coudurier 1c967827d2 mxf: H.264/MPEG-4 AVC Intra support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-15 00:40:54 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00: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 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>
2011-01-25 21:48:03 +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
Stefano Sabatini 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +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 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 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
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 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
Baptiste Coudurier b80b569242 remove mxf.c, previously copied to mxfdec.c
Originally committed as revision 14661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 17:33:53 +00:00
Diego Biurrun 9e4cd83347 cosmetics: Fix mxf codec long name.
Originally committed as revision 14256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-16 17:20:21 +00:00
Baptiste Coudurier 90ffc4902e include track id in error message
Originally committed as revision 14025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 20:32:37 +00:00
Baptiste Coudurier c187f461f5 unset Track sets, relying in AVStream->priv_data and will be freed in av_close_input_file
Originally committed as revision 14016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:43:15 +00:00
Stefano Sabatini bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Diego Biurrun 245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Baptiste Coudurier 8c2a207019 just skip klv packet, when no corresponding stream is found
Originally committed as revision 12464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 17:54:36 +00:00
Baptiste Coudurier 72d334cab4 support AVDISCARD_ALL
Originally committed as revision 12350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 13:40:29 +00:00
Baptiste Coudurier 2b12d6fc79 add const
Originally committed as revision 11756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 14:58:35 +00:00
Baptiste Coudurier 76e4864583 init uid to 0
Originally committed as revision 11573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 20:00:09 +00:00
Baptiste Coudurier e20c865a55 indentation
Originally committed as revision 11572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:59:04 +00:00
Baptiste Coudurier bb085dd6f1 correctly handle sony mpeg4 extradata
Originally committed as revision 11571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:58:48 +00:00
Baptiste Coudurier 6e3ea4461f check if read child returned error
Originally committed as revision 11570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:51:55 +00:00
Baptiste Coudurier a33b2c7e39 simplify with matching len
Originally committed as revision 11568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 17:28:49 +00:00
Baptiste Coudurier 51169b61b5 simplify and detect better non frame wrapped mappings
Originally committed as revision 11567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 17:25:12 +00:00
Baptiste Coudurier 4de5906fed cosmetics: read_metadata -> read
Originally committed as revision 11566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:20:06 +00:00
Baptiste Coudurier 3f2d859b7e cosmetics
Originally committed as revision 11565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:19:06 +00:00
Baptiste Coudurier 3a9c08be1b remove unused crypto context uid
Originally committed as revision 11564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:18:32 +00:00
Baptiste Coudurier 7ee7f6f958 support dynamically allocated local tags, used by encrypted files
Originally committed as revision 11563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:17:39 +00:00
Baptiste Coudurier 57810910c7 check malloc return
Originally committed as revision 11562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 15:21:30 +00:00
Baptiste Coudurier 8513ba097c add some dv container uls
Originally committed as revision 11561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 13:16:35 +00:00
Baptiste Coudurier c9c55a5699 simplify by checking min matching len
Originally committed as revision 11560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 13:16:00 +00:00
Baptiste Coudurier ebbe25d2a3 check av_new_stream return value
Originally committed as revision 11462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 13:48:52 +00:00
Björn Axelsson 899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Baptiste Coudurier 3a319ab6aa add D-10 NTSC support
Originally committed as revision 10539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-21 16:30:58 +00:00
Baptiste Coudurier 28cf721574 extract correct d10 aes3 audio channels number
Originally committed as revision 10538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-21 16:28:17 +00:00
Panagiotis Issaris 6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:23:32 +00:00
Baptiste Coudurier 1b4818452c cosmetics remove struct name with typedef
Originally committed as revision 9194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-03 22:56:11 +00:00
Baptiste Coudurier 738ebafceb remove unused EssenceContainerData
Originally committed as revision 9193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-03 22:40:42 +00:00
Baptiste Coudurier 151bdd5d3d skip no more needed on error
Originally committed as revision 9192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-03 18:04:33 +00:00
Baptiste Coudurier 01dfc64669 remove duplicate entry since now we ignore version byte
Originally committed as revision 9191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-03 17:53:15 +00:00