videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
ffmpeg/libavformat/mxfenc.c

2765 lines
107 KiB
C
Raw Normal View History

import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
/*
* MXF muxer
* Copyright (c) 2008 GUCAS, Zhentan Feng <spyfeng at gmail dot com>
add my copyright as well Originally committed as revision 16900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:54:59 +01:00
* Copyright (c) 2008 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
avformat/mxfenc: Move sponsorship notice to its own comment block Suggested-by: BBB Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-09 02:49:49 +02:00
*/
/*
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
* signal_standard, color_siting, store_user_comments and klv_fill_key version
* fixes sponsored by NOA GmbH
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
*/
/*
* References
* SMPTE 336M KLV Data Encoding Protocol Using Key-Length-Value
* SMPTE 377M MXF File Format Specifications
* SMPTE 379M MXF Generic Container
* SMPTE 381M Mapping MPEG Streams into the MXF Generic Container
avformat/mxfenc: add jpeg2000 support. Fixes ticket #1542 reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 14:16:52 +02:00
* SMPTE 422M Mapping JPEG 2000 Codestreams into the MXF Generic Container
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
* SMPTE RP210: SMPTE Metadata Dictionary
* SMPTE RP224: Registry of SMPTE Universal Labels
*/
mxfenc: Use correct printf format specifier for int64_t libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]
2013-04-22 04:50:45 +02:00
#include <inttypes.h>
be more flexible with frame rate check Originally committed as revision 16965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 00:37:03 +01:00
#include <math.h>
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
#include <time.h>
be more flexible with frame rate check Originally committed as revision 16965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 00:37:03 +01:00
mxf: add cli option in mxfenc to replace GOP timecode parsing. This is based on the original work by Baptiste Coudurier.
2011-07-06 16:35:12 +02:00
#include "libavutil/opt.h"
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
#include "libavutil/random_seed.h"
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
#include "libavutil/timecode.h"
mxfenc: switch to av_assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:16:24 +02:00
#include "libavutil/avassert.h"
avformat/mxfenc: Set the component depth from the pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 19:59:18 +02:00
#include "libavutil/pixdesc.h"
Use gmtime_r instead of gmtime and localtime_r instead of localtime gmtime isn't thread safe in general. In msvcrt (which lacks gmtime_r), the buffer used by gmtime is thread specific though. One call to localtime is left in avconv_opt.c, where thread safety shouldn't matter (instead of making avconv depend on the libavutil internal header). Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-24 09:46:36 +02:00
#include "libavutil/time_internal.h"
remove implicit header inclusions from mxf.h Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:42:38 +01:00
#include "libavcodec/bytestream.h"
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
#include "libavcodec/dnxhddata.h"
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
#include "libavcodec/h264.h"
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
#include "libavcodec/internal.h"
extract audio interleaving code from mxf muxer, will be used by gxf and dv Originally committed as revision 17038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:31:44 +01:00
#include "audiointerleave.h"
remove implicit header inclusions from mxf.h Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:42:38 +01:00
#include "avformat.h"
mxfenc: use ffio_fill() Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 19:39:55 +02:00
#include "avio_internal.h"
mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-13 13:21:00 +02:00
#include "internal.h"
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
#include "mxf.h"
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
#include "config.h"
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
extern AVOutputFormat ff_mxf_d10_muxer;
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
extern AVOutputFormat ff_mxf_opatom_muxer;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
#define EDIT_UNITS_PER_BODY 250
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
#define KAG_SIZE 512
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
avformat: Don't anonymously typedef structs
2014-09-22 09:19:33 +02:00
typedef struct MXFLocalTagPair {
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
int local_tag;
UID uid;
} MXFLocalTagPair;
avformat: Don't anonymously typedef structs
2014-09-22 09:19:33 +02:00
typedef struct MXFIndexEntry {
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
uint8_t flags;
uint64_t offset;
fix doxygen Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 10:39:19 +01:00
unsigned slice_offset; ///< offset of audio slice
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
uint16_t temporal_ref;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
} MXFIndexEntry;
avformat: Don't anonymously typedef structs
2014-09-22 09:19:33 +02:00
typedef struct MXFStreamContext {
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
AudioInterleaveContext aic;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
UID track_essence_element_key;
cosmetics, change case and comments alignment Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:43:32 +02:00
int index; ///< index in mxf_essence_container_uls table
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
const UID *codec_ul;
cosmetics, change case and comments alignment Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:43:32 +02:00
int order; ///< interleaving order if dts are equal
Fix a bunch of common typos.
2011-10-05 14:12:42 +02:00
int interlaced; ///< whether picture is interlaced
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 14:21:41 +02:00
int field_dominance; ///< tff=1, bff=2
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
int component_depth;
avformat/mxfenc: Add color siting element Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com> Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-19 01:11:09 +02:00
int color_siting;
avformat/mxfenc: Support storing signal standard for D10 muxing Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 02:43:26 +02:00
int signal_standard;
avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 20:02:01 +02:00
int h_chroma_sub_sample;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
int temporal_reordering;
fetch display aspect ratio from mpeg-2 essence Originally committed as revision 17371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 13:48:45 +01:00
AVRational aspect_ratio; ///< display aspect ratio
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing
Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-09-09 10:02:12 +02:00
int video_bit_rate;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
} MXFStreamContext;
avformat: Don't anonymously typedef structs
2014-09-22 09:19:33 +02:00
typedef struct MXFContainerEssenceEntry {
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
UID container_ul;
UID element_ul;
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
UID codec_ul;
Fix a "function declaration isn't a prototype" warning. Originally committed as revision 24480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 14:58:28 +02:00
void (*write_desc)(AVFormatContext *, AVStream *);
cosmetics, Pair -> Entry Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:20:47 +02:00
} MXFContainerEssenceEntry;
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
static const struct {
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 11:11:04 +02:00
enum AVCodecID id;
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
int index;
} mxf_essence_mappings[] = {
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 11:11:04 +02:00
{ AV_CODEC_ID_MPEG2VIDEO, 0 },
{ AV_CODEC_ID_PCM_S24LE, 1 },
{ AV_CODEC_ID_PCM_S16LE, 1 },
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
{ AV_CODEC_ID_DVVIDEO, 15 },
{ AV_CODEC_ID_DNXHD, 24 },
avformat/mxfenc: add jpeg2000 support. Fixes ticket #1542 reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 14:16:52 +02:00
{ AV_CODEC_ID_JPEG2000, 34 },
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
{ AV_CODEC_ID_H264, 35 },
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 11:11:04 +02:00
{ AV_CODEC_ID_NONE }
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
};
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st);
add aes3 pcm wrapping and use it by default Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:02:20 +01:00
static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st);
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st);
static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st);
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
cosmetics, Pair -> Entry Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:20:47 +02:00
static const MXFContainerEssenceEntry mxf_essence_container_uls[] = {
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 },
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x00,0x00,0x00 },
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
mxf_write_mpegvideo_desc },
add aes3 pcm wrapping and use it by default Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:02:20 +01:00
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x03,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x03,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
mxf_write_aes3_desc },
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 },
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00 },
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
mxf_write_wav_desc },
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
// D-10 625/50 PAL 50mb/s
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 },
mxf_write_cdci_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
mxf_write_generic_sound_desc },
// D-10 525/60 NTSC 50mb/s
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x02,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x02 },
mxf_write_cdci_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x02,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
mxf_write_generic_sound_desc },
// D-10 625/50 PAL 40mb/s
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x03 },
mxf_write_cdci_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
mxf_write_generic_sound_desc },
// D-10 525/60 NTSC 40mb/s
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x04,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x04 },
mxf_write_cdci_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x04,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
mxf_write_generic_sound_desc },
// D-10 625/50 PAL 30mb/s
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 },
mxf_write_cdci_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
mxf_write_generic_sound_desc },
// D-10 525/60 NTSC 30mb/s
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x05,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x06 },
mxf_write_cdci_desc },
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x06,0x01,0x10,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 },
mxf_write_generic_sound_desc },
Fix "knwon" typo and add a check in tools/patcheck Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-04 20:12:08 +01:00
// DV Unknown
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x7F,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00,0x00,0x00 },
mxf_write_cdci_desc },
// DV25 525/60
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x40,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x01,0x00 },
mxf_write_cdci_desc },
// DV25 625/50
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 },
mxf_write_cdci_desc },
// DV50 525/60
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x50,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x03,0x00 },
mxf_write_cdci_desc },
// DV50 625/50
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x51,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 },
mxf_write_cdci_desc },
// DV100 1080/60
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x60,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x05,0x00 },
mxf_write_cdci_desc },
// DV100 1080/50
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x61,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x06,0x00 },
mxf_write_cdci_desc },
// DV100 720/60
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x62,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x07,0x00 },
mxf_write_cdci_desc },
// DV100 720/50
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x63,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x08,0x00 },
mxf_write_cdci_desc },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
// DNxHD 1080p 10bit high
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 1080p 8bit medium
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 1080p 8bit high
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 1080i 10bit high
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 1080i 8bit medium
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 1080i 8bit high
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 720p 10bit
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 720p 8bit high
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 720p 8bit medium
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
// DNxHD 720p 8bit low
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 },
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf_write_cdci_desc },
avformat/mxfenc: add jpeg2000 support. Fixes ticket #1542 reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 14:16:52 +02:00
// JPEG2000
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 },
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x08,0x00 },
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 },
mxf_write_cdci_desc },
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
// H.264
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x0D,0x01,0x03,0x01,0x02,0x10,0x60,0x01 },
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x00,0x00,0x00 },
mxf_write_mpegvideo_desc },
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
{ { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
NULL },
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
};
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
typedef struct MXFContext {
mxf: add cli option in mxfenc to replace GOP timecode parsing. This is based on the original work by Baptiste Coudurier.
2011-07-06 16:35:12 +02:00
AVClass *av_class;
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
int64_t footer_partition_offset;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
int essence_container_count;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
AVRational time_base;
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
int header_written;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
MXFIndexEntry *index_entries;
unsigned edit_units_count;
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
uint64_t timestamp; ///< timestamp, as year(16),month(8),day(8),hour(8),minutes(8),msec/4(8)
fix doxygen Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 10:39:19 +01:00
uint8_t slice_count; ///< index slice count minus 1 (1 if no audio, 0 otherwise)
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
int last_indexed_edit_unit;
uint64_t *body_partition_offset;
unsigned body_partitions_count;
int last_key_index; ///< index of last key frame
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
uint64_t duration;
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
AVTimecode tc; ///< timecode context
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
AVStream *timecode_track;
int timecode_base; ///< rounded time code base (25 or 30)
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
int edit_unit_byte_count; ///< fixed edit unit byte count
compute body offset and index entry offset correctly Originally committed as revision 17219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 23:38:05 +01:00
uint64_t body_offset;
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
uint32_t instance_number;
uint8_t umid[16]; ///< unique material identifier
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
int channel_count;
avformat/mxfenc: Allow overriding /manual setting of the signal standard previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 03:06:12 +02:00
int signal_standard;
libavformat/mxfenc: write user comment metadata Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 01:59:50 +01:00
uint32_t tagged_value_count;
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
AVRational audio_edit_rate;
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
int store_user_comments;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
} MXFContext;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd };
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
static const uint8_t umid_ul[] = { 0x06,0x0A,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x01,0x0D,0x00,0x13 };
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
/**
* complete key for operation pattern, partitions, and primer pack
*/
always use multi track since timecode track is present Originally committed as revision 17423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 08:13:57 +01:00
static const uint8_t op1a_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x01,0x09,0x00 };
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
static const uint8_t opatom_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x02,0x01,0x10,0x03,0x00,0x00 };
cosmetics: whitespaces, empty lines Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 21:29:31 +01:00
static const uint8_t footer_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x04,0x04,0x00 }; // ClosedComplete
static const uint8_t primer_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x05,0x01,0x00 };
static const uint8_t index_table_segment_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x10,0x01,0x00 };
static const uint8_t random_index_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x11,0x01,0x00 };
header partition is open incomplete for now Originally committed as revision 15102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:06:38 +02:00
static const uint8_t header_open_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }; // OpenIncomplete
static const uint8_t header_closed_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x04,0x00 }; // ClosedComplete
avformat/mxfenc: Correct klv_fill_key See SMPTE 377-1-2009 6.3.3 KLV Fill Items Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 23:53:52 +02:00
static const uint8_t klv_fill_key[] = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x10,0x01,0x00,0x00,0x00 };
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
static const uint8_t body_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x03,0x04,0x00 }; // ClosedComplete
header partition is open incomplete for now Originally committed as revision 15102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:06:38 +02:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
/**
* partial key for header metadata
*/
static const uint8_t header_metadata_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01 };
cosmetics: whitespaces, empty lines Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 21:29:31 +01:00
static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 };
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
/**
* SMPTE RP210 http://www.smpte-ra.org/mdd/index.html
*/
static const MXFLocalTagPair mxf_local_tag_batch[] = {
// preface set
{ 0x3C0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x02,0x00,0x00,0x00,0x00}}, /* Instance UID */
{ 0x3B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x04,0x00,0x00}}, /* Last Modified Date */
{ 0x3B05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x01,0x02,0x01,0x05,0x00,0x00,0x00}}, /* Version */
{ 0x3B06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x04,0x00,0x00}}, /* Identifications reference */
{ 0x3B03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x01,0x00,0x00}}, /* Content Storage reference */
{ 0x3B09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x03,0x00,0x00,0x00,0x00}}, /* Operational Pattern UL */
{ 0x3B0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x10,0x02,0x01,0x00,0x00}}, /* Essence Containers UL batch */
{ 0x3B0B, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x01,0x02,0x02,0x10,0x02,0x02,0x00,0x00}}, /* DM Schemes UL batch */
// Identification
{ 0x3C09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x01,0x00,0x00,0x00}}, /* This Generation UID */
{ 0x3C01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x02,0x01,0x00,0x00}}, /* Company Name */
{ 0x3C02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x03,0x01,0x00,0x00}}, /* Product Name */
fix version string ul Originally committed as revision 15025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 18:56:36 +02:00
{ 0x3C04, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x05,0x01,0x00,0x00}}, /* Version String */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
{ 0x3C05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x20,0x07,0x01,0x07,0x00,0x00,0x00}}, /* Product ID */
{ 0x3C06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x03,0x00,0x00}}, /* Modification Date */
// Content Storage
{ 0x1901, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x05,0x01,0x00,0x00}}, /* Package strong reference batch */
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
{ 0x1902, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x05,0x02,0x00,0x00}}, /* Package strong reference batch */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// Essence Container Data
{ 0x2701, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x06,0x01,0x00,0x00,0x00}}, /* Linked Package UID */
{ 0x3F07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x01,0x03,0x04,0x04,0x00,0x00,0x00,0x00}}, /* BodySID */
// Package
{ 0x4401, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x15,0x10,0x00,0x00,0x00,0x00}}, /* Package UID */
{ 0x4405, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x01,0x03,0x00,0x00}}, /* Package Creation Date */
{ 0x4404, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x10,0x02,0x05,0x00,0x00}}, /* Package Modified Date */
libavformat/mxfenc: add container duration and package name to primer pack Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22 00:45:27 +01:00
{ 0x4402, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x03,0x03,0x02,0x01,0x00,0x00,0x00}}, /* Package Name */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
{ 0x4403, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x05,0x00,0x00}}, /* Tracks Strong reference array */
{ 0x4701, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x03,0x00,0x00}}, /* Descriptor */
// Track
{ 0x4801, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x01,0x07,0x01,0x01,0x00,0x00,0x00,0x00}}, /* Track ID */
fix track number ul in primer pack Originally committed as revision 15081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:34:26 +02:00
{ 0x4804, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x01,0x04,0x01,0x03,0x00,0x00,0x00,0x00}}, /* Track Number */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
{ 0x4B01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x30,0x04,0x05,0x00,0x00,0x00,0x00}}, /* Edit Rate */
{ 0x4B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x03,0x00,0x00}}, /* Origin */
{ 0x4803, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x04,0x00,0x00}}, /* Sequence reference */
// Sequence
{ 0x0201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x07,0x01,0x00,0x00,0x00,0x00,0x00}}, /* Data Definition UL */
{ 0x0202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x02,0x01,0x01,0x03,0x00,0x00}}, /* Duration */
{ 0x1001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x09,0x00,0x00}}, /* Structural Components reference array */
// Source Clip
fix primer pack local tags uls Originally committed as revision 17117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:22:38 +01:00
{ 0x1201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x04,0x00,0x00}}, /* Start position */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
{ 0x1101, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x03,0x01,0x00,0x00,0x00}}, /* SourcePackageID */
{ 0x1102, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x03,0x02,0x00,0x00,0x00}}, /* SourceTrackID */
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
// Timecode Component
{ 0x1501, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x05,0x00,0x00}}, /* Start Time Code */
{ 0x1502, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x04,0x01,0x01,0x02,0x06,0x00,0x00}}, /* Rounded Time Code Base */
{ 0x1503, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x04,0x01,0x01,0x05,0x00,0x00,0x00}}, /* Drop Frame */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:04:18 +02:00
// File Descriptor
{ 0x3F01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x04,0x06,0x0B,0x00,0x00}}, /* Sub Descriptors reference array */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
{ 0x3006, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x06,0x01,0x01,0x03,0x05,0x00,0x00,0x00}}, /* Linked Track ID */
{ 0x3001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x01,0x00,0x00,0x00,0x00}}, /* SampleRate */
libavformat/mxfenc: add container duration and package name to primer pack Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22 00:45:27 +01:00
{ 0x3002, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x06,0x01,0x02,0x00,0x00,0x00,0x00}}, /* ContainerDuration */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:04:18 +02:00
{ 0x3004, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x01,0x02,0x00,0x00}}, /* Essence Container */
// Generic Picture Essence Descriptor
add frame layout local tag, best effort Originally committed as revision 16896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:08:01 +01:00
{ 0x320C, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Frame Layout */
fix primer pack local tags uls Originally committed as revision 17117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:22:38 +01:00
{ 0x320D, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x03,0x02,0x05,0x00,0x00,0x00}}, /* Video Line Map */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:04:18 +02:00
{ 0x3203, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x02,0x00,0x00,0x00}}, /* Stored Width */
{ 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* Stored Height */
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:35:09 +01:00
{ 0x3209, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0C,0x00,0x00,0x00}}, /* Display Width */
{ 0x3208, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0B,0x00,0x00,0x00}}, /* Display Height */
libavformat/mxfenc.c: Add 'Presentation Y offset' metadata Previously unset, and some software mishandles files if it is absent Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 12:11:17 +02:00
{ 0x320B, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0E,0x00,0x00,0x00}}, /* Presentation Y offset */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:04:18 +02:00
{ 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */
{ 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 14:21:41 +02:00
{ 0x3212, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x03,0x01,0x06,0x00,0x00,0x00}}, /* Field Dominance (Opt) */
avformat/mxfenc: Support storing signal standard for D10 muxing Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 02:43:26 +02:00
{ 0x3215, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x05,0x01,0x13,0x00,0x00,0x00,0x00}}, /* Signal Standard */
write component depth and horizontal subsampling best effort local tags Originally committed as revision 17120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:14:39 +01:00
// CDCI Picture Essence Descriptor
{ 0x3301, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x03,0x0A,0x00,0x00,0x00}}, /* Component Depth */
{ 0x3302, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x05,0x00,0x00,0x00}}, /* Horizontal Subsampling */
avformat/mxfenc: Add color siting element Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com> Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-19 01:11:09 +02:00
{ 0x3303, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x06,0x00,0x00,0x00}}, /* Color Siting */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:04:18 +02:00
// Generic Sound Essence Descriptor
fix primer pack local tags uls Originally committed as revision 17117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:22:38 +01:00
{ 0x3D02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x02,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Locked/Unlocked */
cosmetics, typos, case Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 19:04:18 +02:00
{ 0x3D03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x01,0x01,0x01,0x00,0x00}}, /* Audio sampling rate */
{ 0x3D07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x01,0x01,0x04,0x00,0x00,0x00}}, /* ChannelCount */
{ 0x3D01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x02,0x03,0x03,0x04,0x00,0x00,0x00}}, /* Quantization bits */
fix sound essence compression UL Originally committed as revision 15721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-27 00:59:28 +01:00
{ 0x3D06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x02,0x04,0x02,0x00,0x00,0x00,0x00}}, /* Sound Essence Compression */
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// Index Table Segment
{ 0x3F0B, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x05,0x30,0x04,0x06,0x00,0x00,0x00,0x00}}, /* Index Edit Rate */
{ 0x3F0C, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x07,0x02,0x01,0x03,0x01,0x0A,0x00,0x00}}, /* Index Start Position */
{ 0x3F0D, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x07,0x02,0x02,0x01,0x01,0x02,0x00,0x00}}, /* Index Duration */
fix primer pack local tags uls Originally committed as revision 17117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:22:38 +01:00
{ 0x3F05, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x06,0x02,0x01,0x00,0x00,0x00,0x00}}, /* Edit Unit Byte Count */
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
{ 0x3F06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x01,0x03,0x04,0x05,0x00,0x00,0x00,0x00}}, /* IndexSID */
{ 0x3F08, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x04,0x04,0x01,0x01,0x00,0x00,0x00}}, /* Slice Count */
{ 0x3F09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x04,0x04,0x01,0x06,0x00,0x00,0x00}}, /* Delta Entry Array */
{ 0x3F0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x04,0x04,0x02,0x05,0x00,0x00,0x00}}, /* Index Entry Array */
write bitrate tag Originally committed as revision 16928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:45:03 +01:00
// MPEG video Descriptor
{ 0x8000, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0B,0x00,0x00}}, /* BitRate */
write profile and level local tag in mpeg descriptor Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 09:49:12 +02:00
{ 0x8007, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0A,0x00,0x00}}, /* ProfileAndLevel */
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:36:54 +01:00
// Wave Audio Essence Descriptor
{ 0x3D09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x03,0x05,0x00,0x00,0x00}}, /* Average Bytes Per Second */
{ 0x3D0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x02,0x01,0x00,0x00,0x00}}, /* Block Align */
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
};
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
static const MXFLocalTagPair mxf_user_comments_local_tag[] = {
{ 0x4406, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x02,0x01,0x02,0x0C,0x00,0x00,0x00}}, /* User Comments */
{ 0x5001, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x02,0x01,0x02,0x09,0x01,0x00,0x00}}, /* Name */
{ 0x5003, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x03,0x02,0x01,0x02,0x0A,0x01,0x00,0x00}}, /* Value */
};
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static void mxf_write_uuid(AVIOContext *pb, enum MXFMetadataSetType type, int value)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
{
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, uuid_base, 12);
avio_wb16(pb, type);
avio_wb16(pb, value);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
}
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
static void mxf_write_umid(AVFormatContext *s, int type)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
{
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
MXFContext *mxf = s->priv_data;
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(s->pb, umid_ul, 13);
avio_wb24(s->pb, mxf->instance_number);
avio_write(s->pb, mxf->umid, 15);
avio_w8(s->pb, type);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static void mxf_write_refs_count(AVIOContext *pb, int ref_count)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
{
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, ref_count);
avio_wb32(pb, 16);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
}
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
static int klv_ber_length(uint64_t len)
{
if (len < 128)
return 1;
else
return (av_log2(len) >> 3) + 2;
}
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static int klv_encode_ber_length(AVIOContext *pb, uint64_t len)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
{
// Determine the best BER size
int size;
if (len < 128) {
//short form
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, len);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
return 1;
}
size = (av_log2(len) >> 3) + 1;
// long form
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0x80 + size);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
while(size) {
cosmetics: whitespaces, empty lines Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 21:29:31 +01:00
size--;
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, len >> 8 * size & 0xff);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
}
return 0;
}
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static void klv_encode_ber4_length(AVIOContext *pb, int len)
encode klv fill item length in fixed ber 4 bytes Originally committed as revision 17199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 06:33:11 +01:00
{
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0x80 + 3);
avio_wb24(pb, len);
encode klv fill item length in fixed ber 4 bytes Originally committed as revision 17199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 06:33:11 +01:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
static void klv_encode_ber9_length(AVIOContext *pb, uint64_t len)
{
avio_w8(pb, 0x80 + 8);
avio_wb64(pb, len);
}
compute essence containers in mxf_write_header, this simplifies the code Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:23:38 +02:00
/*
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:13:44 +02:00
* Get essence container ul index
compute essence containers in mxf_write_header, this simplifies the code Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:23:38 +02:00
*/
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 11:11:04 +02:00
static int mxf_get_essence_container_ul_index(enum AVCodecID id)
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
{
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:13:44 +02:00
int i;
more flexible mapping selection Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:54:10 +01:00
for (i = 0; mxf_essence_mappings[i].id; i++)
if (mxf_essence_mappings[i].id == id)
return mxf_essence_mappings[i].index;
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:13:44 +02:00
return -1;
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
}
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
static void mxf_write_primer_pack(AVFormatContext *s)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
{
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
int local_tag_number, i = 0;
uses FF_ARRAY_ELEMS() where appropriate Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 23:40:24 +02:00
local_tag_number = FF_ARRAY_ELEMS(mxf_local_tag_batch);
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
local_tag_number += mxf->store_user_comments * FF_ARRAY_ELEMS(mxf_user_comments_local_tag);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, primer_pack_key, 16);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
klv_encode_ber_length(pb, local_tag_number * 18 + 8);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, local_tag_number); // local_tag num
avio_wb32(pb, 18); // item size, always 18 according to the specs
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
for (i = 0; i < FF_ARRAY_ELEMS(mxf_local_tag_batch); i++) {
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb16(pb, mxf_local_tag_batch[i].local_tag);
avio_write(pb, mxf_local_tag_batch[i].uid, 16);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
}
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
if (mxf->store_user_comments)
for (i = 0; i < FF_ARRAY_ELEMS(mxf_user_comments_local_tag); i++) {
avio_wb16(pb, mxf_user_comments_local_tag[i].local_tag);
avio_write(pb, mxf_user_comments_local_tag[i].uid, 16);
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
}
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static void mxf_write_local_tag(AVIOContext *pb, int size, int tag)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
{
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb16(pb, tag);
avio_wb16(pb, size);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 20:11:00 +02:00
}
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static void mxf_write_metadata_key(AVIOContext *pb, unsigned int value)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
{
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, header_metadata_key, 13);
avio_wb24(pb, value);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
}
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
static void mxf_free(AVFormatContext *s)
{
int i;
for (i = 0; i < s->nb_streams; i++) {
merge declaration and init Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:36:30 +02:00
AVStream *st = s->streams[i];
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
av_freep(&st->priv_data);
}
}
reuse MXFCodecUL for data def and simplify Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 06:12:30 +01:00
static const MXFCodecUL *mxf_get_data_definition_ul(int type)
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
{
reuse MXFCodecUL for data def and simplify Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 06:12:30 +01:00
const MXFCodecUL *uls = ff_mxf_data_definition_uls;
while (uls->uid[0]) {
if (type == uls->id)
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
break;
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
uls++;
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
}
return uls;
}
mxfenc: Write MultipleDescriptor ref in Preface Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 10:23:59 +02:00
//one EC -> one descriptor. N ECs -> MultipleDescriptor + N descriptors
#define DESCRIPTOR_COUNT(essence_container_count) \
(essence_container_count > 1 ? essence_container_count + 1 : essence_container_count)
simplify mxf_write_essence_container_refs Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:28:36 +02:00
static void mxf_write_essence_container_refs(AVFormatContext *s)
Remaining parts of GSoC MXF muxer by Zhentan Feng. Originally committed as revision 14975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 17:58:25 +02:00
{
compute essence containers in mxf_write_header, this simplifies the code Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:23:38 +02:00
MXFContext *c = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
compute essence containers in mxf_write_header, this simplifies the code Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:23:38 +02:00
int i;
Remaining parts of GSoC MXF muxer by Zhentan Feng. Originally committed as revision 14975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 17:58:25 +02:00
mxfenc: Write MultipleDescriptor ref in Preface Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 10:23:59 +02:00
mxf_write_refs_count(pb, DESCRIPTOR_COUNT(c->essence_container_count));
reindent Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:28:51 +02:00
av_log(s,AV_LOG_DEBUG, "essence container count:%d\n", c->essence_container_count);
for (i = 0; i < c->essence_container_count; i++) {
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:46:03 +01:00
MXFStreamContext *sc = s->streams[i]->priv_data;
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16);
reindent Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:28:51 +02:00
}
mxfenc: Write MultipleDescriptor ref in Preface Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 10:23:59 +02:00
if (c->essence_container_count > 1)
avio_write(pb, multiple_desc_ul, 16);
Remaining parts of GSoC MXF muxer by Zhentan Feng. Originally committed as revision 14975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 17:58:25 +02:00
}
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
static void mxf_write_preface(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_metadata_key(pb, 0x012f00);
PRINT_KEY(s, "preface key", pb->buf_ptr - 16);
mxfenc: Write MultipleDescriptor ref in Preface Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 10:23:59 +02:00
klv_encode_ber_length(pb, 130 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count));
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write preface set uid
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, Preface, 0);
PRINT_KEY(s, "preface uid", pb->buf_ptr - 16);
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
// last modified date
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_local_tag(pb, 8, 0x3B02);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->timestamp);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write version
mxf_write_local_tag(pb, 2, 0x3B05);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb16(pb, 258); // v1.2
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write identification_refs
mxf_write_local_tag(pb, 16 + 8, 0x3B06);
mxf_write_refs_count(pb, 1);
mxf_write_uuid(pb, Identification, 0);
// write content_storage_refs
mxf_write_local_tag(pb, 16, 0x3B03);
mxf_write_uuid(pb, ContentStorage, 0);
correctly set multi track operational pattern Originally committed as revision 17116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 05:53:41 +01:00
// operational pattern
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_local_tag(pb, 16, 0x3B09);
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (s->oformat == &ff_mxf_opatom_muxer)
avio_write(pb, opatom_ul, 16);
else
avio_write(pb, op1a_ul, 16);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write essence_container_refs
mxfenc: Write MultipleDescriptor ref in Preface Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 10:23:59 +02:00
mxf_write_local_tag(pb, 8 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count), 0x3B0A);
simplify mxf_write_essence_container_refs Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:28:36 +02:00
mxf_write_essence_container_refs(s);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write dm_scheme_refs
mxf_write_local_tag(pb, 8, 0x3B0B);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
}
write strings as utf16be Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:11 +02:00
/*
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
* Returns the length of the UTF-16 string, in 16-bit characters, that would result
* from decoding the utf-8 string.
*/
static uint64_t mxf_utf16len(const char *utf8_str)
{
const uint8_t *q = utf8_str;
uint64_t size = 0;
while (*q) {
uint32_t ch;
GET_UTF8(ch, *q++, goto invalid;)
if (ch < 0x10000)
size++;
else
size += 2;
continue;
invalid:
cosmetics: fix some misspelled words Signed-off-by: James Almer <jamrial@gmail.com>
2016-07-17 18:10:27 +02:00
av_log(NULL, AV_LOG_ERROR, "Invalid UTF8 sequence in mxf_utf16len\n\n");
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
}
size += 1;
return size;
}
/*
* Returns the calculated length a local tag containing an utf-8 string as utf-16
*/
static int mxf_utf16_local_tag_length(const char *utf8_str)
{
uint64_t size;
if (!utf8_str)
return 0;
size = mxf_utf16len(utf8_str);
if (size >= UINT16_MAX/2) {
av_log(NULL, AV_LOG_ERROR, "utf16 local tag size %"PRIx64" invalid (too large), ignoring\n", size);
return 0;
}
return 4 + size * 2;
}
/*
* Write a local tag containing an utf-8 string as utf-16
write strings as utf16be Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:11 +02:00
*/
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
static void mxf_write_local_tag_utf16(AVIOContext *pb, int tag, const char *value)
write strings as utf16be Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:11 +02:00
{
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
uint64_t size = mxf_utf16len(value);
if (size >= UINT16_MAX/2) {
av_log(NULL, AV_LOG_ERROR, "utf16 local tag size %"PRIx64" invalid (too large), ignoring\n", size);
return;
}
introduce mxf_write_local_tag_utf16 and factorize Originally committed as revision 15058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:32:23 +02:00
mxf_write_local_tag(pb, size*2, tag);
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
avio_put_str16be(pb, value);
write strings as utf16be Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:11 +02:00
}
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
static void mxf_write_identification(AVFormatContext *s)
{
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
10l, commit that should have been stashed into the merge. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:57:50 +02:00
const char *company = "FFmpeg";
avformat/mxfenc: adjust product name when opatom muxer is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01 13:02:20 +01:00
const char *product = s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer";
always write required version string local tag Originally committed as revision 15059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:37:19 +02:00
const char *version;
simplify, and factorize Originally committed as revision 15062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:45:32 +02:00
int length;
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_metadata_key(pb, 0x013000);
PRINT_KEY(s, "identification key", pb->buf_ptr - 16);
lavf: add AVFMT_FLAG_BITEXACT. Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's codec context. Using codec options inside lavf is fragile and can easily break when the muxing codec context is not the encoding context.
2014-05-01 10:43:10 +02:00
version = s->flags & AVFMT_FLAG_BITEXACT ?
only put version in tag Originally committed as revision 15061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:41:01 +02:00
"0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION);
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
length = 72 + mxf_utf16_local_tag_length(company) +
mxf_utf16_local_tag_length(product) +
mxf_utf16_local_tag_length(version);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
klv_encode_ber_length(pb, length);
// write uid
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, Identification, 0);
PRINT_KEY(s, "identification uid", pb->buf_ptr - 16);
cosmetics Originally committed as revision 15063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:45:49 +02:00
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write generation uid
mxf_write_local_tag(pb, 16, 0x3C09);
mxf_write_uuid(pb, Identification, 1);
simplify, and factorize Originally committed as revision 15062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:45:32 +02:00
mxf_write_local_tag_utf16(pb, 0x3C01, company); // Company Name
mxf_write_local_tag_utf16(pb, 0x3C02, product); // Product Name
always write required version string local tag Originally committed as revision 15059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:37:19 +02:00
mxf_write_local_tag_utf16(pb, 0x3C04, version); // Version String
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write product uid
mxf_write_local_tag(pb, 16, 0x3C05);
mxf_write_uuid(pb, Identification, 2);
use timestamp as modification date Originally committed as revision 17010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 20:30:01 +01:00
// modification date
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_local_tag(pb, 8, 0x3C06);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->timestamp);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
}
static void mxf_write_content_storage(AVFormatContext *s)
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_metadata_key(pb, 0x011800);
PRINT_KEY(s, "content storage key", pb->buf_ptr - 16);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
klv_encode_ber_length(pb, 92);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write uid
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, ContentStorage, 0);
PRINT_KEY(s, "content storage uid", pb->buf_ptr - 16);
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write package reference
mxf_write_local_tag(pb, 16 * 2 + 8, 0x1901);
mxf_write_refs_count(pb, 2);
mxf_write_uuid(pb, MaterialPackage, 0);
mxf_write_uuid(pb, SourcePackage, 0);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
// write essence container data
mxf_write_local_tag(pb, 8 + 16, 0x1902);
mxf_write_refs_count(pb, 1);
mxf_write_uuid(pb, EssenceContainerData, 0);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
}
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
static void mxf_write_track(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type)
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 07:55:46 +02:00
{
use sample rate as audio input time base Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 05:50:47 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
merge declaration and init Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:36:30 +02:00
MXFStreamContext *sc = st->priv_data;
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 07:55:46 +02:00
mxf_write_metadata_key(pb, 0x013b00);
PRINT_KEY(s, "track key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 80);
// write track uid
mxf_write_local_tag(pb, 16, 0x3C0A);
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, st->index);
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 07:55:46 +02:00
PRINT_KEY(s, "track uid", pb->buf_ptr - 16);
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
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 07:55:46 +02:00
// write track id
mxf_write_local_tag(pb, 4, 0x4801);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, st->index+2);
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 07:55:46 +02:00
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
// write track number
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 07:55:46 +02:00
mxf_write_local_tag(pb, 4, 0x4804);
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
if (type == MaterialPackage)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 0); // track number of material package is 0
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
else
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, sc->track_essence_element_key + 12, 4);
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 07:55:46 +02:00
mxf_write_local_tag(pb, 8, 0x4B01);
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
if (st == mxf->timecode_track && s->oformat == &ff_mxf_opatom_muxer){
avio_wb32(pb, mxf->tc.rate.num);
avio_wb32(pb, mxf->tc.rate.den);
} else {
avio_wb32(pb, mxf->time_base.den);
avio_wb32(pb, mxf->time_base.num);
}
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 07:55:46 +02:00
// write origin
mxf_write_local_tag(pb, 8, 0x4B02);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0);
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 07:55:46 +02:00
// write sequence refs
mxf_write_local_tag(pb, 16, 0x4803);
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
mxf_write_uuid(pb, type == MaterialPackage ? Sequence: Sequence + TypeBottom, st->index);
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 07:55:46 +02:00
}
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
static const uint8_t smpte_12m_timecode_track_data_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x01,0x01,0x00,0x00,0x00 };
static void mxf_write_common_fields(AVFormatContext *s, AVStream *st)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
{
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
set duration to distinguished value Originally committed as revision 15095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:46:50 +02:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
// find data define uls
mxf_write_local_tag(pb, 16, 0x0201);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
if (st == mxf->timecode_track)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, smpte_12m_timecode_track_data_ul, 16);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
else {
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
const MXFCodecUL *data_def_ul = mxf_get_data_definition_ul(st->codecpar->codec_type);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, data_def_ul->uid, 16);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
// write duration
mxf_write_local_tag(pb, 8, 0x0202);
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
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 21:58:15 +02:00
if (st != mxf->timecode_track && s->oformat == &ff_mxf_opatom_muxer && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count);
} else {
avio_wb64(pb, mxf->duration);
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
}
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
static void mxf_write_sequence(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type)
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 07:55:46 +02:00
{
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
enum MXFMetadataSetType component;
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 07:55:46 +02:00
mxf_write_metadata_key(pb, 0x010f00);
PRINT_KEY(s, "sequence key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 80);
mxf_write_local_tag(pb, 16, 0x3C0A);
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
mxf_write_uuid(pb, type == MaterialPackage ? Sequence: Sequence + TypeBottom, st->index);
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 07:55:46 +02:00
PRINT_KEY(s, "sequence uid", pb->buf_ptr - 16);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf_write_common_fields(s, st);
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 07:55:46 +02:00
// write structural component
mxf_write_local_tag(pb, 16 + 8, 0x1001);
mxf_write_refs_count(pb, 1);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
if (st == mxf->timecode_track)
component = TimecodeComponent;
else
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
component = SourceClip;
if (type == SourcePackage)
component += TypeBottom;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf_write_uuid(pb, component, st->index);
}
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
static void mxf_write_timecode_component(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type)
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf_write_metadata_key(pb, 0x011400);
klv_encode_ber_length(pb, 75);
// UID
mxf_write_local_tag(pb, 16, 0x3C0A);
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
mxf_write_uuid(pb, type == MaterialPackage ? TimecodeComponent :
TimecodeComponent + TypeBottom, st->index);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf_write_common_fields(s, st);
// Start Time Code
mxf_write_local_tag(pb, 8, 0x1501);
mxf: add cli option in mxfenc to replace GOP timecode parsing. This is based on the original work by Baptiste Coudurier.
2011-07-06 16:35:12 +02:00
avio_wb64(pb, mxf->tc.start);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
// Rounded Time Code Base
mxf_write_local_tag(pb, 2, 0x1502);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb16(pb, mxf->timecode_base);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
// Drop Frame
mxf_write_local_tag(pb, 1, 0x1503);
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
avio_w8(pb, !!(mxf->tc.flags & AV_TIMECODE_FLAG_DROPFRAME));
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 07:55:46 +02:00
}
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, enum MXFMetadataSetType type)
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 07:55:46 +02:00
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
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 07:55:46 +02:00
int i;
mxf_write_metadata_key(pb, 0x011100);
PRINT_KEY(s, "sturctural component key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 108);
// write uid
mxf_write_local_tag(pb, 16, 0x3C0A);
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
mxf_write_uuid(pb, type == MaterialPackage ? SourceClip: SourceClip + TypeBottom, st->index);
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 07:55:46 +02:00
PRINT_KEY(s, "structural component uid", pb->buf_ptr - 16);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf_write_common_fields(s, st);
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 07:55:46 +02:00
// write start_position
mxf_write_local_tag(pb, 8, 0x1201);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0);
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 07:55:46 +02:00
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
// write source package uid, end of the reference
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 07:55:46 +02:00
mxf_write_local_tag(pb, 32, 0x1101);
if (type == SourcePackage) {
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
for (i = 0; i < 4; i++)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0);
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 07:55:46 +02:00
} else
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
mxf_write_umid(s, 1);
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 07:55:46 +02:00
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
// write source track id
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 07:55:46 +02:00
mxf_write_local_tag(pb, 4, 0x1102);
if (type == SourcePackage)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 0);
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 07:55:46 +02:00
else
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, st->index+2);
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 07:55:46 +02:00
}
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
static void mxf_write_multi_descriptor(AVFormatContext *s)
{
always write mxf time base in descriptors Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 10:35:59 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
const uint8_t *ul;
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
int i;
mxf_write_metadata_key(pb, 0x014400);
PRINT_KEY(s, "multiple descriptor key", pb->buf_ptr - 16);
mxfenc: Fix possible integer overflows None of these are likely unless the user is writing a file with two billion streams or a duration of around two months. This fixes CIDs 700568, 700569, 700570, 700571, 700572 and 700573. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24 17:06:49 +02:00
klv_encode_ber_length(pb, 64 + 16LL * s->nb_streams);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, MultipleDescriptor, 0);
PRINT_KEY(s, "multi_desc uid", pb->buf_ptr - 16);
// write sample rate
mxf_write_local_tag(pb, 8, 0x3001);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, mxf->time_base.den);
avio_wb32(pb, mxf->time_base.num);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write essence container ul
mxf_write_local_tag(pb, 16, 0x3004);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (mxf->essence_container_count > 1)
ul = multiple_desc_ul;
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:46:03 +01:00
else {
MXFStreamContext *sc = s->streams[0]->priv_data;
ul = mxf_essence_container_uls[sc->index].container_ul;
}
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, ul, 16);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
// write sub descriptor refs
mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x3F01);
mxf_write_refs_count(pb, s->nb_streams);
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
for (i = 0; i < s->nb_streams; i++)
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_uuid(pb, SubDescriptor, i);
}
always write mxf time base in descriptors Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 10:35:59 +01:00
static void mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
{
always write mxf time base in descriptors Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 10:35:59 +01:00
MXFContext *mxf = s->priv_data;
get essence container ul in header and set it per track, check for unsupported codec Originally committed as revision 15071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:54:24 +02:00
MXFStreamContext *sc = st->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, key, 16);
use ber4 length for descriptors preferred by specs Originally committed as revision 19337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 09:52:28 +02:00
klv_encode_ber4_length(pb, size+20+8+12+20);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, SubDescriptor, st->index);
mxf_write_local_tag(pb, 4, 0x3006);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, st->index+2);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_local_tag(pb, 8, 0x3001);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, mxf->time_base.den);
avio_wb32(pb, mxf->time_base.num);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 16, 0x3004);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
}
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
static const UID mxf_mpegvideo_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 };
static const UID mxf_wav_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 };
add aes3 pcm wrapping and use it by default Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:02:20 +01:00
static const UID mxf_aes3_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x47,0x00 };
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
static const UID mxf_cdci_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01,0x01,0x28,0x00 };
static const UID mxf_generic_sound_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01,0x01,0x42,0x00 };
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
split mpegvideo descriptor into cdci descriptor and wav common in sound common Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:11:21 +01:00
static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
{
stored height is stupidly /2 if interlaced Originally committed as revision 16891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:46:42 +01:00
MXFStreamContext *sc = st->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
int stored_height = (st->codecpar->height+15)/16*16;
store display height without vbi Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:13:36 +01:00
int display_height;
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:23:50 +01:00
int f1, f2;
Revert "do not write f2 if not interlaced" This reverts commit 8ed82d8174a666f80ab8834e3617cbe91ae740a9. SMPTE S377-1-2009c defines in F.4.1 that the Video Line Map should always be an array with two 32 bit integers as elements. This is repeated in G.2.12 with actual examples for progressive content, where the second value would always be 0. Additionally, the IRT MXF analyser also lists this as the only error in the MXF output from ffmpeg: https://mxf-analyser-cloud.irt.de Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-29 17:45:05 +01:00
unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5;
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 14:21:41 +02:00
if (sc->interlaced && sc->field_dominance)
desc_size += 5;
avformat/mxfenc: Support storing signal standard for D10 muxing Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 02:43:26 +02:00
if (sc->signal_standard)
desc_size += 5;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 14:21:41 +02:00
mxf_write_generic_desc(s, st, key, desc_size);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 4, 0x3203);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_wb32(pb, st->codecpar->width);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 4, 0x3202);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, stored_height>>sc->interlaced);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:35:09 +01:00
mxf_write_local_tag(pb, 4, 0x3209);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_wb32(pb, st->codecpar->width);
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:35:09 +01:00
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (st->codecpar->height == 608) // PAL + VBI
store display height without vbi Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:13:36 +01:00
display_height = 576;
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
else if (st->codecpar->height == 512) // NTSC + VBI
store display height without vbi Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:13:36 +01:00
display_height = 486;
else
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
display_height = st->codecpar->height;
store display height without vbi Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:13:36 +01:00
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:35:09 +01:00
mxf_write_local_tag(pb, 4, 0x3208);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, display_height>>sc->interlaced);
write display height/width tags Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:35:09 +01:00
libavformat/mxfenc.c: Add 'Presentation Y offset' metadata Previously unset, and some software mishandles files if it is absent Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 12:11:17 +02:00
// presentation Y offset
mxf_write_local_tag(pb, 4, 0x320B);
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 21:58:15 +02:00
avio_wb32(pb, (st->codecpar->height - display_height)>>sc->interlaced);
libavformat/mxfenc.c: Add 'Presentation Y offset' metadata Previously unset, and some software mishandles files if it is absent Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 12:11:17 +02:00
write component depth and horizontal subsampling best effort local tags Originally committed as revision 17120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:14:39 +01:00
// component depth
mxf_write_local_tag(pb, 4, 0x3301);
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
avio_wb32(pb, sc->component_depth);
write component depth and horizontal subsampling best effort local tags Originally committed as revision 17120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:14:39 +01:00
// horizontal subsampling
mxf_write_local_tag(pb, 4, 0x3302);
avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 20:02:01 +02:00
avio_wb32(pb, sc->h_chroma_sub_sample);
write component depth and horizontal subsampling best effort local tags Originally committed as revision 17120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:14:39 +01:00
avformat/mxfenc: Add color siting element Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com> Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-19 01:11:09 +02:00
// color siting
mxf_write_local_tag(pb, 1, 0x3303);
avio_w8(pb, sc->color_siting);
avformat/mxfenc: Support storing signal standard for D10 muxing Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 02:43:26 +02:00
if (sc->signal_standard) {
mxf_write_local_tag(pb, 1, 0x3215);
avio_w8(pb, sc->signal_standard);
}
add frame layout local tag, best effort Originally committed as revision 16896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:08:01 +01:00
// frame layout
mxf_write_local_tag(pb, 1, 0x320C);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, sc->interlaced);
add frame layout local tag, best effort Originally committed as revision 16896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:08:01 +01:00
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:23:50 +01:00
// video line map
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
switch (st->codecpar->height) {
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 21:58:15 +02:00
case 576: f1 = 23; f2 = st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO ? 335 : 336; break;
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:23:50 +01:00
case 608: f1 = 7; f2 = 320; break;
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 21:58:15 +02:00
case 480: f1 = 20; f2 = st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO ? 285 : 283; break;
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:23:50 +01:00
case 512: f1 = 7; f2 = 270; break;
case 720: f1 = 26; f2 = 0; break; // progressive
case 1080: f1 = 21; f2 = 584; break;
default: f1 = 0; f2 = 0; break;
}
if (!sc->interlaced) {
f2 = 0;
f1 *= 2;
}
Revert "do not write f2 if not interlaced" This reverts commit 8ed82d8174a666f80ab8834e3617cbe91ae740a9. SMPTE S377-1-2009c defines in F.4.1 that the Video Line Map should always be an array with two 32 bit integers as elements. This is repeated in G.2.12 with actual examples for progressive content, where the second value would always be 0. Additionally, the IRT MXF analyser also lists this as the only error in the MXF output from ffmpeg: https://mxf-analyser-cloud.irt.de Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-29 17:45:05 +01:00
mxf_write_local_tag(pb, 16, 0x320D);
avio_wb32(pb, 2);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 4);
avio_wb32(pb, f1);
Revert "do not write f2 if not interlaced" This reverts commit 8ed82d8174a666f80ab8834e3617cbe91ae740a9. SMPTE S377-1-2009c defines in F.4.1 that the Video Line Map should always be an array with two 32 bit integers as elements. This is repeated in G.2.12 with actual examples for progressive content, where the second value would always be 0. Additionally, the IRT MXF analyser also lists this as the only error in the MXF output from ffmpeg: https://mxf-analyser-cloud.irt.de Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-29 17:45:05 +01:00
avio_wb32(pb, f2);
write best effort video line map Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:23:50 +01:00
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 8, 0x320E);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, sc->aspect_ratio.num);
avio_wb32(pb, sc->aspect_ratio.den);
local tag 3201 is picture essence coding, so do not write it for wav Originally committed as revision 16892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:49:42 +01:00
mxf_write_local_tag(pb, 16, 0x3201);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, *sc->codec_ul, 16);
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 14:21:41 +02:00
if (sc->interlaced && sc->field_dominance) {
mxf_write_local_tag(pb, 1, 0x3212);
avio_w8(pb, sc->field_dominance);
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st)
{
simplify descriptor size computation logic Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 01:12:05 +01:00
mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key, 0);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
split mpegvideo descriptor into cdci descriptor and wav common in sound common Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:11:21 +01:00
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-09-09 10:02:12 +02:00
MXFStreamContext *sc = st->priv_data;
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
int profile_and_level = (st->codecpar->profile<<4) | st->codecpar->level;
split mpegvideo descriptor into cdci descriptor and wav common in sound common Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:11:21 +01:00
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 21:58:15 +02:00
if (st->codecpar->codec_id != AV_CODEC_ID_H264) {
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 21:26:25 +01:00
mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 8+5);
split mpegvideo descriptor into cdci descriptor and wav common in sound common Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:11:21 +01:00
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 21:26:25 +01:00
// bit rate
mxf_write_local_tag(pb, 4, 0x8000);
avio_wb32(pb, sc->video_bit_rate);
write profile and level local tag in mpeg descriptor Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 09:49:12 +02:00
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 21:26:25 +01:00
// profile and level
mxf_write_local_tag(pb, 1, 0x8007);
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 21:58:15 +02:00
if (!st->codecpar->profile)
mxfenc: fix indentation after last commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 21:26:25 +01:00
profile_and_level |= 0x80; // escape bit
avio_w8(pb, profile_and_level);
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
} else {
mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 0);
}
split mpegvideo descriptor into cdci descriptor and wav common in sound common Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:11:21 +01:00
}
static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
MXFContext *mxf = s->priv_data;
int show_warnings = !mxf->footer_partition_offset;
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
int duration_size = 0;
if (s->oformat == &ff_mxf_opatom_muxer)
duration_size = 12;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
mxf_write_generic_desc(s, st, key, size+duration_size+5+12+8+8);
if (duration_size > 0){
mxf_write_local_tag(pb, 8, 0x3002);
avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count);
}
thanks to interleaving, audio is now locked Originally committed as revision 16893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:54:30 +01:00
split wav_desc in generic_sound_desc Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:59:55 +01:00
// audio locked
thanks to interleaving, audio is now locked Originally committed as revision 16893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:54:30 +01:00
mxf_write_local_tag(pb, 1, 0x3D02);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 1);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
// write audio sampling rate
mxf_write_local_tag(pb, 8, 0x3D03);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_wb32(pb, st->codecpar->sample_rate);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 1);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 4, 0x3D07);
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
if (mxf->channel_count == -1) {
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 21:58:15 +02:00
if (show_warnings && (s->oformat == &ff_mxf_d10_muxer) && (st->codecpar->channels != 4) && (st->codecpar->channels != 8))
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 18:10:45 +02:00
av_log(s, AV_LOG_WARNING, "the number of audio channels shall be 4 or 8 : the output will not comply to MXF D-10 specs, use -d10_channelcount to fix this\n");
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 21:58:15 +02:00
avio_wb32(pb, st->codecpar->channels);
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
} else if (s->oformat == &ff_mxf_d10_muxer) {
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 21:58:15 +02:00
if (show_warnings && (mxf->channel_count < st->codecpar->channels))
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 18:10:45 +02:00
av_log(s, AV_LOG_WARNING, "d10_channelcount < actual number of audio channels : some channels will be discarded\n");
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
if (show_warnings && (mxf->channel_count != 4) && (mxf->channel_count != 8))
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 18:10:45 +02:00
av_log(s, AV_LOG_WARNING, "d10_channelcount shall be set to 4 or 8 : the output will not comply to MXF D-10 specs\n");
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
avio_wb32(pb, mxf->channel_count);
} else {
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
if (show_warnings && mxf->channel_count != -1 && s->oformat != &ff_mxf_opatom_muxer)
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 18:10:45 +02:00
av_log(s, AV_LOG_ERROR, "-d10_channelcount requires MXF D-10 and will be ignored\n");
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 21:58:15 +02:00
avio_wb32(pb, st->codecpar->channels);
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
mxf_write_local_tag(pb, 4, 0x3D01);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_wb32(pb, av_get_bits_per_sample(st->codecpar->codec_id));
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
}
split mpegvideo descriptor into cdci descriptor and wav common in sound common Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:11:21 +01:00
static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
split wav_desc in generic_sound_desc Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:59:55 +01:00
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:36:54 +01:00
simplify descriptor size computation logic Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 01:12:05 +01:00
mxf_write_generic_sound_common(s, st, key, size+6+8);
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:36:54 +01:00
mxf_write_local_tag(pb, 2, 0x3D0A);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_wb16(pb, st->codecpar->block_align);
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:36:54 +01:00
// avg bytes per sec
mxf_write_local_tag(pb, 4, 0x3D09);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_wb32(pb, st->codecpar->block_align*st->codecpar->sample_rate);
split wav_desc in generic_sound_desc Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:59:55 +01:00
}
factorize common wav local tags Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:40:57 +01:00
static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st)
add aes3 pcm wrapping and use it by default Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:02:20 +01:00
{
simplify descriptor size computation logic Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 01:12:05 +01:00
mxf_write_wav_common(s, st, mxf_wav_descriptor_key, 0);
factorize common wav local tags Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:40:57 +01:00
}
write req local tags for wav Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:36:54 +01:00
factorize common wav local tags Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 05:40:57 +01:00
static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st)
{
simplify descriptor size computation logic Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 01:12:05 +01:00
mxf_write_wav_common(s, st, mxf_aes3_descriptor_key, 0);
add aes3 pcm wrapping and use it by default Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 08:02:20 +01:00
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st)
{
simplify descriptor size computation logic Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 01:12:05 +01:00
mxf_write_generic_sound_common(s, st, mxf_generic_sound_descriptor_key, 0);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
libavformat/mxfenc: write user comment metadata Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 01:59:50 +01:00
static const uint8_t mxf_indirect_value_utf16le[] = { 0x4c,0x00,0x02,0x10,0x01,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 };
static int mxf_write_tagged_value(AVFormatContext *s, const char* name, const char* value)
{
MXFContext *mxf = s->priv_data;
AVIOContext *pb = s->pb;
int name_size = mxf_utf16_local_tag_length(name);
int indirect_value_size = 13 + mxf_utf16_local_tag_length(value);
if (!name_size || indirect_value_size == 13)
return 1;
mxf_write_metadata_key(pb, 0x013f00);
klv_encode_ber_length(pb, 24 + name_size + indirect_value_size);
// write instance UID
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, TaggedValue, mxf->tagged_value_count);
// write name
mxf_write_local_tag_utf16(pb, 0x5001, name); // Name
// write indirect value
mxf_write_local_tag(pb, indirect_value_size, 0x5003);
avio_write(pb, mxf_indirect_value_utf16le, 17);
avio_put_str16le(pb, value);
mxf->tagged_value_count++;
return 0;
}
static int mxf_write_user_comments(AVFormatContext *s, const AVDictionary *m)
{
MXFContext *mxf = s->priv_data;
AVDictionaryEntry *t = NULL;
int count = 0;
while ((t = av_dict_get(m, "comment_", t, AV_DICT_IGNORE_SUFFIX))) {
if (mxf->tagged_value_count >= UINT16_MAX) {
av_log(s, AV_LOG_ERROR, "too many tagged values, ignoring remaining\n");
return count;
}
if (mxf_write_tagged_value(s, t->key + 8, t->value) == 0)
count++;
}
return count;
}
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type, const char *package_name)
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
{
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
int i, track_count = s->nb_streams+1;
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
int name_size = mxf_utf16_local_tag_length(package_name);
libavformat/mxfenc: write user comment metadata Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 01:59:50 +01:00
int user_comment_count = 0;
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
if (type == MaterialPackage) {
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
if (mxf->store_user_comments)
user_comment_count = mxf_write_user_comments(s, s->metadata);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
mxf_write_metadata_key(pb, 0x013600);
PRINT_KEY(s, "Material Package key", pb->buf_ptr - 16);
avformat/mxfenc: Fix integer overflow in length computation Fixes: CID1341577 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-09 18:13:25 +01:00
klv_encode_ber_length(pb, 92 + name_size + (16*track_count) + (16*user_comment_count) + 12LL*mxf->store_user_comments);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
} else {
mxf_write_metadata_key(pb, 0x013700);
PRINT_KEY(s, "Source Package key", pb->buf_ptr - 16);
avformat/mxfenc: Fix integer overflow in length computation Fixes: CID1341577 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-09 18:13:25 +01:00
klv_encode_ber_length(pb, 112 + name_size + (16*track_count) + 12LL*mxf->store_user_comments); // 20 bytes length for descriptor reference
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
}
// write uid
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, type, 0);
av_log(s,AV_LOG_DEBUG, "package type:%d\n", type);
PRINT_KEY(s, "package uid", pb->buf_ptr - 16);
// write package umid
mxf_write_local_tag(pb, 32, 0x4401);
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
mxf_write_umid(s, type == SourcePackage);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
PRINT_KEY(s, "package umid second part", pb->buf_ptr - 16);
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
// package name
if (name_size)
mxf_write_local_tag_utf16(pb, 0x4402, package_name);
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
// package creation date
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
mxf_write_local_tag(pb, 8, 0x4405);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->timestamp);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
// package modified date
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
mxf_write_local_tag(pb, 8, 0x4404);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->timestamp);
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
// write track refs
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf_write_local_tag(pb, track_count*16 + 8, 0x4403);
mxf_write_refs_count(pb, track_count);
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
mxf_write_uuid(pb, type == MaterialPackage ? Track :
Track + TypeBottom, -1); // timecode track
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
for (i = 0; i < s->nb_streams; i++)
mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, i);
libavformat/mxfenc: write user comment metadata Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 01:59:50 +01:00
// write user comment refs
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
if (mxf->store_user_comments) {
mxf_write_local_tag(pb, user_comment_count*16 + 8, 0x4406);
mxf_write_refs_count(pb, user_comment_count);
for (i = 0; i < user_comment_count; i++)
mxf_write_uuid(pb, TaggedValue, mxf->tagged_value_count - user_comment_count + i);
}
libavformat/mxfenc: write user comment metadata Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 01:59:50 +01:00
move mxf_write_package to permit function merge Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:24:00 +02:00
// write multiple descriptor reference
if (type == SourcePackage) {
mxf_write_local_tag(pb, 16, 0x4701);
do no write multi descriptor when only one track is present Originally committed as revision 15115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:35:09 +02:00
if (s->nb_streams > 1) {
mxf_write_uuid(pb, MultipleDescriptor, 0);
mxf_write_multi_descriptor(s);
} else
mxf_write_uuid(pb, SubDescriptor, 0);
factorize Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:26:12 +02:00
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
// write timecode track
mxf_write_track(s, mxf->timecode_track, type);
mxf_write_sequence(s, mxf->timecode_track, type);
mxf_write_timecode_component(s, mxf->timecode_track, type);
cosmetics, whitespace Originally committed as revision 15085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:44:45 +02:00
for (i = 0; i < s->nb_streams; i++) {
simplify, pass AVStream directly instead of index Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:48:02 +02:00
AVStream *st = s->streams[i];
mxf_write_track(s, st, type);
mxf_write_sequence(s, st, type);
mxf_write_structural_component(s, st, type);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
if (type == SourcePackage) {
merge descriptor write table with essence container uls table and simplify Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:07:41 +02:00
MXFStreamContext *sc = st->priv_data;
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:13:44 +02:00
mxf_essence_container_uls[sc->index].write_desc(s, st);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:01:57 +02:00
}
}
}
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
static int mxf_write_essence_container_data(AVFormatContext *s)
{
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
mxf_write_metadata_key(pb, 0x012300);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
klv_encode_ber_length(pb, 72);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
mxf_write_local_tag(pb, 16, 0x3C0A); // Instance UID
mxf_write_uuid(pb, EssenceContainerData, 0);
mxf_write_local_tag(pb, 32, 0x2701); // Linked Package UID
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
mxf_write_umid(s, 1);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
mxf_write_local_tag(pb, 4, 0x3F07); // BodySID
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 1);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
mxf_write_local_tag(pb, 4, 0x3F06); // IndexSID
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 2);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
return 0;
}
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
static int mxf_write_header_metadata_sets(AVFormatContext *s)
{
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
const char *material_package_name = NULL;
const char *file_package_name = NULL;
AVDictionaryEntry *entry = NULL;
AVStream *st = NULL;
int i;
if (entry = av_dict_get(s->metadata, "material_package_name", NULL, 0))
material_package_name = entry->value;
if (entry = av_dict_get(s->metadata, "file_package_name", NULL, 0)) {
file_package_name = entry->value;
} else {
/* check if any of the streams contain a file_package_name */
for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i];
if (entry = av_dict_get(st->metadata, "file_package_name", NULL, 0)) {
file_package_name = entry->value;
break;
}
}
}
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
mxf_write_preface(s);
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_write_identification(s);
mxf_write_content_storage(s);
libavformat/mxfenc: write package name metadata Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 19:59:11 +01:00
mxf_write_package(s, MaterialPackage, material_package_name);
mxf_write_package(s, SourcePackage, file_package_name);
write essence container data Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 21:57:12 +01:00
mxf_write_essence_container_data(s);
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
return 0;
}
only use 2 slices for index, one video(vbr) and one audio(cbr) Originally committed as revision 17035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:29:49 +01:00
static unsigned klv_fill_size(uint64_t size)
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
{
only use 2 slices for index, one video(vbr) and one audio(cbr) Originally committed as revision 17035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:29:49 +01:00
unsigned pad = KAG_SIZE - (size & (KAG_SIZE-1));
encode klv fill item length in fixed ber 4 bytes Originally committed as revision 17199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 06:33:11 +01:00
if (pad < 20) // smallest fill item possible
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
return pad + KAG_SIZE;
else
return pad & (KAG_SIZE-1);
}
remove useless return Originally committed as revision 17050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 10:42:37 +01:00
static void mxf_write_index_table_segment(AVFormatContext *s)
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
int i, j, temporal_reordering = 0;
fix last keyframe index accross body partitions Originally committed as revision 17145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 02:06:12 +01:00
int key_index = mxf->last_key_index;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
av_log(s, AV_LOG_DEBUG, "edit units count %d\n", mxf->edit_units_count);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (!mxf->edit_units_count && !mxf->edit_unit_byte_count)
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
return;
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, index_table_segment_key, 16);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (mxf->edit_unit_byte_count) {
do not write slice count when muxing cbr Originally committed as revision 17417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 03:13:59 +01:00
klv_encode_ber_length(pb, 80);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
} else {
mxfenc: Fix possible integer overflows None of these are likely unless the user is writing a file with two billion streams or a duration of around two months. This fixes CIDs 700568, 700569, 700570, 700571, 700572 and 700573. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24 17:06:49 +02:00
klv_encode_ber_length(pb, 85 + 12+(s->nb_streams+1LL)*6 +
12+mxf->edit_units_count*(11+mxf->slice_count*4LL));
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// instance id
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, IndexTableSegment, 0);
// index edit rate
mxf_write_local_tag(pb, 8, 0x3F0B);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, mxf->time_base.den);
avio_wb32(pb, mxf->time_base.num);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// index start position
mxf_write_local_tag(pb, 8, 0x3F0C);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->last_indexed_edit_unit);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// index duration
mxf_write_local_tag(pb, 8, 0x3F0D);
set index duration to 0 for cbr, specifying whole container coverage Originally committed as revision 19338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 09:56:58 +02:00
if (mxf->edit_unit_byte_count)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0); // index table covers whole container
set index duration to 0 for cbr, specifying whole container coverage Originally committed as revision 19338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 09:56:58 +02:00
else
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->edit_units_count);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// edit unit byte count
mxf_write_local_tag(pb, 4, 0x3F05);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, mxf->edit_unit_byte_count);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// index sid
mxf_write_local_tag(pb, 4, 0x3F06);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 2);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// body sid
mxf_write_local_tag(pb, 4, 0x3F07);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 1);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (!mxf->edit_unit_byte_count) {
do not write slice count when muxing cbr Originally committed as revision 17417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 03:13:59 +01:00
// real slice count - 1
mxf_write_local_tag(pb, 1, 0x3F08);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, mxf->slice_count);
do not write slice count when muxing cbr Originally committed as revision 17417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 03:13:59 +01:00
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
// delta entry array
mxf_write_local_tag(pb, 8 + (s->nb_streams+1)*6, 0x3F09);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, s->nb_streams+1); // num of entries
avio_wb32(pb, 6); // size of one entry
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
// write system item delta entry
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0);
avio_w8(pb, 0); // slice entry
avio_wb32(pb, 0); // element delta
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MXFStreamContext *sc = st->priv_data;
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, sc->temporal_reordering);
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
if (sc->temporal_reordering)
temporal_reordering = 1;
if (i == 0) { // video track
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0); // slice number
avio_wb32(pb, KAG_SIZE); // system item size including klv fill
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
} else { // audio track
unsigned audio_frame_size = sc->aic.samples[0]*sc->aic.sample_size;
audio_frame_size += klv_fill_size(audio_frame_size);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 1);
avio_wb32(pb, (i-1)*audio_frame_size); // element delta
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
}
only use 2 slices for index, one video(vbr) and one audio(cbr) Originally committed as revision 17035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:29:49 +01:00
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
mxf_write_local_tag(pb, 8 + mxf->edit_units_count*(11+mxf->slice_count*4), 0x3F0A);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, mxf->edit_units_count); // num of entries
avio_wb32(pb, 11+mxf->slice_count*4); // size of one entry
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
for (i = 0; i < mxf->edit_units_count; i++) {
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
int temporal_offset = 0;
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-27 19:45:23 +02:00
if (!(mxf->index_entries[i].flags & 0x33)) { // I-frame
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
mxf->last_key_index = key_index;
key_index = i;
}
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
if (temporal_reordering) {
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
int pic_num_in_gop = i - key_index;
if (pic_num_in_gop != mxf->index_entries[i].temporal_ref) {
for (j = key_index; j < mxf->edit_units_count; j++) {
if (pic_num_in_gop == mxf->index_entries[j].temporal_ref)
break;
fix temporal offet of ipbb sequences, simplification welcome Originally committed as revision 16940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:41:43 +01:00
}
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
if (j == mxf->edit_units_count)
av_log(s, AV_LOG_WARNING, "missing frames\n");
temporal_offset = j - key_index - pic_num_in_gop;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
}
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
}
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, temporal_offset);
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
if ((mxf->index_entries[i].flags & 0x30) == 0x30) { // back and forward prediction
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, mxf->last_key_index - i);
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
} else {
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, key_index - i); // key frame offset
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
if ((mxf->index_entries[i].flags & 0x20) == 0x20) // only forward
mxf->last_key_index = key_index;
}
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-27 19:45:23 +02:00
if (!(mxf->index_entries[i].flags & 0x33) && // I-frame
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
mxf->index_entries[i].flags & 0x40 && !temporal_offset)
mxf->index_entries[i].flags |= 0x80; // random access
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, mxf->index_entries[i].flags);
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
// stream offset
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->index_entries[i].offset);
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
if (s->nb_streams > 1)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, mxf->index_entries[i].slice_offset);
fix key frame offset with open gop Originally committed as revision 16999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 08:47:39 +01:00
}
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
mxf->last_key_index = key_index - mxf->edit_units_count;
mxf->last_indexed_edit_unit += mxf->edit_units_count;
mxf->edit_units_count = 0;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
}
move up mxf_write_klv_fill and align index, rip and primer pack Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:35:28 +01:00
static void mxf_write_klv_fill(AVFormatContext *s)
{
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
unsigned pad = klv_fill_size(avio_tell(s->pb));
move up mxf_write_klv_fill and align index, rip and primer pack Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:35:28 +01:00
if (pad) {
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(s->pb, klv_fill_key, 16);
encode klv fill item length in fixed ber 4 bytes Originally committed as revision 17199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 06:33:11 +01:00
pad -= 16 + 4;
klv_encode_ber4_length(s->pb, pad);
mxfenc: use ffio_fill() Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 19:39:55 +02:00
ffio_fill(s->pb, 0, pad);
mxfenc: switch to av_assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:16:24 +02:00
av_assert1(!(avio_tell(s->pb) & (KAG_SIZE-1)));
move up mxf_write_klv_fill and align index, rip and primer pack Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:35:28 +01:00
}
}
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
static int mxf_write_partition(AVFormatContext *s, int bodysid,
compute index byte count in mxf_write_partition Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 09:46:04 +01:00
int indexsid,
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
const uint8_t *key, int write_metadata)
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 07:55:46 +02:00
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
remove header_byte_count_offset from context Originally committed as revision 15107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:42:05 +02:00
int64_t header_byte_count_offset;
compute index byte count in mxf_write_partition Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 09:46:04 +01:00
unsigned index_byte_count = 0;
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
uint64_t partition_offset = avio_tell(pb);
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
int err;
compute index byte count in mxf_write_partition Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 09:46:04 +01:00
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (!mxf->edit_unit_byte_count && mxf->edit_units_count)
index_byte_count = 85 + 12+(s->nb_streams+1)*6 +
12+mxf->edit_units_count*(11+mxf->slice_count*4);
else if (mxf->edit_unit_byte_count && indexsid)
fix partition index byte count Originally committed as revision 17424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 08:14:23 +01:00
index_byte_count = 80;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (index_byte_count) {
compute index byte count in mxf_write_partition Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 09:46:04 +01:00
// add encoded ber length
index_byte_count += 16 + klv_ber_length(index_byte_count);
index_byte_count += klv_fill_size(index_byte_count);
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (key && !memcmp(key, body_partition_key, 16)) {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = av_reallocp_array(&mxf->body_partition_offset, mxf->body_partitions_count + 1,
sizeof(*mxf->body_partition_offset))) < 0) {
mxf->body_partitions_count = 0;
return err;
}
fix partition offset when only one stream present Originally committed as revision 17140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 00:25:23 +01:00
mxf->body_partition_offset[mxf->body_partitions_count++] = partition_offset;
compute index byte count in mxf_write_partition Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 09:46:04 +01:00
}
cosmetics, remove useless braces, move comments where appropriate, remove whitespaces Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:58:49 +02:00
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 07:55:46 +02:00
// write klv
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (key)
avio_write(pb, key, 16);
else
avio_write(pb, body_partition_key, 16);
mxfenc: Write MultipleDescriptor ref in Preface Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 10:23:59 +02:00
klv_encode_ber_length(pb, 88 + 16LL * DESCRIPTOR_COUNT(mxf->essence_container_count));
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 07:55:46 +02:00
// write partition value
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb16(pb, 1); // majorVersion
avio_wb16(pb, 2); // minorVersion
avio_wb32(pb, KAG_SIZE); // KAGSize
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 07:55:46 +02:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, partition_offset); // ThisPartition
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (key && !memcmp(key, body_partition_key, 16) && mxf->body_partitions_count > 1)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->body_partition_offset[mxf->body_partitions_count-2]); // PreviousPartition
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
else if (key && !memcmp(key, footer_partition_key, 16) && mxf->body_partitions_count)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->body_partition_offset[mxf->body_partitions_count-1]); // PreviousPartition
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
else
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0);
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 07:55:46 +02:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->footer_partition_offset); // footerPartition
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 07:55:46 +02:00
// set offset
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
header_byte_count_offset = avio_tell(pb);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0); // headerByteCount, update later
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 07:55:46 +02:00
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
// indexTable
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, index_byte_count); // indexByteCount
avio_wb32(pb, index_byte_count ? indexsid : 0); // indexSID
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
// BodyOffset
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (bodysid && mxf->edit_units_count && mxf->body_partitions_count && s->oformat != &ff_mxf_opatom_muxer)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, mxf->body_offset);
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
else
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, 0);
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 07:55:46 +02:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, bodysid); // bodySID
correctly set multi track operational pattern Originally committed as revision 17116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 05:53:41 +01:00
// operational pattern
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (s->oformat == &ff_mxf_opatom_muxer)
avio_write(pb, opatom_ul, 16);
else
avio_write(pb, op1a_ul, 16);
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 07:55:46 +02:00
// essence container
simplify mxf_write_essence_container_refs Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:28:36 +02:00
mxf_write_essence_container_refs(s);
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
if (write_metadata) {
// mark the start of the headermetadata and calculate metadata size
fix header byte count Originally committed as revision 17119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 07:09:50 +01:00
int64_t pos, start;
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
unsigned header_byte_count;
move up mxf_write_klv_fill and align index, rip and primer pack Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:35:28 +01:00
mxf_write_klv_fill(s);
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
start = avio_tell(s->pb);
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
mxf_write_primer_pack(s);
mxf_write_header_metadata_sets(s);
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
pos = avio_tell(s->pb);
only use 2 slices for index, one video(vbr) and one audio(cbr) Originally committed as revision 17035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:29:49 +01:00
header_byte_count = pos - start + klv_fill_size(pos);
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
// update header_byte_count
avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-28 14:57:54 +01:00
avio_seek(pb, header_byte_count_offset, SEEK_SET);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb64(pb, header_byte_count);
avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-28 14:57:54 +01:00
avio_seek(pb, pos, SEEK_SET);
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if(key)
avio_flush(pb);
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
return 0;
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 07:55:46 +02:00
}
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st,
AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
int i, cid;
uint8_t* header_cid;
mxfenc: avoid depending on private codec structures and functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 21:18:57 +01:00
int frame_size = 0;
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
if (mxf->header_written)
return 1;
if (pkt->size < 43)
return -1;
header_cid = pkt->data + 0x28;
cid = header_cid[0] << 24 | header_cid[1] << 16 | header_cid[2] << 8 | header_cid[3];
mxfenc: avoid depending on private codec structures and functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 21:18:57 +01:00
if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) < 0)
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
return -1;
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd. Reported and early patch version tested by forum user gridtank. Reviewed-by: Tomas Härdin
2015-05-04 17:44:14 +02:00
if ((sc->interlaced = avpriv_dnxhd_get_interlaced(cid)) < 0)
return AVERROR_INVALIDDATA;
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
switch (cid) {
case 1235:
sc->index = 24;
sc->component_depth = 10;
break;
case 1237:
sc->index = 25;
break;
case 1238:
sc->index = 26;
break;
case 1241:
sc->index = 27;
sc->component_depth = 10;
break;
case 1242:
sc->index = 28;
break;
case 1243:
sc->index = 29;
break;
case 1250:
sc->index = 30;
sc->component_depth = 10;
break;
case 1251:
sc->index = 31;
break;
case 1252:
sc->index = 32;
break;
case 1253:
sc->index = 33;
break;
default:
return -1;
}
lavf/mxfenc: fix dnxhd codec uls and aspect ratio Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-09 19:29:42 +02:00
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
sc->aspect_ratio = (AVRational){ 16, 9 };
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if(s->oformat == &ff_mxf_opatom_muxer){
mxf->edit_unit_byte_count = frame_size;
return 1;
}
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf->edit_unit_byte_count = KAG_SIZE;
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MXFStreamContext *sc = st->priv_data;
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 21:58:15 +02:00
if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf->edit_unit_byte_count += 16 + 4 + sc->aic.samples[0]*sc->aic.sample_size;
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
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 21:58:15 +02:00
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
mxf->edit_unit_byte_count += 16 + 4 + frame_size;
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
}
}
return 1;
}
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
uint8_t *vs_pack, *vsc_pack;
int i, ul_index, frame_size, stype, pal;
if (mxf->header_written)
return 1;
// Check for minimal frame size
if (pkt->size < 120000)
return -1;
vs_pack = pkt->data + 80*5 + 48;
vsc_pack = pkt->data + 80*5 + 53;
stype = vs_pack[3] & 0x1f;
pal = (vs_pack[3] >> 5) & 0x1;
if ((vs_pack[2] & 0x07) == 0x02)
sc->aspect_ratio = (AVRational){ 16, 9 };
else
sc->aspect_ratio = (AVRational){ 4, 3 };
sc->interlaced = (vsc_pack[3] >> 4) & 0x01;
// TODO: fix dv encoder to set proper FF/FS value in VSC pack
// and set field dominance accordingly
// av_log(s, AV_LOG_DEBUG, "DV vsc pack ff/ss = %x\n", vsc_pack[2] >> 6);
switch (stype) {
case 0x18: // DV100 720p
ul_index = 6 + pal;
frame_size = pal ? 288000 : 240000;
if (sc->interlaced) {
lavf: add missing new line to some error messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-01 12:35:14 +02:00
av_log(s, AV_LOG_ERROR, "source marked as interlaced but codec profile is progressive\n");
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
sc->interlaced = 0;
}
break;
case 0x14: // DV100 1080i
ul_index = 4 + pal;
frame_size = pal ? 576000 : 480000;
break;
case 0x04: // DV50
ul_index = 2 + pal;
frame_size = pal ? 288000 : 240000;
break;
default: // DV25
ul_index = 0 + pal;
frame_size = pal ? 144000 : 120000;
}
sc->index = ul_index + 16;
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if(s->oformat == &ff_mxf_opatom_muxer) {
mxf->edit_unit_byte_count = frame_size;
return 1;
}
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
mxf->edit_unit_byte_count = KAG_SIZE;
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MXFStreamContext *sc = st->priv_data;
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 21:58:15 +02:00
if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
mxf->edit_unit_byte_count += 16 + 4 + sc->aic.samples[0]*sc->aic.sample_size;
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
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 21:58:15 +02:00
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
mxf->edit_unit_byte_count += 16 + 4 + frame_size;
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
}
}
return 1;
}
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
static const struct {
UID uid;
int frame_size;
int profile;
uint8_t interlaced;
} mxf_h264_codec_uls[] = {
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x20,0x01 }, 0, 110, 0 }, // AVC High 10 Intra
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x01 }, 232960, 0, 1 }, // AVC Intra 50 1080i60
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x02 }, 281088, 0, 1 }, // AVC Intra 50 1080i50
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x03 }, 232960, 0, 0 }, // AVC Intra 50 1080p30
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x04 }, 281088, 0, 0 }, // AVC Intra 50 1080p25
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x08 }, 116736, 0, 0 }, // AVC Intra 50 720p60
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x09 }, 140800, 0, 0 }, // AVC Intra 50 720p50
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x30,0x01 }, 0, 122, 0 }, // AVC High 422 Intra
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x01 }, 472576, 0, 1 }, // AVC Intra 100 1080i60
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x02 }, 568832, 0, 1 }, // AVC Intra 100 1080i50
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x03 }, 472576, 0, 0 }, // AVC Intra 100 1080p30
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x04 }, 568832, 0, 0 }, // AVC Intra 100 1080p25
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x08 }, 236544, 0, 0 }, // AVC Intra 100 720p60
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x31,0x09 }, 284672, 0, 0 }, // AVC Intra 100 720p50
};
static int mxf_parse_h264_frame(AVFormatContext *s, AVStream *st,
AVPacket *pkt, MXFIndexEntry *e)
{
MXFContext *mxf = s->priv_data;
MXFStreamContext *sc = st->priv_data;
static const int mxf_h264_num_codec_uls = sizeof(mxf_h264_codec_uls) / sizeof(mxf_h264_codec_uls[0]);
const uint8_t *buf = pkt->data;
const uint8_t *buf_end = pkt->data + pkt->size;
uint32_t state = -1;
int extra_size = 512; // support AVC Intra files without SPS/PPS header
int i, frame_size;
uint8_t uid_found;
if (pkt->size > extra_size)
buf_end -= pkt->size - extra_size; // no need to parse beyond SPS/PPS header
for (;;) {
buf = avpriv_find_start_code(buf, buf_end, &state);
if (buf >= buf_end)
break;
--buf;
switch (state & 0x1f) {
case NAL_SPS:
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 21:58:15 +02:00
st->codecpar->profile = buf[1];
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
e->flags |= 0x40;
break;
case NAL_PPS:
if (e->flags & 0x40) { // sequence header present
e->flags |= 0x80; // random access
extra_size = 0;
buf = buf_end;
}
break;
default:
break;
}
}
if (mxf->header_written)
return 1;
sc->aspect_ratio = (AVRational){ 16, 9 }; // 16:9 is mandatory for broadcast HD
sc->component_depth = 10; // AVC Intra is always 10 Bit
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 21:58:15 +02:00
sc->interlaced = st->codecpar->field_order != AV_FIELD_PROGRESSIVE ? 1 : 0;
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
if (sc->interlaced)
sc->field_dominance = 1; // top field first is mandatory for AVC Intra
uid_found = 0;
frame_size = pkt->size + extra_size;
for (i = 0; i < mxf_h264_num_codec_uls; i++) {
if (frame_size == mxf_h264_codec_uls[i].frame_size && sc->interlaced == mxf_h264_codec_uls[i].interlaced) {
sc->codec_ul = &mxf_h264_codec_uls[i].uid;
return 1;
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 21:58:15 +02:00
} else if (st->codecpar->profile == mxf_h264_codec_uls[i].profile) {
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
sc->codec_ul = &mxf_h264_codec_uls[i].uid;
uid_found = 1;
}
}
if (!uid_found) {
av_log(s, AV_LOG_ERROR, "AVC Intra 50/100 supported only\n");
return 0;
}
return 1;
}
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
static const UID mxf_mpeg2_codec_uls[] = {
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x10,0x00 }, // MP-ML I-Frame
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, // MP-ML Long GOP
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, // 422P-ML I-Frame
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, // 422P-ML Long GOP
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x02,0x00 }, // MP-HL I-Frame
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, // MP-HL Long GOP
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00 }, // 422P-HL I-Frame
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, // 422P-HL Long GOP
mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container Support Main Profile at High 1440 Level in MXF container, using essence coding label from SMPTE RDD 9, table 6.
2011-09-16 18:16:30 +02:00
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x05,0x02,0x00 }, // MP@H-14 I-Frame
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x05,0x03,0x00 }, // MP@H-14 Long GOP
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
};
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
static const UID *mxf_get_mpeg2_codec_ul(AVCodecParameters *par)
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
{
mxfenc: always assume long gop Checking the codec context parameters to find out this information is far too unreliable to be useful, so it is safer to assume B-frames are always present.
2014-11-15 10:41:02 +01:00
int long_gop = 1;
fix and simplify long gop mpeg codec ul computation Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 10:02:01 +02:00
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (par->profile == 4) { // Main
if (par->level == 8) // Main
fix and simplify long gop mpeg codec ul computation Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 10:02:01 +02:00
return &mxf_mpeg2_codec_uls[0+long_gop];
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
else if (par->level == 4) // High
fix and simplify long gop mpeg codec ul computation Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 10:02:01 +02:00
return &mxf_mpeg2_codec_uls[4+long_gop];
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
else if (par->level == 6) // High 14
mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container Support Main Profile at High 1440 Level in MXF container, using essence coding label from SMPTE RDD 9, table 6.
2011-09-16 18:16:30 +02:00
return &mxf_mpeg2_codec_uls[8+long_gop];
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
} else if (par->profile == 0) { // 422
if (par->level == 5) // Main
fix and simplify long gop mpeg codec ul computation Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 10:02:01 +02:00
return &mxf_mpeg2_codec_uls[2+long_gop];
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
else if (par->level == 2) // High
fix and simplify long gop mpeg codec ul computation Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 10:02:01 +02:00
return &mxf_mpeg2_codec_uls[6+long_gop];
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
}
return NULL;
}
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st,
AVPacket *pkt, MXFIndexEntry *e)
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
{
MXFStreamContext *sc = st->priv_data;
uint32_t c = -1;
int i;
for(i = 0; i < pkt->size - 4; i++) {
c = (c<<8) + pkt->data[i];
cosmetics, change case and comments alignment Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:43:32 +02:00
if (c == 0x1b5) {
remove unneeded length checks Originally committed as revision 18834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 06:43:44 +02:00
if ((pkt->data[i+1] & 0xf0) == 0x10) { // seq ext
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
st->codecpar->profile = pkt->data[i+1] & 0x07;
st->codecpar->level = pkt->data[i+2] >> 4;
parse mpeg2 progressive frame flag Originally committed as revision 16889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:42:47 +01:00
} else if (i + 5 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x80) { // pict coding ext
sc->interlaced = !(pkt->data[i+5] & 0x80); // progressive frame
mxfenc: write optional field dominance flag in picture description Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-27 14:21:41 +02:00
if (sc->interlaced)
sc->field_dominance = 1 + !(pkt->data[i+4] & 0x80); // top field first
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
break;
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
} else if (c == 0x1b8) { // gop
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
if (pkt->data[i+4]>>6 & 0x01) { // closed
sc->closed_gop = 1;
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
if (e->flags & 0x40) // sequence header present
e->flags |= 0x80; // random access
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
} else if (c == 0x1b3) { // seq
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
e->flags |= 0x40;
reindent Originally committed as revision 18835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 06:44:37 +02:00
switch ((pkt->data[i+4]>>4) & 0xf) {
case 2: sc->aspect_ratio = (AVRational){ 4, 3}; break;
case 3: sc->aspect_ratio = (AVRational){ 16, 9}; break;
case 4: sc->aspect_ratio = (AVRational){221,100}; break;
default:
av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den,
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
st->codecpar->width, st->codecpar->height, 1024*1024);
reindent Originally committed as revision 18835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 06:44:37 +02:00
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
} else if (c == 0x100) { // pic
int pict_type = (pkt->data[i+2]>>3) & 0x07;
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
e->temporal_ref = (pkt->data[i+1]<<2) | (pkt->data[i+2]>>6);
cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-27 19:45:23 +02:00
if (pict_type == 2) { // P-frame
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
e->flags |= 0x22;
cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-27 19:45:23 +02:00
sc->closed_gop = 0; // reset closed GOP, don't matter anymore
} else if (pict_type == 3) { // B-frame
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
if (sc->closed_gop)
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
e->flags |= 0x13; // only backward prediction
correctly compute frame flags with closed gop Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 09:41:40 +02:00
else
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
e->flags |= 0x33;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
sc->temporal_reordering = -1;
} else if (!pict_type) {
av_log(s, AV_LOG_ERROR, "error parsing mpeg2 frame\n");
return 0;
}
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
}
}
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
if (s->oformat != &ff_mxf_d10_muxer)
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
sc->codec_ul = mxf_get_mpeg2_codec_ul(st->codecpar);
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
return !!sc->codec_ul;
}
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
static uint64_t mxf_parse_timestamp(time_t timestamp)
{
Use gmtime_r instead of gmtime and localtime_r instead of localtime gmtime isn't thread safe in general. In msvcrt (which lacks gmtime_r), the buffer used by gmtime is thread specific though. One call to localtime is left in avconv_opt.c, where thread safety shouldn't matter (instead of making avconv depend on the libavutil internal header). Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-24 09:46:36 +02:00
struct tm tmbuf;
struct tm *time = gmtime_r(&timestamp, &tmbuf);
In mxf muxer, check the return value of gmtime, fix #2494 Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 23:36:23 +01:00
if (!time)
return 0;
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
return (uint64_t)(time->tm_year+1900) << 48 |
(uint64_t)(time->tm_mon+1) << 40 |
(uint64_t) time->tm_mday << 32 |
time->tm_hour << 24 |
time->tm_min << 16 |
time->tm_sec << 8;
}
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
static void mxf_gen_umid(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
Make ff_random_get_seed public, rename to av_get_random_seed, export the header Keep an old ff_ named function for binary compatibility until the next major bump. Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 10:53:40 +02:00
uint32_t seed = av_get_random_seed();
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
uint64_t umid = seed + 0x5294713400000000LL;
AV_WB64(mxf->umid , umid);
AV_WB64(mxf->umid+8, umid>>8);
avformat/mxfenc: instance number is just 24 bits Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 14:33:40 +02:00
mxf->instance_number = seed & 0xFFFFFF;
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
}
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
static int mxf_init_timecode(AVFormatContext *s, AVStream *st, AVRational rate)
{
MXFContext *mxf = s->priv_data;
AVDictionaryEntry *tcr = av_dict_get(s->metadata, "timecode", NULL, 0);
if (!tcr)
tcr = av_dict_get(st->metadata, "timecode", NULL, 0);
if (tcr)
return av_timecode_init_from_string(&mxf->tc, rate, tcr->value, s);
else
return av_timecode_init(&mxf->tc, rate, 0, 0, s);
}
cosmetics, mux_write -> mxf_write Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:50:25 +02:00
static int mxf_write_header(AVFormatContext *s)
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
{
MXFContext *mxf = s->priv_data;
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
int i, ret;
uses FF_ARRAY_ELEMS() where appropriate Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 23:40:24 +02:00
uint8_t present[FF_ARRAY_ELEMS(mxf_essence_container_uls)] = {0};
mxfenc: factorize samples per frame code Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 00:48:39 +02:00
const MXFSamplesPerFrame *spf = NULL;
lavf: deprecate AVFormatContext.timestamp It's replaced by 'creation_time' metadata tag.
2011-07-07 11:25:03 +02:00
int64_t timestamp = 0;
move per track code in mxf_write_header to be able to check for unsupported configuration Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:47:58 +02:00
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
if (!s->nb_streams)
return -1;
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (s->oformat == &ff_mxf_opatom_muxer && s->nb_streams !=1){
av_log(s, AV_LOG_ERROR, "there must be exactly one stream for mxf opatom\n");
return -1;
}
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
if (!av_dict_get(s->metadata, "comment_", NULL, AV_DICT_IGNORE_SUFFIX))
mxf->store_user_comments = 0;
move per track code in mxf_write_header to be able to check for unsupported configuration Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:47:58 +02:00
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
replace sizeof(type) by sizeof *ptr Originally committed as revision 15078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:39:34 +02:00
MXFStreamContext *sc = av_mallocz(sizeof(*sc));
move per track code in mxf_write_header to be able to check for unsupported configuration Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:47:58 +02:00
if (!sc)
return AVERROR(ENOMEM);
st->priv_data = sc;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
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 21:58:15 +02:00
if (((i == 0) ^ (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) && s->oformat != &ff_mxf_opatom_muxer) {
mxfenc: Don't allow muxing audio-only since it's not supported This fixes muxing audio-only output resulting in SIGFPE due to lack of EditRate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-29 11:48:45 +02:00
av_log(s, AV_LOG_ERROR, "there must be exactly one video stream and it must be the first one\n");
return -1;
}
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
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 21:58:15 +02:00
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(st->codecpar->format);
lavf: switch to AVStream.time_base as the hint for the muxer timebase Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
2014-05-18 12:12:59 +02:00
// TODO: should be avg_frame_rate
Merge commit '194be1f43ea391eb986732707435176e579265aa' * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 18:18:25 +02:00
AVRational rate, tbc = st->time_base;
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
// Default component depth to 8
sc->component_depth = 8;
avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 20:02:01 +02:00
sc->h_chroma_sub_sample = 2;
avformat/mxfenc: Add color siting element Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com> Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-19 01:11:09 +02:00
sc->color_siting = 0xFF;
avformat/mxfenc: Set the component depth from the pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 19:59:18 +02:00
if (pix_desc) {
Replace all remaining occurances of step/depth_minus1 and offset_plus1
2015-09-08 17:10:48 +02:00
sc->component_depth = pix_desc->comp[0].depth;
avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 20:02:01 +02:00
sc->h_chroma_sub_sample = 1 << pix_desc->log2_chroma_w;
avformat/mxfenc: Set the component depth from the pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 19:59:18 +02:00
}
avformat/mxfenc: Add color siting element Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com> Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-19 01:11:09 +02:00
switch (ff_choose_chroma_location(s, st)) {
case AVCHROMA_LOC_TOPLEFT: sc->color_siting = 0; break;
case AVCHROMA_LOC_LEFT: sc->color_siting = 6; break;
case AVCHROMA_LOC_TOP: sc->color_siting = 1; break;
case AVCHROMA_LOC_CENTER: sc->color_siting = 3; break;
}
avformat/mxfenc: Set the component depth from the pixel format if available Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 19:59:18 +02:00
lavf/mxfenc: simplify frame rate checks.
2012-08-03 10:21:24 +02:00
mxf->timecode_base = (tbc.den + tbc.num/2) / tbc.num;
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-20 20:31:28 +02:00
spf = ff_mxf_get_samples_per_frame(s, tbc);
mxfenc: factorize samples per frame code Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 00:48:39 +02:00
if (!spf) {
lavf/mxfenc: better error handling with invalid frame rate.
2012-08-03 10:20:44 +02:00
av_log(s, AV_LOG_ERROR, "Unsupported video frame rate %d/%d\n",
tbc.den, tbc.num);
return AVERROR(EINVAL);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
}
mxfenc: factorize samples per frame code Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 00:48:39 +02:00
mxf->time_base = spf->time_base;
Replace various inlined inverse AVRational with av_inv_q().
2012-08-05 23:25:27 +02:00
rate = av_inv_q(mxf->time_base);
lavf: make av_set_pts_info private. It's supposed to be called only from (de)muxers.
2011-11-29 19:28:15 +01:00
avpriv_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den);
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
if((ret = mxf_init_timecode(s, st, rate)) < 0)
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
return ret;
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
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 21:58:15 +02:00
sc->video_bit_rate = st->codecpar->bit_rate;
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
if (s->oformat == &ff_mxf_d10_muxer) {
avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec This is the maximum rate possible based on the frame size limit of MXF D-10 Previous version reviewed by tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 21:35:02 +02:00
if ((sc->video_bit_rate == 50000000) && (mxf->time_base.den == 25)) {
sc->index = 3;
} else if ((sc->video_bit_rate == 49999840 || sc->video_bit_rate == 50000000) && (mxf->time_base.den != 25)) {
sc->index = 5;
Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-09-09 10:02:12 +02:00
} else if (sc->video_bit_rate == 40000000) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (mxf->time_base.den == 25) sc->index = 7;
else sc->index = 9;
Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-09-09 10:02:12 +02:00
} else if (sc->video_bit_rate == 30000000) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (mxf->time_base.den == 25) sc->index = 11;
else sc->index = 13;
libavformat/mxfenc: add {} to complex ifs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21 17:36:53 +02:00
} else {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
av_log(s, AV_LOG_ERROR, "error MXF D-10 only support 30/40/50 mbit/s\n");
return -1;
}
mxf->edit_unit_byte_count = KAG_SIZE; // system element
Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-09-09 10:02:12 +02:00
mxf->edit_unit_byte_count += 16 + 4 + (uint64_t)sc->video_bit_rate *
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
mxf->time_base.num / (8*mxf->time_base.den);
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
mxfenc: factorize samples per frame code Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 00:48:39 +02:00
mxf->edit_unit_byte_count += 16 + 4 + 4 + spf->samples_per_frame[0]*8*4;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count);
avformat/mxfenc: Support storing signal standard for D10 muxing Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 02:43:26 +02:00
sc->signal_standard = 1;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
avformat/mxfenc: Allow overriding /manual setting of the signal standard previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 03:06:12 +02:00
if (mxf->signal_standard >= 0)
sc->signal_standard = mxf->signal_standard;
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
if (st->codecpar->sample_rate != 48000) {
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
av_log(s, AV_LOG_ERROR, "only 48khz is implemented\n");
return -1;
}
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
if (s->oformat == &ff_mxf_d10_muxer) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (st->index != 1) {
av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n");
return -1;
}
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE &&
st->codecpar->codec_id != AV_CODEC_ID_PCM_S24LE) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
av_log(s, AV_LOG_ERROR, "MXF D-10 only support 16 or 24 bits le audio\n");
}
sc->index = ((MXFStreamContext*)s->streams[0]->priv_data)->index + 1;
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
} else if (s->oformat == &ff_mxf_opatom_muxer) {
AVRational tbc = av_inv_q(mxf->audio_edit_rate);
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 21:58:15 +02:00
if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE &&
st->codecpar->codec_id != AV_CODEC_ID_PCM_S24LE) {
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
av_log(s, AV_LOG_ERROR, "Only pcm_s16le and pcm_s24le audio codecs are implemented\n");
return AVERROR_PATCHWELCOME;
}
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 21:58:15 +02:00
if (st->codecpar->channels != 1) {
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
av_log(s, AV_LOG_ERROR, "MXF OPAtom only supports single channel audio\n");
return AVERROR(EINVAL);
}
spf = ff_mxf_get_samples_per_frame(s, tbc);
if (!spf){
av_log(s, AV_LOG_ERROR, "Unsupported timecode frame rate %d/%d\n", tbc.den, tbc.num);
return AVERROR(EINVAL);
}
mxf->time_base = st->time_base;
if((ret = mxf_init_timecode(s, st, av_inv_q(spf->time_base))) < 0)
return ret;
mxf->timecode_base = (tbc.den + tbc.num/2) / tbc.num;
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 21:58:15 +02:00
mxf->edit_unit_byte_count = (av_get_bits_per_sample(st->codecpar->codec_id) * st->codecpar->channels) >> 3;
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
sc->index = 2;
} else {
mxf->slice_count = 1;
}
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
}
set duration to distinguished value Originally committed as revision 15095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:46:50 +02:00
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
if (!sc->index) {
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
sc->index = mxf_get_essence_container_ul_index(st->codecpar->codec_id);
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
if (sc->index == -1) {
av_log(s, AV_LOG_ERROR, "track %d: could not find essence container ul, "
"codec not currently supported in container\n", i);
return -1;
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
correctly write codec ul, mpeg-2 needs profile and level to be set Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:41:31 +02:00
store index in table in MXFStreamContext, simplify Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 06:13:44 +02:00
memcpy(sc->track_essence_element_key, mxf_essence_container_uls[sc->index].element_ul, 15);
sc->track_essence_element_key[15] = present[sc->index];
introduce MXFContainerEssencePair to associate essence element key and essence container easily and compute essence element key in write_header Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:33:28 +02:00
PRINT_KEY(s, "track essence element key", sc->track_essence_element_key);
start counting track number from 0 Originally committed as revision 17419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 03:57:41 +01:00
if (!present[sc->index])
mxf->essence_container_count++;
present[sc->index]++;
move per track code in mxf_write_header to be able to check for unsupported configuration Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:47:58 +02:00
}
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (s->oformat == &ff_mxf_d10_muxer || s->oformat == &ff_mxf_opatom_muxer) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
mxf->essence_container_count = 1;
}
lavf: add AVFMT_FLAG_BITEXACT. Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's codec context. Using codec options inside lavf is fragile and can easily break when the muxing codec context is not the encoding context.
2014-05-01 10:43:10 +02:00
if (!(s->flags & AVFMT_FLAG_BITEXACT))
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
mxf_gen_umid(s);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
for (i = 0; i < s->nb_streams; i++) {
MXFStreamContext *sc = s->streams[i]->priv_data;
// update element count
sc->track_essence_element_key[13] = present[sc->index];
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
if (!memcmp(sc->track_essence_element_key, mxf_essence_container_uls[15].element_ul, 13)) // DV
sc->order = (0x15 << 24) | AV_RB32(sc->track_essence_element_key+13);
else
sc->order = AV_RB32(sc->track_essence_element_key+12);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
}
avformat/mxfenc: use ff_parse_creation_time_metadata Signed-off-by: Marton Balint <cus@passwd.hu>
2016-02-06 18:00:53 +01:00
if (ff_parse_creation_time_metadata(s, &timestamp, 1) > 0)
lavf: deprecate AVFormatContext.timestamp It's replaced by 'creation_time' metadata tag.
2011-07-07 11:25:03 +02:00
mxf->timestamp = mxf_parse_timestamp(timestamp);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf->duration = -1;
mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track));
if (!mxf->timecode_track)
return AVERROR(ENOMEM);
mxf->timecode_track->priv_data = av_mallocz(sizeof(MXFStreamContext));
if (!mxf->timecode_track->priv_data)
return AVERROR(ENOMEM);
use index 0 for timecode track and write it in source package also Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:35:36 +01:00
mxf->timecode_track->index = -1;
format timestamp correctly according to specs and set it Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 21:15:18 +01:00
mxfenc: factorize samples per frame code Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 00:48:39 +02:00
if (!spf)
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-20 20:31:28 +02:00
spf = ff_mxf_get_samples_per_frame(s, (AVRational){ 1, 25 });
do not use PAL_samples_per_frame in init, to make init independant Originally committed as revision 16902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:49:26 +01:00
mxfenc: factorize samples per frame code Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 00:48:39 +02:00
if (ff_audio_interleave_init(s, spf->samples_per_frame, mxf->time_base) < 0)
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
return -1;
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
return 0;
}
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
static const uint8_t system_metadata_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x03,0x01,0x04,0x01,0x01,0x00 };
static const uint8_t system_metadata_package_set_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x43,0x01,0x01,0x0D,0x01,0x03,0x01,0x04,0x01,0x02,0x01 };
static void mxf_write_system_item(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
unsigned frame;
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
uint32_t time_code;
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
frame = mxf->last_indexed_edit_unit + mxf->edit_units_count;
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
// write system metadata pack
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, system_metadata_pack_key, 16);
write essence elements klv packets with ber4 length, more interoperable Originally committed as revision 17200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:06:35 +01:00
klv_encode_ber4_length(pb, 57);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0x5c); // UL, user date/time stamp, picture and sound item present
avio_w8(pb, 0x04); // content package rate
avio_w8(pb, 0x00); // content package type
avio_wb16(pb, 0x00); // channel handle
mxfenc: explicitly truncate continuity count. The field is intended to overflow and have only its low 16bits stored. This commit avoids the implicit truncation and clarifies that its intended and not a bug S326m section 7.6 ("Continuity count"): > The continuity count word consists of 2 bytes allow- > ing a number to be created by a modulo 65536 > counter (bits C15 to C0 in figure 7). The continuity > count shall increment by 1 for each newly transmit- > ted content package with the same SDTI source and > destination addresses. The continuity count may > be used to detect whether the content package > sequence has been broken by an operation such as > a routing switch. Approved-by: Tjoppen Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 15:58:44 +02:00
avio_wb16(pb, (mxf->tc.start + frame) & 0xFFFF); // continuity count, supposed to overflow
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
if (mxf->essence_container_count > 1)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, multiple_desc_ul, 16);
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:46:03 +01:00
else {
MXFStreamContext *sc = s->streams[0]->priv_data;
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16);
simplify Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:46:03 +01:00
}
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0);
avio_wb64(pb, 0);
avio_wb64(pb, 0); // creation date/time stamp
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0x81); // SMPTE 12M time code
mxfenc: use new public timecode API.
2012-01-16 14:19:37 +01:00
time_code = av_timecode_get_smpte_from_framenum(&mxf->tc, frame);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, time_code);
avio_wb32(pb, 0); // binary group data
avio_wb64(pb, 0);
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
// write system metadata package set
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, system_metadata_package_set_key, 16);
write essence elements klv packets with ber4 length, more interoperable Originally committed as revision 17200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:06:35 +01:00
klv_encode_ber4_length(pb, 35);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, 0x83); // UMID
avio_wb16(pb, 0x20);
attempt to try to generate an random umid Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:15:00 +01:00
mxf_write_umid(s, 1);
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
}
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
static void mxf_write_d10_video_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-09-09 10:02:12 +02:00
MXFStreamContext *sc = st->priv_data;
int packet_size = (uint64_t)sc->video_bit_rate*mxf->time_base.num /
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
(8*mxf->time_base.den); // frame size
int pad;
packet_size += 16 + 4;
packet_size += klv_fill_size(packet_size);
klv_encode_ber4_length(pb, pkt->size);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, pkt->data, pkt->size);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
// ensure CBR muxing by padding to correct video frame size
pad = packet_size - pkt->size - 16 - 4;
if (pad > 20) {
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(s->pb, klv_fill_key, 16);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
pad -= 16 + 4;
klv_encode_ber4_length(s->pb, pad);
mxfenc: use ffio_fill() Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 19:39:55 +02:00
ffio_fill(s->pb, 0, pad);
mxfenc: switch to av_assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:16:24 +02:00
av_assert1(!(avio_tell(s->pb) & (KAG_SIZE-1)));
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
} else {
av_log(s, AV_LOG_WARNING, "cannot fill d-10 video packet\n");
mxfenc: use ffio_fill() Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 19:39:55 +02:00
ffio_fill(s->pb, 0, pad);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
}
static void mxf_write_d10_audio_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
int frame_size = pkt->size / st->codecpar->block_align;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
uint8_t *samples = pkt->data;
uint8_t *end = pkt->data + pkt->size;
int i;
klv_encode_ber4_length(pb, 4 + frame_size*4*8);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_w8(pb, (frame_size == 1920 ? 0 : (mxf->edit_units_count-1) % 5 + 1));
avio_wl16(pb, frame_size);
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
avio_w8(pb, (1<<st->codecpar->channels)-1);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
while (samples < end) {
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
for (i = 0; i < st->codecpar->channels; i++) {
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
uint32_t sample;
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE) {
do not set frame start bit since marked as not used and factorize Originally committed as revision 17580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 09:05:43 +01:00
sample = AV_RL24(samples)<< 4;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
samples += 3;
} else {
do not set frame start bit since marked as not used and factorize Originally committed as revision 17580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 09:05:43 +01:00
sample = AV_RL16(samples)<<12;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
samples += 2;
}
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wl32(pb, sample | i);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
for (; i < 8; i++)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wl32(pb, i);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
static int mxf_write_opatom_body_partition(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
MXFStreamContext *sc = st->priv_data;
const uint8_t *key = NULL;
int err;
if (!mxf->header_written)
key = body_partition_key;
if ((err = mxf_write_partition(s, 1, 0, key, 0)) < 0)
return err;
mxf_write_klv_fill(s);
avio_write(pb, sc->track_essence_element_key, 16);
klv_encode_ber9_length(pb, mxf->body_offset);
return 0;
}
static int mxf_write_opatom_packet(AVFormatContext *s, AVPacket *pkt, MXFIndexEntry *ie)
{
MXFContext *mxf = s->priv_data;
AVIOContext *pb = s->pb;
int err;
if (!mxf->header_written) {
if ((err = mxf_write_partition(s, 0, 0, header_open_partition_key, 1)) < 0)
return err;
mxf_write_klv_fill(s);
if ((err = mxf_write_opatom_body_partition(s)) < 0)
return err;
mxf->header_written = 1;
}
if (!mxf->edit_unit_byte_count) {
mxf->index_entries[mxf->edit_units_count].offset = mxf->body_offset;
mxf->index_entries[mxf->edit_units_count].flags = ie->flags;
mxf->index_entries[mxf->edit_units_count].temporal_ref = ie->temporal_ref;
}
mxf->edit_units_count++;
avio_write(pb, pkt->data, pkt->size);
mxf->body_offset += pkt->size;
avio_flush(pb);
return 0;
}
cosmetics, mux_write -> mxf_write Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:50:25 +02:00
static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt)
Import more MXF muxer code from the SoC tree Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:28:12 +02:00
{
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
Import more MXF muxer code from the SoC tree Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:28:12 +02:00
AVStream *st = s->streams[pkt->stream_index];
MXFStreamContext *sc = st->priv_data;
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
MXFIndexEntry ie = {0};
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
int err;
Import more MXF muxer code from the SoC tree Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:28:12 +02:00
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
if (!mxf->edit_unit_byte_count && !(mxf->edit_units_count % EDIT_UNITS_PER_BODY)) {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = av_reallocp_array(&mxf->index_entries, mxf->edit_units_count
+ EDIT_UNITS_PER_BODY, sizeof(*mxf->index_entries))) < 0) {
mxf->edit_units_count = 0;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
av_log(s, AV_LOG_ERROR, "could not allocate index entries\n");
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
return err;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
}
}
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (st->codecpar->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
if (!mxf_parse_mpeg2_frame(s, st, pkt, &ie)) {
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
av_log(s, AV_LOG_ERROR, "could not get mpeg2 profile and level\n");
return -1;
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
}
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 21:58:15 +02:00
} else if (st->codecpar->codec_id == AV_CODEC_ID_DNXHD) {
mxfenc: support dnxhd codec
2012-05-29 00:45:41 +02:00
if (!mxf_parse_dnxhd_frame(s, st, pkt)) {
av_log(s, AV_LOG_ERROR, "could not get dnxhd profile\n");
return -1;
}
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 21:58:15 +02:00
} else if (st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO) {
mxfenc: support smpte dv codec After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-05-26 18:09:47 +02:00
if (!mxf_parse_dv_frame(s, st, pkt)) {
av_log(s, AV_LOG_ERROR, "could not get dv profile\n");
return -1;
}
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 21:58:15 +02:00
} else if (st->codecpar->codec_id == AV_CODEC_ID_H264) {
avformat/mxfenc: AVC Intra support To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 23:38:22 +01:00
if (!mxf_parse_h264_frame(s, st, pkt, &ie)) {
av_log(s, AV_LOG_ERROR, "could not get h264 profile\n");
return -1;
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
}
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (s->oformat == &ff_mxf_opatom_muxer)
return mxf_write_opatom_packet(s, pkt, &ie);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
if (!mxf->header_written) {
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
if (mxf->edit_unit_byte_count) {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 1, 2, header_open_partition_key, 1)) < 0)
return err;
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
mxf_write_klv_fill(s);
mxf_write_index_table_segment(s);
} else {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 0, 0, header_open_partition_key, 1)) < 0)
return err;
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
}
delay header writing and parse mpeg2 frame Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:32:12 +01:00
mxf->header_written = 1;
}
force first track to be video and simplify Originally committed as revision 17034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:38:07 +01:00
if (st->index == 0) {
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
if (!mxf->edit_unit_byte_count &&
(!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) &&
cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-27 19:45:23 +02:00
!(ie.flags & 0x33)) { // I-frame, GOP start
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
mxf_write_klv_fill(s);
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 1, 2, body_partition_key, 0)) < 0)
return err;
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
mxf_write_klv_fill(s);
mxf_write_index_table_segment(s);
}
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
mxf_write_klv_fill(s);
cosmetics, associate mxf_write_klv_fill to aligned elements Originally committed as revision 17121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 08:23:51 +01:00
mxf_write_system_item(s);
write system item Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 03:34:56 +01:00
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
if (!mxf->edit_unit_byte_count) {
mxf->index_entries[mxf->edit_units_count].offset = mxf->body_offset;
In mxf muxer, fix last b frame temporal offset Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:35:47 +02:00
mxf->index_entries[mxf->edit_units_count].flags = ie.flags;
mxf->index_entries[mxf->edit_units_count].temporal_ref = ie.temporal_ref;
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
mxf->body_offset += KAG_SIZE; // size of system element
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
mxf->edit_units_count++;
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
} else if (!mxf->edit_unit_byte_count && st->index == 1) {
avformat/mxfenc: Do not crash if there is no packet in the first stream Fixes: Ticket4914 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-13 16:13:22 +01:00
if (!mxf->edit_units_count) {
av_log(s, AV_LOG_ERROR, "No packets in first stream\n");
return AVERROR_PATCHWELCOME;
}
compute body offset and index entry offset correctly Originally committed as revision 17219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 23:38:05 +01:00
mxf->index_entries[mxf->edit_units_count-1].slice_offset =
mxf->body_offset - mxf->index_entries[mxf->edit_units_count-1].offset;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
}
cosmetics, associate mxf_write_klv_fill to aligned elements Originally committed as revision 17121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 08:23:51 +01:00
mxf_write_klv_fill(s);
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, sc->track_essence_element_key, 16); // write key
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
if (s->oformat == &ff_mxf_d10_muxer) {
lavf: replace AVStream.codec with AVStream.codecpar Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
mxf_write_d10_video_packet(s, st, pkt);
else
mxf_write_d10_audio_packet(s, st, pkt);
} else {
klv_encode_ber4_length(pb, pkt->size); // write length
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, pkt->data, pkt->size);
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
mxf->body_offset += 16+4+pkt->size + klv_fill_size(16+4+pkt->size);
}
Import more MXF muxer code from the SoC tree Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:28:12 +02:00
avio: rename put_flush_packet -> avio_flush Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-14 20:39:06 +01:00
avio_flush(pb);
compute body offset and index entry offset correctly Originally committed as revision 17219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 23:38:05 +01:00
Import more MXF muxer code from the SoC tree Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:28:12 +02:00
return 0;
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
static void mxf_write_random_index_pack(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
uint64_t pos = avio_tell(pb);
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
int i;
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_write(pb, random_index_pack_key, 16);
mxfenc: Fix possible integer overflows None of these are likely unless the user is writing a file with two billion streams or a duration of around two months. This fixes CIDs 700568, 700569, 700570, 700571, 700572 and 700573. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24 17:06:49 +02:00
klv_encode_ber_length(pb, 28 + 12LL*mxf->body_partitions_count);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (mxf->edit_unit_byte_count && s->oformat != &ff_mxf_opatom_muxer)
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 1); // BodySID of header partition
fix rip body sid when muxing cbr Originally committed as revision 17414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 02:05:06 +01:00
else
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 0);
avio_wb64(pb, 0); // offset of header partition
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
for (i = 0; i < mxf->body_partitions_count; i++) {
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 1); // BodySID
avio_wb64(pb, mxf->body_partition_offset[i]);
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
}
avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 19:28:17 +01:00
avio_wb32(pb, 0); // BodySID of footer partition
avio_wb64(pb, mxf->footer_partition_offset);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
avio_wb32(pb, avio_tell(pb) - pos + 4);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
}
cosmetics, mux_write -> mxf_write Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:50:25 +02:00
static int mxf_write_footer(AVFormatContext *s)
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
{
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
MXFContext *mxf = s->priv_data;
avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 11:04:12 +01:00
AVIOContext *pb = s->pb;
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
int err = 0;
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
mxfenc: don't try to write footer without header This fixes a crash, when trying to mux h264 into mxf_opatom. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Previous version reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-18 21:57:58 +01:00
if (!mxf->header_written ||
(s->oformat == &ff_mxf_opatom_muxer && !mxf->body_partition_offset)) {
/* reason could be invalid options/not supported codec/out of memory */
err = AVERROR_UNKNOWN;
goto end;
}
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
mxf->duration = mxf->last_indexed_edit_unit + mxf->edit_units_count;
use 512 kag size needed for d10 Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-07 03:13:23 +01:00
mxf_write_klv_fill(s);
avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03 20:11:45 +01:00
mxf->footer_partition_offset = avio_tell(pb);
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (mxf->edit_unit_byte_count && s->oformat != &ff_mxf_opatom_muxer) { // no need to repeat index
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 0, 0, footer_partition_key, 0)) < 0)
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
goto end;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
} else {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 0, 2, footer_partition_key, 0)) < 0)
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
goto end;
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
mxf_write_klv_fill(s);
mxf_write_index_table_segment(s);
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
move up mxf_write_klv_fill and align index, rip and primer pack Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 06:35:28 +01:00
mxf_write_klv_fill(s);
write index table and rip, muxer works pretty well now Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:03:38 +01:00
mxf_write_random_index_pack(s);
avio: introduce an AVIOContext.seekable field Use it instead of url_is_streamed and AVIOContext.is_streamed.
2011-03-05 21:06:46 +01:00
if (s->pb->seekable) {
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (s->oformat == &ff_mxf_opatom_muxer){
/* rewrite body partition to update lengths */
avio_seek(pb, mxf->body_partition_offset[0], SEEK_SET);
if ((err = mxf_write_opatom_body_partition(s)) < 0)
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
goto end;
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
}
avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-28 14:57:54 +01:00
avio_seek(pb, 0, SEEK_SET);
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
if (mxf->edit_unit_byte_count && s->oformat != &ff_mxf_opatom_muxer) {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 1, 2, header_closed_partition_key, 1)) < 0)
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
goto end;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
mxf_write_klv_fill(s);
mxf_write_index_table_segment(s);
merge mxf_write_d10_packet into mxf_write_packet Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 11:44:38 +01:00
} else {
mxfenc: switch to av_reallocp_array() and check allocation errors Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-02 19:21:24 +02:00
if ((err = mxf_write_partition(s, 0, 0, header_closed_partition_key, 1)) < 0)
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
goto end;
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
}
simplify and correctly rewrite metadata in header partition, mark it closed complete Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 05:36:25 +02:00
}
free audio fifo Originally committed as revision 16905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 12:17:04 +01:00
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
end:
free audio fifo Originally committed as revision 16905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 12:17:04 +01:00
ff_audio_interleave_close(s);
free index entries Originally committed as revision 17040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:35:36 +01:00
av_freep(&mxf->index_entries);
write body partitions Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 10:02:29 +01:00
av_freep(&mxf->body_partition_offset);
write timecode track Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 08:18:00 +01:00
av_freep(&mxf->timecode_track->priv_data);
av_freep(&mxf->timecode_track);
free index entries Originally committed as revision 17040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:35:36 +01:00
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
mxf_free(s);
cosmetics, reindent, add/remove some empty lines, redundant comment Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:34:01 +01:00
mxfenc: fix memleaks in mxf_write_footer Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14 17:47:53 +01:00
return err < 0 ? err : 0;
Ok-ed parts from patch by zhentan feng. Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 14:36:17 +02:00
}
Apply parts of MXF muxer ok'ed by Michael Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 06:12:52 +02:00
change prototype of mxf_interleave_get_packet to make it compatible with av_interleave_packet_per_dts Originally committed as revision 16903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:51:35 +01:00
static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
{
Remove MAX_STREAMS usage in ogg and mxf muxers Originally committed as revision 21526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-29 07:38:00 +01:00
int i, stream_count = 0;
for (i = 0; i < s->nb_streams; i++)
stream_count += !!s->streams[i]->last_in_packet_buffer;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
if (stream_count && (s->nb_streams == stream_count || flush)) {
lavf: move internal fields from public to internal context This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-06 14:53:40 +01:00
AVPacketList *pktl = s->internal->packet_buffer;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
if (s->nb_streams != stream_count) {
set last packet next pointer to null Originally committed as revision 17176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 06:32:40 +01:00
AVPacketList *last = NULL;
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 02:51:52 +01:00
// find last packet in edit unit
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
while (pktl) {
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 02:51:52 +01:00
if (!stream_count || pktl->pkt.stream_index == 0)
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
break;
set last packet next pointer to null Originally committed as revision 17176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 06:32:40 +01:00
last = pktl;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
pktl = pktl->next;
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 02:51:52 +01:00
stream_count--;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
}
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
// purge packet queue
while (pktl) {
AVPacketList *next = pktl->next;
Improve amortized worst case speed of the muxers packet interleaving code from O(packets_in_the_file) to O(num_of_streams). Originally committed as revision 19887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 22:04:04 +02:00
if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl)
s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL;
avpacket: Replace av_free_packet with av_packet_unref `av_packet_unref` matches the AVFrame ref-counted API and can be used as a drop in replacement. Deprecate `av_free_packet`.
2015-10-23 11:11:31 +02:00
av_packet_unref(&pktl->pkt);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
av_freep(&pktl);
pktl = next;
}
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 02:51:52 +01:00
if (last)
last->next = NULL;
else {
lavf: move internal fields from public to internal context This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-06 14:53:40 +01:00
s->internal->packet_buffer = NULL;
s->internal->packet_buffer_end= NULL;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
goto out;
fix mxf interleaving packet purge Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 02:51:52 +01:00
}
lavf: move internal fields from public to internal context This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-06 14:53:40 +01:00
pktl = s->internal->packet_buffer;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
}
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
*out = pktl->pkt;
Replace av_dlog with normal av_log at trace level This applies to every library where performance is not critical.
2015-03-16 09:57:35 +01:00
av_log(s, AV_LOG_TRACE, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts);
lavf: move internal fields from public to internal context This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-06 14:53:40 +01:00
s->internal->packet_buffer = pktl->next;
Improve amortized worst case speed of the muxers packet interleaving code from O(packets_in_the_file) to O(num_of_streams). Originally committed as revision 19887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 22:04:04 +02:00
if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl)
s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL;
lavf: move internal fields from public to internal context This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-06 14:53:40 +01:00
if(!s->internal->packet_buffer)
s->internal->packet_buffer_end= NULL;
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
av_freep(&pktl);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
return 1;
} else {
fix flush and interleaving by edit units Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 11:04:36 +01:00
out:
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
av_init_packet(out);
return 0;
}
}
static int mxf_compare_timestamps(AVFormatContext *s, AVPacket *next, AVPacket *pkt)
{
use sample rate as audio input time base Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 05:50:47 +01:00
MXFStreamContext *sc = s->streams[pkt ->stream_index]->priv_data;
MXFStreamContext *sc2 = s->streams[next->stream_index]->priv_data;
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
use sample rate as audio input time base Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 05:50:47 +01:00
return next->dts > pkt->dts ||
(next->dts == pkt->dts && sc->order < sc2->order);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
}
static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{
rename ff_audio_interleave to ff_audio_rechunk_interleave Originally committed as revision 17103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 22:34:20 +01:00
return ff_audio_rechunk_interleave(s, out, pkt, flush,
extract audio interleaving code from mxf muxer, will be used by gxf and dv Originally committed as revision 17038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 05:31:44 +01:00
mxf_interleave_get_packet, mxf_compare_timestamps);
correctly pack and interleave pcm samples in mxf Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:18:25 +01:00
}
avformat/mxfenc: Allow overriding /manual setting of the signal standard previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 03:06:12 +02:00
#define MXF_COMMON_OPTIONS \
{ "signal_standard", "Force/set Sigal Standard",\
offsetof(MXFContext, signal_standard), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "bt601", "ITU-R BT.601 and BT.656, also SMPTE 125M (525 and 625 line interlaced)",\
0, AV_OPT_TYPE_CONST, {.i64 = 1}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "bt1358", "ITU-R BT.1358 and ITU-R BT.799-3, also SMPTE 293M (525 and 625 line progressive)",\
0, AV_OPT_TYPE_CONST, {.i64 = 2}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "smpte347m", "SMPTE 347M (540 Mbps mappings)",\
0, AV_OPT_TYPE_CONST, {.i64 = 3}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "smpte274m", "SMPTE 274M (1125 line)",\
0, AV_OPT_TYPE_CONST, {.i64 = 4}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "smpte296m", "SMPTE 296M (750 line progressive)",\
0, AV_OPT_TYPE_CONST, {.i64 = 5}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "smpte349m", "SMPTE 349M (1485 Mbps mappings)",\
0, AV_OPT_TYPE_CONST, {.i64 = 6}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\
{ "smpte428", "SMPTE 428-1 DCDM",\
0, AV_OPT_TYPE_CONST, {.i64 = 7}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},
avformat/mxfenc: Add mxf muxer avclass Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 14:02:51 +02:00
static const AVOption mxf_options[] = {
avformat/mxfenc: Allow overriding /manual setting of the signal standard previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 03:06:12 +02:00
MXF_COMMON_OPTIONS
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
{ "store_user_comments", "",
offsetof(MXFContext, store_user_comments), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
avformat/mxfenc: Add mxf muxer avclass Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 14:02:51 +02:00
{ NULL },
};
static const AVClass mxf_muxer_class = {
.class_name = "MXF muxer",
.item_name = av_default_item_name,
.option = mxf_options,
.version = LIBAVUTIL_VERSION_INT,
};
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
static const AVOption d10_options[] = {
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 18:10:45 +02:00
{ "d10_channelcount", "Force/set channelcount in generic sound essence descriptor",
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
offsetof(MXFContext, channel_count), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 8, AV_OPT_FLAG_ENCODING_PARAM},
avformat/mxfenc: Allow overriding /manual setting of the signal standard previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 03:06:12 +02:00
MXF_COMMON_OPTIONS
avformat/mxfenc: Only store user comment related tags when needed Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 14:24:26 +01:00
{ "store_user_comments", "",
offsetof(MXFContext, store_user_comments), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
{ NULL },
};
static const AVClass mxf_d10_muxer_class = {
.class_name = "MXF-D10 muxer",
.item_name = av_default_item_name,
.option = d10_options,
.version = LIBAVUTIL_VERSION_INT,
};
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
static const AVOption opatom_options[] = {
{ "mxf_audio_edit_rate", "Audio edit rate for timecode",
offsetof(MXFContext, audio_edit_rate), AV_OPT_TYPE_RATIONAL, {.dbl=25}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
avformat/mxfenc: Allow overriding /manual setting of the signal standard previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 03:06:12 +02:00
MXF_COMMON_OPTIONS
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
{ NULL },
};
static const AVClass mxf_opatom_muxer_class = {
.class_name = "MXF-OPAtom muxer",
.item_name = av_default_item_name,
.option = opatom_options,
.version = LIBAVUTIL_VERSION_INT,
};
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
AVOutputFormat ff_mxf_muxer = {
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 22:18:12 +02:00
.name = "mxf",
Improve descriptiveness of a number of codec and container long names
2012-07-24 03:23:48 +02:00
.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"),
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 22:18:12 +02:00
.mime_type = "application/mxf",
.extensions = "mxf",
.priv_data_size = sizeof(MXFContext),
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 11:11:04 +02:00
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_MPEG2VIDEO,
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 22:18:12 +02:00
.write_header = mxf_write_header,
.write_packet = mxf_write_packet,
.write_trailer = mxf_write_footer,
.flags = AVFMT_NOTIMESTAMPS,
.interleave_packet = mxf_interleave,
avformat/mxfenc: Add mxf muxer avclass Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 14:02:51 +02:00
.priv_class = &mxf_muxer_class,
import ok'd hunks for mxf muxer Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 23:48:02 +02:00
};
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-25 23:03:28 +01:00
AVOutputFormat ff_mxf_d10_muxer = {
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 22:18:12 +02:00
.name = "mxf_d10",
Improve descriptiveness of a number of codec and container long names
2012-07-24 03:23:48 +02:00
.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) D-10 Mapping"),
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 22:18:12 +02:00
.mime_type = "application/mxf",
.priv_data_size = sizeof(MXFContext),
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-05 11:11:04 +02:00
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_MPEG2VIDEO,
lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage.
2011-07-16 22:18:12 +02:00
.write_header = mxf_write_header,
.write_packet = mxf_write_packet,
.write_trailer = mxf_write_footer,
.flags = AVFMT_NOTIMESTAMPS,
.interleave_packet = mxf_interleave,
avformat/mxfenc: set/force channelcount in MXF D-10 There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-25 12:29:30 +02:00
.priv_class = &mxf_d10_muxer_class,
MXF D-10 muxer Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 08:28:20 +01:00
};
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
AVOutputFormat ff_mxf_opatom_muxer = {
.name = "mxf_opatom",
.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) Operational Pattern Atom"),
.mime_type = "application/mxf",
.extensions = "mxf",
.priv_data_size = sizeof(MXFContext),
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_DNXHD,
.write_header = mxf_write_header,
.write_packet = mxf_write_packet,
.write_trailer = mxf_write_footer,
.flags = AVFMT_NOTIMESTAMPS,
.interleave_packet = mxf_interleave,
libavformat/mxfenc: added support mxf opatom audio muxing Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:18:13 +02:00
.priv_class = &mxf_opatom_muxer_class,
libavformat/mxfenc.c: added mxf opatom muxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 04:44:21 +01:00
};