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
92,448 Commits 37 Branches 400 Tags 458 MiB
662120f2b2
Commit Graph

365 Commits

Author SHA1 Message Date
Baptiste Coudurier
8c733013af avformat/mxfenc: simplify dnxhd handling and add more flavors 2018-10-24 09:07:19 -07:00
Carl Eugen Hoyos
b9136c1b90 lavf/mxfenc: Remove a write-only variable. 
Fixes the following warning:
libavformat/mxfenc.c:2125:22: warning: variable 'frame_size' set but not used
 2018-10-17 20:47:14 +02:00
Carl Eugen Hoyos
b4e29e6225 lavf/mxfenc: Remove two unused variables. 
Fixes the following warnings:
libavformat/mxfenc.c:2036:9: warning: unused variable 'i'
libavformat/mxfenc.c:2125:9: warning: unused variable 'i'
 2018-10-13 13:08:32 +02:00
Baptiste Coudurier
9b7ab57953 lavf/mxfenc: support creating s436m data tracks 2018-10-12 12:28:22 -07:00
Baptiste Coudurier
bb89109a0a avformat/mxfenc: correctly set content package rate in system element 2018-10-12 12:27:58 -07:00
Baptiste Coudurier
84e8a87ca0 avformat/mxfenc: update body partition with footer offset 2018-10-12 12:27:43 -07:00
Baptiste Coudurier
ea55a11ced avformat/mxfenc: add mpeg-2 specific metadata, fix compatibility with sony content browser 2018-10-12 12:26:01 -07:00
Baptiste Coudurier
3d38e45eb8 avformat/mxfenc: write index delta entry array needed by sony vegas pro 11 2018-10-12 12:15:38 -07:00
Jason Stevens
384dcd66a2 libavformat/mxfenc: fix dnxhr ul typo 
byte 8 of dnxhr codec ul should be 0x0D

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-09-15 20:00:45 +02:00
Jason Stevens
5632044939 libavformat/mxfenc: add missing dnxhr mxfcontainer essence ULs 
Add missing dnxhr mxf container essence ULs to the mxf encoder.

This fixes dnxhr mxf files being quarantined by Avid Media Composer.

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>

Reviewed-by: Baptiste Coudurier
 2018-09-10 23:17:54 +02:00
Baptiste Coudurier
130de9142e avformat/mxfenc: automatically update descriptors klv size 2018-08-22 08:07:35 -07:00
Baptiste Coudurier
955a989341 avformat/mxfenc: fix muxing when audio tracks are longer than video track 2018-08-21 12:10:41 -07:00
Michael Niedermayer
df3d962d2e libavformat/mxfenc: Add some () to attempt to workaround build issue on osx 
fixes ticket7209

Tested-by: Jim DeLaHunt <from.ffmpeg-dev@jdlh.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-27 21:38:33 +02:00
Michael Niedermayer
10ca419dd8 avformat/mxfenc: Set color siting to 0 for D10-MXF 
SMPTE 386M (D-10) lists 4 as value to be used
SMPTE 377-1-2009 says
    "The definitions of 00h (coSiting) and 04h (Rec 601) are equivalent. The value of 04h is deprecated. New
     MXF encoders shall use the value of 00h instead."

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-12 01:08:01 +02:00
Michael Niedermayer
d628caf54f avformat/mxfenc: Add Sample width/height/x offset/y offset, Display x offset and F2 offset 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-12 01:08:01 +02:00
Thomas Mundt
a3a6d4da62 avformat/mxfenc: add h264 profiles 
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-10 02:10:12 +02:00
Michael Niedermayer
293a6e8332 avformat/mxfenc: Write transfer characteristic 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
c35ca7e01c avformat/mxfenc: Add Stored F2 Offset / Image Start/End Offset for D10 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
530ac1e50b avformat/mxfenc: Write Audio Ref Level for D10 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
1246754c80 avformat/mxfenc: Add Padding Bits 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
6d0339096e avformat/mxfenc: add white/black ref /color range 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
2bee43b67d avformat/mxfenc: Add vertical subsampling support 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
77cbe698cd avformat/mxfenc: Fix stored width 
This fixes the width to have computations matching the height

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
1b6c89ca8d avformat/mxfenc: Add object model version 
Other tools (XFConvert at least) write this as well.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
86c9250923 avformat/mxfenc: Add Product Version, Toolkit version and Platform 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
3ba1bbb4f9 avformat/mxfenc: Bump minor versions for S377-1-2009 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Michael Niedermayer
5c70513418 avformat/mxfenc: Correct KAG alignment of preface 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
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>
 2017-12-08 20:02:16 +01:00
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>
 2017-12-08 20:02:16 +01:00
