virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
68,127 Commits 37 Branches 400 Tags 458 MiB
e5d217f048
Commit Graph

148 Commits

Author SHA1 Message Date
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>
 2014-11-30 23:14:06 +01:00
Mark Reid
882fb53cb7 avformat/mxf: added ULs for demuxing avid media composer mxf files 
The AAF SDK refers to these ULs as Legacy. These ULs are the same as the
ones found in FFmbc's version of mxf.c and the ones found in libMXF
Fixes Ticket#1554, Ticket#3100 and Ticket#3450
 2014-08-18 02:36:32 +02:00
Michael Niedermayer
00aa2ebb1c Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110' 
* commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110':
  mxf: Support AAC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-17 23:06:38 +02:00
Luca Barbato
369380e1c4 mxf: Support AAC 
Update mxf_set_audio_pts to use the container-provided information.

The UL is marked as "to be changed in the future", but the current
samples in the wild do use it.
 2014-08-17 16:11:16 +02:00
Michael Niedermayer
bd9e0127c9 Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b' 
* commit '92ebb332157195b7c1212e734c5668afbf19cf2b':
  mxf: Add additional H264 PictureEssenceCoding

Conflicts:
	libavformat/mxf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-19 20:39:05 +01:00
Luca Barbato
92ebb33215 mxf: Add additional H264 PictureEssenceCoding 
Unbreak some MXF Proxy files.
 2014-03-19 11:51:08 +01:00
Michael Niedermayer
2265212396 Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32' 
* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

Conflicts:
	libavformat/mxf.c
	libavformat/mxf.h

See: 906a263813
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 22:21:57 +01:00
Matthieu Bouron
e118bb1a33 mxf: Introduce ff_mxf_get_samples_per_frame 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-06 19:28:20 +01:00
Tomas Härdin
c416b5cdf1 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: Luca Barbato <lu_zero@gentoo.org>
 2014-02-21 15:46:10 +01:00
Philip de Nier
a9099e0402 mxf: Add uncompressed 422 8-bit rawvideo UL 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-02-21 15:46:05 +01:00
Michael Niedermayer
ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:06:57 +02:00
Anton Khirnov
716d413c13 Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
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>
 2012-09-21 16:20:38 +02:00
Michael Niedermayer
7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 22:45:46 +02:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
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>
 2012-07-10 13:51:04 +02:00
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
c15da5941d mxf: Add PictureEssenceCoding UL for V210. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-21 16:28:45 +01:00
Baptiste Coudurier
4ee04247f0 mxf: H.264/MPEG-4 AVC Intra support 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-21 16:28:26 +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