Mark Reid
62f7f40caa avformat/mxfenc: pass MXFPackage around instead of type 
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-11-28 21:42:48 +01:00
Michael Niedermayer
ef973bd98d avformat/mxfenc: Fix labels for IEC PAL DV 420 2017-10-03 18:34:37 +02:00
Michael Niedermayer
a56ec48d42 avformat/mxfenc: Add IEC DV25 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-03 18:34:37 +02:00
Tobias Rapp
3ffd3b7f5f avformat/mxfenc: cosmetic changes 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
 2017-09-18 08:57:09 +02:00
Tobias Rapp
35d6be199a avformat/mxfenc: fix aspect ratio when writing 16:9 DV frames 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
 2017-09-18 08:56:28 +02:00
Michael Niedermayer
de03eb622d avformat/mxfenc: Correct the Sample rate for PCM outside D10 
Based on mail from IRT

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-12 19:24:25 +02:00
Michael Niedermayer
4c33ec004f avformat/mxfenc: Comment edit rate write code like the surrounding code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-12 19:24:25 +02:00
Michael Niedermayer
4c88087f93 avformat/mxfenc: Replace more literal magic numbers by enum values. 
This also moves the enum table up as it is needed earlier

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-12 19:24:25 +02:00
Michael Niedermayer
f762555a90 avformat/mxfenc: Replace literal numbers by named enum values. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-30 02:15:36 +02:00
Michael Niedermayer
429f3266c1 avformat/mxfenc: Check that the video codec in D-10 is MPEG-2 
Others do not work, but nothing rejects them prior to this patch if the
parameters otherwise match

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-29 21:16:32 +02:00
James Almer
4de591e6fb Merge commit '83548fe894cdb455cc127f754d09905b6d23c173' 
* commit '83548fe894cdb455cc127f754d09905b6d23c173':
  lavf: fix usage of AVIOContext.seekable

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 17:02:30 -03:00
Carl Eugen Hoyos
d0c1b9821a lavf/mxfenc: Do not print a useless error message. 
The option d10_channelcount only exists for mxf_d10.
 2016-10-11 09:45:37 +02:00
Anton Khirnov
83548fe894 lavf: fix usage of AVIOContext.seekable 
It is supposed to be a flag. The only currently defined value is
AVIO_SEEKABLE_NORMAL, but other ones may be added in the future.
However all the current lavf code treats this field as a bool (mainly
for historical reasons).
Change all those cases to properly check for AVIO_SEEKABLE_NORMAL.
 2016-09-30 16:54:33 +02:00
Matthias Hunstock
b83d907780 libavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline profile 
Enable the MXF muxer to mux baseline H.264 video streams.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-08-11 02:09:16 +02:00
James Almer
f41048f6ec Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c' 
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c':
  h264: add H264_ prefix to the NAL unit types

Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c

Merged-by: James Almer <jamrial@gmail.com>
 2016-08-01 15:11:05 -03:00
Clément Bœsch
ecf65c30cf Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646' 
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
  h264: create a new header for common h264 definitions

Merged-by: Clément Bœsch <u@pkh.me>
 2016-07-29 11:13:44 +02:00
Clément Bœsch
15b26e88cb Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa' 
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa':
  h264: rename h264.[ch] to h264dec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
 2016-07-29 11:01:36 +02:00
James Almer
d688f39dc4 cosmetics: fix some misspelled words 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-07-17 13:10:27 -03:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Derek Buitenhuis
6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00